@@ -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) {
|
||||
|
||||
Reference in New Issue
Block a user