diff options
| author | md_5 <git@md-5.net> | 2016-05-10 21:47:39 +1000 |
|---|---|---|
| committer | md_5 <git@md-5.net> | 2016-05-10 21:47:39 +1000 |
| commit | c5e9a169fa564f3b8119b6666f8df59d5a9b45c3 (patch) | |
| tree | 9f3b1ce732f0082b71512b1dddb7abb35526226e /nms-patches/EntityArmorStand.patch | |
| parent | 4cb32587ac1ff543b2efa9498f8d0d358cb90c12 (diff) | |
| download | craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.gz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.lz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.tar.xz craftbukkit-c5e9a169fa564f3b8119b6666f8df59d5a9b45c3.zip | |
Minecraft 1.9.4
Diffstat (limited to 'nms-patches/EntityArmorStand.patch')
| -rw-r--r-- | nms-patches/EntityArmorStand.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nms-patches/EntityArmorStand.patch b/nms-patches/EntityArmorStand.patch index 9eb9bb36..67ced54f 100644 --- a/nms-patches/EntityArmorStand.patch +++ b/nms-patches/EntityArmorStand.patch @@ -1,8 +1,8 @@ --- a/net/minecraft/server/EntityArmorStand.java +++ b/net/minecraft/server/EntityArmorStand.java -@@ -4,6 +4,15 @@ - import java.util.Arrays; +@@ -5,6 +5,15 @@ import java.util.List; + import javax.annotation.Nullable; +// CraftBukkit start +import org.bukkit.inventory.EquipmentSlot; @@ -15,10 +15,10 @@ + public class EntityArmorStand extends EntityLiving { - private static final Vector3f bp = new Vector3f(0.0F, 0.0F, 0.0F); -@@ -360,6 +369,21 @@ - if (itemstack1 == null || (this.bz & 1 << enumitemslot.c() + 8) == 0) { - if (itemstack1 != null || (this.bz & 1 << enumitemslot.c() + 16) == 0) { + private static final Vector3f bq = new Vector3f(0.0F, 0.0F, 0.0F); +@@ -362,6 +371,21 @@ + if (itemstack1 == null || (this.bA & 1 << enumitemslot.c() + 8) == 0) { + if (itemstack1 != null || (this.bA & 1 << enumitemslot.c() + 16) == 0) { ItemStack itemstack2; + // CraftBukkit start + org.bukkit.inventory.ItemStack armorStandItem = CraftItemStack.asCraftMirror(itemstack1); @@ -38,7 +38,7 @@ if (entityhuman.abilities.canInstantlyBuild && (itemstack1 == null || itemstack1.getItem() == Item.getItemOf(Blocks.AIR)) && itemstack != null) { itemstack2 = itemstack.cloneItemStack(); -@@ -381,6 +405,11 @@ +@@ -383,6 +407,11 @@ } public boolean damageEntity(DamageSource damagesource, float f) { |