From f6a0b1e4265544eaee4e4d4adb660812b01d6a06 Mon Sep 17 00:00:00 2001 From: mbax Date: Mon, 8 Jul 2013 19:43:37 -0400 Subject: Update CraftBukkit to 1.6.2 --- src/main/java/net/minecraft/server/ContainerHorse.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/main/java/net/minecraft/server/ContainerHorse.java') diff --git a/src/main/java/net/minecraft/server/ContainerHorse.java b/src/main/java/net/minecraft/server/ContainerHorse.java index 4ddf8e05..43fb0cdd 100644 --- a/src/main/java/net/minecraft/server/ContainerHorse.java +++ b/src/main/java/net/minecraft/server/ContainerHorse.java @@ -40,7 +40,7 @@ public class ContainerHorse extends Container { int j; int k; - if (entityhorse.ca()) { + if (entityhorse.hasChest()) { for (j = 0; j < b0; ++j) { for (k = 0; k < 5; ++k) { this.a(new Slot(iinventory1, 2 + k + j * 5, 80 + k * 18, 18 + j * 18)); @@ -60,7 +60,7 @@ public class ContainerHorse extends Container { } public boolean a(EntityHuman entityhuman) { - return this.a.a(entityhuman) && this.f.isAlive() && this.f.d(entityhuman) < 8.0F; // CraftBukkit - add isAlive as a validator + return this.a.a(entityhuman) && this.f.isAlive() && this.f.d(entityhuman) < 8.0F; } public ItemStack b(EntityHuman entityhuman, int i) { @@ -75,7 +75,7 @@ public class ContainerHorse extends Container { if (!this.a(itemstack1, this.a.getSize(), this.c.size(), true)) { return null; } - } else if (this.getSlot(1).isAllowed(itemstack1)) { + } else if (this.getSlot(1).isAllowed(itemstack1) && !this.getSlot(1).e()) { if (!this.a(itemstack1, 1, 2, false)) { return null; } -- cgit v1.2.3