Skip to content

fix(folia): use entity scheduler for getState() to avoid off-region t… #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wizzoh wants to merge 1 commit into from
Closed

fix(folia): use entity scheduler for getState() to avoid off-region t… #61

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitEntity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
import com.sk89q.worldedit.util.Location;
import com.sk89q.worldedit.world.NullWorld;
import io.papermc.lib.PaperLib;
import org.bukkit.Bukkit;
import org.bukkit.entity.EntityType;

import javax.annotation.Nullable;
Expand Down Expand Up @@ -109,13 +108,32 @@ public BaseEntity getState() {
BukkitImplAdapter adapter = WorldEditPlugin.getInstance().getBukkitImplAdapter();
if (adapter != null) {
if (FoliaUtil.isFoliaServer()) {
org.bukkit.Location location = entity.getLocation();
CompletableFuture<BaseEntity> future = new CompletableFuture<>();
Bukkit.getServer().getRegionScheduler().run(
// Use entity scheduler (not region scheduler) to guarantee we run on
// the entity's owning region thread. regionScheduler.run(location) would
// target the region that owns that location, which may differ from the
// region that owns the entity itself, causing Folia thread-check failures.
boolean scheduled = entity.getScheduler().execute(
WorldEditPlugin.getInstance(),
location,
scheduledTask -> future.complete(adapter.getEntity(entity))
() -> {
BaseEntity base = adapter.getEntity(entity);
// Force-evaluate the lazy NBT tag while we are still on the
// entity's region thread. LazyBaseEntity.getNbt() would otherwise
// run the supplier via TaskManager.sync(), which on Folia is a
// no-op and executes on whatever (async) thread calls it later.
if (base != null) {
base.getNbt();
}
future.complete(base);
},
() -> future.complete(null), // retired: entity was removed
1L
);
if (!scheduled) {
// Entity scheduler rejected the task (e.g. plugin disabled); fall back
// to returning null so the copy operation skips this entity cleanly.
return null;
}
return future.join();
}
return adapter.getEntity(entity);
Expand Down
Loading