Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-02-17 04:51:36 +01:00
Code Issues Projects Releases Wiki Activity

Changed resolution order in CraftWorld.toCraftEntity() to give CraftMappable precedence.

Browse Source
This commit is contained in:
sk89q 2011-01-07 14:06:08 -08:00
parent 6d6668aaeb
commit e968096fc7
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@ -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;
}