summaryrefslogtreecommitdiffstats
path: root/src/main/java/org/bukkit
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2015-09-18 15:15:56 +1000
committermd_5 <git@md-5.net>2015-09-18 15:15:56 +1000
commit701ae54ffccd9864e5ace94cdd1d501457a971a1 (patch)
tree11ecb1db79ac090ee818da301e1059ea5511d265 /src/main/java/org/bukkit
parentc3730616ee72b4e6e6b4f59654519d653791bc34 (diff)
downloadcraftbukkit-701ae54ffccd9864e5ace94cdd1d501457a971a1.tar
craftbukkit-701ae54ffccd9864e5ace94cdd1d501457a971a1.tar.gz
craftbukkit-701ae54ffccd9864e5ace94cdd1d501457a971a1.tar.lz
craftbukkit-701ae54ffccd9864e5ace94cdd1d501457a971a1.tar.xz
craftbukkit-701ae54ffccd9864e5ace94cdd1d501457a971a1.zip
SPIGOT-1192: Restore some behaviour to entity.getNearbyEntities
Diffstat (limited to 'src/main/java/org/bukkit')
-rw-r--r--src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
index b986a467..5693e3a7 100644
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -249,7 +249,13 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
}
public List<org.bukkit.entity.Entity> getNearbyEntities(double x, double y, double z) {
- return new ArrayList<org.bukkit.entity.Entity>(getHandle().getWorld().getWorld().getNearbyEntities(getLocation(), x, y, z));
+ List<Entity> notchEntityList = entity.world.a(entity, entity.getBoundingBox().grow(x, y, z), null);
+ List<org.bukkit.entity.Entity> bukkitEntityList = new java.util.ArrayList<org.bukkit.entity.Entity>(notchEntityList.size());
+
+ for (Entity e : notchEntityList) {
+ bukkitEntityList.add(e.getBukkitEntity());
+ }
+ return bukkitEntityList;
}
public int getEntityId() {