diff options
| author | md_5 <git@md-5.net> | 2016-11-17 12:41:03 +1100 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-11-17 12:41:03 +1100 |
| commit | c25ddf063a808e3adb749e22017661f403c5fb7e (patch) | |
| tree | b2efcff512be12fd3e38cf8c36386148ce6ab4ae /nms-patches/EntityArmorStand.patch | |
| parent | 51263e97187a84338f89698eef187284055a682a (diff) | |
| download | craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.gz craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.lz craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.tar.xz craftbukkit-c25ddf063a808e3adb749e22017661f403c5fb7e.zip | |
Update to Minecraft 1.11
Diffstat (limited to 'nms-patches/EntityArmorStand.patch')
| -rw-r--r-- | nms-patches/EntityArmorStand.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/nms-patches/EntityArmorStand.patch b/nms-patches/EntityArmorStand.patch index 9e7ef90b..2f17e36f 100644 --- a/nms-patches/EntityArmorStand.patch +++ b/nms-patches/EntityArmorStand.patch @@ -15,10 +15,10 @@ + public class EntityArmorStand extends EntityLiving { - private static final Vector3f br = new Vector3f(0.0F, 0.0F, 0.0F); -@@ -373,6 +382,21 @@ - if (itemstack1 == null || (this.bB & 1 << enumitemslot.c() + 8) == 0) { - if (itemstack1 != null || (this.bB & 1 << enumitemslot.c() + 16) == 0) { + private static final Vector3f bq = new Vector3f(0.0F, 0.0F, 0.0F); +@@ -364,6 +373,21 @@ + if (itemstack1.isEmpty() || (this.bA & 1 << enumitemslot.c() + 8) == 0) { + if (!itemstack1.isEmpty() || (this.bA & 1 << enumitemslot.c() + 16) == 0) { ItemStack itemstack2; + // CraftBukkit start + org.bukkit.inventory.ItemStack armorStandItem = CraftItemStack.asCraftMirror(itemstack1); @@ -36,9 +36,9 @@ + } + // CraftBukkit end - if (entityhuman.abilities.canInstantlyBuild && (itemstack1 == null || itemstack1.getItem() == Item.getItemOf(Blocks.AIR)) && itemstack != null) { + if (entityhuman.abilities.canInstantlyBuild && itemstack1.isEmpty() && !itemstack.isEmpty()) { itemstack2 = itemstack.cloneItemStack(); -@@ -394,6 +418,11 @@ +@@ -385,6 +409,11 @@ } public boolean damageEntity(DamageSource damagesource, float f) { |