Skip to content

Commit c6a9673

Browse files
authored
fix: avoid tripping async catcher when getting entity from chunk (#2464)
1 parent 470c75d commit c6a9673

1 file changed

Lines changed: 9 additions & 1 deletion

File tree

  • worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2

worldedit-bukkit/adapters/adapter-1_20_2/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R2/PaperweightGetBlocks.java

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,15 @@ public int[] getHeightMap(HeightMapType type) {
295295

296296
@Override
297297
public CompoundTag getEntity(UUID uuid) {
298-
Entity entity = serverLevel.getEntity(uuid);
298+
ensureLoaded(serverLevel, chunkX, chunkZ);
299+
List<Entity> entities = PaperweightPlatformAdapter.getEntities(getChunk());
300+
Entity entity = null;
301+
for (Entity e : entities) {
302+
if (e.getUUID().equals(uuid)) {
303+
entity = e;
304+
break;
305+
}
306+
}
299307
if (entity != null) {
300308
org.bukkit.entity.Entity bukkitEnt = entity.getBukkitEntity();
301309
return BukkitAdapter.adapt(bukkitEnt).getState().getNbtData();

0 commit comments

Comments
 (0)