diff options
author | sk89q <the.sk89q@gmail.com> | 2011-01-07 14:06:08 -0800 |
---|---|---|
committer | sk89q <the.sk89q@gmail.com> | 2011-01-07 14:06:08 -0800 |
commit | e968096fc72e80731405d7f5d48848e43a94d1c1 (patch) | |
tree | 5afe125ee49f3f6d1206e990a90ef0616b51d5b6 /src/main/java | |
parent | 6d6668aaeb785b204e53e67d68261207e66c9230 (diff) | |
download | craftbukkit-e968096fc72e80731405d7f5d48848e43a94d1c1.tar craftbukkit-e968096fc72e80731405d7f5d48848e43a94d1c1.tar.gz craftbukkit-e968096fc72e80731405d7f5d48848e43a94d1c1.tar.lz craftbukkit-e968096fc72e80731405d7f5d48848e43a94d1c1.tar.xz craftbukkit-e968096fc72e80731405d7f5d48848e43a94d1c1.zip |
Changed resolution order in CraftWorld.toCraftEntity() to give CraftMappable precedence.
Diffstat (limited to 'src/main/java')
-rw-r--r-- | src/main/java/org/bukkit/craftbukkit/CraftWorld.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java index fb6d67f6..fdfcaea5 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java @@ -166,7 +166,9 @@ public class CraftWorld implements World { } public CraftEntity toCraftEntity(net.minecraft.server.Entity entity) { - if (entity instanceof EntityArrow) { + if (entity instanceof CraftMappable) { + return ((CraftMappable)entity).getCraftEntity(); + } else if (entity instanceof EntityArrow) { return new CraftArrow(world.getServer(), (EntityArrow)entity); } else if (entity instanceof EntityEgg) { return new CraftEgg(world.getServer(), (EntityEgg)entity); @@ -178,8 +180,6 @@ public class CraftWorld implements World { return new CraftHumanEntity(world.getServer(), (EntityPlayer)entity); } else if (entity instanceof EntityLiving) { return new CraftLivingEntity(world.getServer(), (EntityLiving)entity); - } else if (entity instanceof CraftMappable) { - return ((CraftMappable)entity).getCraftEntity(); } else { return null; } |