diff --git a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java index c95e4130d..4aaf558a6 100644 --- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java +++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitWorld.java @@ -87,17 +87,11 @@ public class BukkitWorld extends LocalWorld { public List getEntities(Region region) { World world = getWorld(); + List ents = world.getEntities(); List entities = new ArrayList(); - for (Vector2D pt : region.getChunks()) { - if (!world.isChunkLoaded(pt.getBlockX(), pt.getBlockZ())) { - continue; - } - - final Entity[] ents = world.getChunkAt(pt.getBlockX(), pt.getBlockZ()).getEntities(); - for (Entity ent : ents) { - if (region.contains(BukkitUtil.toVector(ent.getLocation()))) { - entities.add(BukkitAdapter.adapt(ent)); - } + for (Entity ent : ents) { + if (region.contains(BukkitUtil.toVector(ent.getLocation()))) { + entities.add(BukkitAdapter.adapt(ent)); } } return entities; diff --git a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java index 92edac931..f4d56f862 100644 --- a/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java +++ b/worldedit-forge/src/main/java/com/sk89q/worldedit/forge/ForgeWorld.java @@ -373,18 +373,10 @@ public class ForgeWorld extends AbstractWorld { public List getEntities(Region region) { List entities = new ArrayList(); World world = getWorld(); - for (Vector2D pt : region.getChunks()) { - if (!world.getChunkProvider().chunkExists(pt.getBlockX(), pt.getBlockZ())) { - continue; - } - - Chunk chunk = world.getChunkProvider().provideChunk(pt.getBlockX(), pt.getBlockZ()); - for (List entitySubList : chunk.entityLists) { - for (net.minecraft.entity.Entity entity : entitySubList) { - if (region.contains(new Vector(entity.posX, entity.posY, entity.posZ))) { - entities.add(new ForgeEntity(entity)); - } - } + List ents = world.loadedEntityList; + for (net.minecraft.entity.Entity entity : ents) { + if (region.contains(new Vector(entity.posX, entity.posY, entity.posZ))) { + entities.add(new ForgeEntity(entity)); } } return entities;