diff options
author | feildmaster <admin@feildmaster.com> | 2013-09-19 13:25:08 -0500 |
---|---|---|
committer | feildmaster <admin@feildmaster.com> | 2013-09-19 20:01:02 -0500 |
commit | dcb9d6a5ef2d572b041696d5728f660aa8549e47 (patch) | |
tree | 5b81d2ea9db695ea713deb9a47b6c867fa5219b2 /src/main/java/net/minecraft/server/EntityLeash.java | |
parent | e20ef1f60600467077bba06d36585ae9d3c5fb27 (diff) | |
download | craftbukkit-dcb9d6a5ef2d572b041696d5728f660aa8549e47.tar craftbukkit-dcb9d6a5ef2d572b041696d5728f660aa8549e47.tar.gz craftbukkit-dcb9d6a5ef2d572b041696d5728f660aa8549e47.tar.lz craftbukkit-dcb9d6a5ef2d572b041696d5728f660aa8549e47.tar.xz craftbukkit-dcb9d6a5ef2d572b041696d5728f660aa8549e47.zip |
Update CraftBukkit to 1.6.4
Diffstat (limited to 'src/main/java/net/minecraft/server/EntityLeash.java')
-rw-r--r-- | src/main/java/net/minecraft/server/EntityLeash.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/main/java/net/minecraft/server/EntityLeash.java b/src/main/java/net/minecraft/server/EntityLeash.java index da2632d5..a2687c2d 100644 --- a/src/main/java/net/minecraft/server/EntityLeash.java +++ b/src/main/java/net/minecraft/server/EntityLeash.java @@ -41,7 +41,7 @@ public class EntityLeash extends EntityHanging { public void a(NBTTagCompound nbttagcompound) {} public boolean c(EntityHuman entityhuman) { - ItemStack itemstack = entityhuman.aY(); + ItemStack itemstack = entityhuman.aZ(); boolean flag = false; double d0; List list; @@ -56,14 +56,14 @@ public class EntityLeash extends EntityHanging { while (iterator.hasNext()) { entityinsentient = (EntityInsentient) iterator.next(); - if (entityinsentient.bH() && entityinsentient.bI() == entityhuman) { + if (entityinsentient.bH() && entityinsentient.getLeashHolder() == entityhuman) { // CraftBukkit start if (CraftEventFactory.callPlayerLeashEntityEvent(entityinsentient, this, entityhuman).isCancelled()) { - ((EntityPlayer) entityhuman).playerConnection.sendPacket(new Packet39AttachEntity(1, entityinsentient, entityinsentient.bI())); + ((EntityPlayer) entityhuman).playerConnection.sendPacket(new Packet39AttachEntity(1, entityinsentient, entityinsentient.getLeashHolder())); continue; } // CraftBukkit end - entityinsentient.b(this, true); + entityinsentient.setLeashHolder(this, true); flag = true; } } @@ -83,13 +83,13 @@ public class EntityLeash extends EntityHanging { while (iterator.hasNext()) { entityinsentient = (EntityInsentient) iterator.next(); - if (entityinsentient.bH() && entityinsentient.bI() == this) { + if (entityinsentient.bH() && entityinsentient.getLeashHolder() == this) { // CraftBukkit start if (CraftEventFactory.callPlayerUnleashEntityEvent(entityinsentient, entityhuman).isCancelled()) { die = false; continue; } - entityinsentient.a(true, !entityhuman.abilities.canInstantlyBuild); // false -> survival mode boolean + entityinsentient.unleash(true, !entityhuman.abilities.canInstantlyBuild); // false -> survival mode boolean // CraftBukkit end } } |