diff options
author | mbax <matt@phozop.net> | 2013-11-04 07:07:38 -0600 |
---|---|---|
committer | Wesley Wolfe <weswolf@aol.com> | 2013-11-30 19:26:12 -0600 |
commit | 2726696652179a5ead7dc07dd39edf7dfda687f7 (patch) | |
tree | ff78e22fdd4fc01889a5f6cc482b599f965cd93a /src/main/java/net/minecraft/server/ItemLeash.java | |
parent | ff8b70fbb7a96b9d2ff078afcf3b3ff90f200981 (diff) | |
download | craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.gz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.lz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.tar.xz craftbukkit-2726696652179a5ead7dc07dd39edf7dfda687f7.zip |
Update CraftBukkit to Minecraft 1.7.2
Diffstat (limited to 'src/main/java/net/minecraft/server/ItemLeash.java')
-rw-r--r-- | src/main/java/net/minecraft/server/ItemLeash.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/main/java/net/minecraft/server/ItemLeash.java b/src/main/java/net/minecraft/server/ItemLeash.java index e63ae3e6..e24b2a8d 100644 --- a/src/main/java/net/minecraft/server/ItemLeash.java +++ b/src/main/java/net/minecraft/server/ItemLeash.java @@ -7,15 +7,14 @@ import org.bukkit.event.hanging.HangingPlaceEvent; // CraftBukkit public class ItemLeash extends Item { - public ItemLeash(int i) { - super(i); + public ItemLeash() { this.a(CreativeModeTab.i); } public boolean interactWith(ItemStack itemstack, EntityHuman entityhuman, World world, int i, int j, int k, int l, float f, float f1, float f2) { - int i1 = world.getTypeId(i, j, k); + Block block = world.getType(i, j, k); - if (Block.byId[i1] != null && Block.byId[i1].d() == 11) { + if (block.b() == 11) { if (world.isStatic) { return true; } else { @@ -39,7 +38,7 @@ public class ItemLeash extends Item { while (iterator.hasNext()) { EntityInsentient entityinsentient = (EntityInsentient) iterator.next(); - if (entityinsentient.bH() && entityinsentient.getLeashHolder() == entityhuman) { + if (entityinsentient.bL() && entityinsentient.getLeashHolder() == entityhuman) { if (entityleash == null) { entityleash = EntityLeash.a(world, i, j, k); @@ -59,6 +58,7 @@ public class ItemLeash extends Item { continue; } // CraftBukkit end + entityinsentient.setLeashHolder(entityleash, true); flag = true; } |