diff options
| author | Nate Mortensen <nate.richard.mortensen@gmail.com> | 2013-07-01 06:03:00 -0500 |
|---|---|---|
| committer | Wesley Wolfe <weswolf@aol.com> | 2013-07-01 12:10:06 -0500 |
| commit | 6c09066e224ac85b8a6464eaf8f53edfeb4beda4 (patch) | |
| tree | 573e05f4b148cb1891a1d3839175e501e6257442 /src/main/java/net/minecraft/server/DispenseBehaviorArmor.java | |
| parent | f887b76a259e12468b28d82d1eced93f0b73bd6d (diff) | |
| download | craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.gz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.lz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.tar.xz craftbukkit-6c09066e224ac85b8a6464eaf8f53edfeb4beda4.zip | |
Update CraftBukkit to 1.6.1
Diffstat (limited to 'src/main/java/net/minecraft/server/DispenseBehaviorArmor.java')
| -rw-r--r-- | src/main/java/net/minecraft/server/DispenseBehaviorArmor.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/net/minecraft/server/DispenseBehaviorArmor.java b/src/main/java/net/minecraft/server/DispenseBehaviorArmor.java index 1c50ad4f..f324d4d9 100644 --- a/src/main/java/net/minecraft/server/DispenseBehaviorArmor.java +++ b/src/main/java/net/minecraft/server/DispenseBehaviorArmor.java @@ -12,7 +12,7 @@ final class DispenseBehaviorArmor extends DispenseBehaviorItem { DispenseBehaviorArmor() {} protected ItemStack b(ISourceBlock isourceblock, ItemStack itemstack) { - EnumFacing enumfacing = BlockDispenser.j_(isourceblock.h()); + EnumFacing enumfacing = BlockDispenser.l_(isourceblock.h()); int i = isourceblock.getBlockX() + enumfacing.c(); int j = isourceblock.getBlockY() + enumfacing.d(); int k = isourceblock.getBlockZ() + enumfacing.e(); @@ -22,7 +22,7 @@ final class DispenseBehaviorArmor extends DispenseBehaviorItem { if (list.size() > 0) { EntityLiving entityliving = (EntityLiving) list.get(0); int l = entityliving instanceof EntityHuman ? 1 : 0; - int i1 = EntityLiving.b(itemstack); + int i1 = EntityInsentient.b(itemstack); // CraftBukkit start ItemStack itemstack1 = itemstack.a(1); @@ -54,7 +54,10 @@ final class DispenseBehaviorArmor extends DispenseBehaviorItem { itemstack1.count = 1; entityliving.setEquipment(i1 - l, itemstack1); - entityliving.a(i1, 2.0F); + if (entityliving instanceof EntityInsentient) { + ((EntityInsentient) entityliving).a(i1, 2.0F); + } + // --itemstack.count; // CraftBukkit - handled above return itemstack; } else { |