diff options
| author | md_5 <git@md-5.net> | 2015-09-06 14:54:41 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2015-09-06 14:54:41 +1000 |
| commit | 5e9f698fac73a155217f9b42fdb203ea067961e8 (patch) | |
| tree | 34bb8866a8e5a664a150817393a982fd0aa90d40 /src | |
| parent | 9a17f01ff1f19045f1f8a4fd4ee4b4a368cabb14 (diff) | |
| download | craftbukkit-5e9f698fac73a155217f9b42fdb203ea067961e8.tar craftbukkit-5e9f698fac73a155217f9b42fdb203ea067961e8.tar.gz craftbukkit-5e9f698fac73a155217f9b42fdb203ea067961e8.tar.lz craftbukkit-5e9f698fac73a155217f9b42fdb203ea067961e8.tar.xz craftbukkit-5e9f698fac73a155217f9b42fdb203ea067961e8.zip | |
SPIGOT-1165: Restore getNearbyEntities behaviour to include spectators.
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 2 | ||||
| -rw-r--r-- | src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java | 11 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index 554e3b78..2bbbdd37 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -712,7 +712,7 @@ public class CraftWorld implements World { } AxisAlignedBB bb = new AxisAlignedBB(location.getX() - x, location.getY() - y, location.getZ() - z, location.getX() + x, location.getY() + y, location.getZ() + z); - List<net.minecraft.server.Entity> entityList = getHandle().getEntities(null, bb); + List<net.minecraft.server.Entity> entityList = getHandle().a((net.minecraft.server.Entity) null, bb, null); // PAIL : rename List<Entity> bukkitEntityList = new ArrayList<org.bukkit.entity.Entity>(entityList.size()); for (Object entity : entityList) { bukkitEntityList.add(((net.minecraft.server.Entity) entity).getBukkitEntity()); diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java index 8f5c0587..b986a467 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java @@ -1,6 +1,8 @@ package org.bukkit.craftbukkit.entity; import com.google.common.base.Preconditions; +import java.util.ArrayList; +import java.util.Collection; import java.util.List; import java.util.Set; import java.util.UUID; @@ -247,14 +249,7 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity { } public List<org.bukkit.entity.Entity> getNearbyEntities(double x, double y, double z) { - @SuppressWarnings("unchecked") - List<Entity> notchEntityList = entity.world.getEntities(entity, entity.getBoundingBox().grow(x, y, z)); - 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; + return new ArrayList<org.bukkit.entity.Entity>(getHandle().getWorld().getWorld().getNearbyEntities(getLocation(), x, y, z)); } public int getEntityId() { |