Fix cookie fuckup

1 files changed, 25 insertions, 5 deletions

diff --git a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EquipmentModifier.java b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EquipmentModifier.java
index ed1a932b..e68aa948 100644
--- a/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EquipmentModifier.java
+++ b/src/main/java/io/github/moulberry/notenoughupdates/miscfeatures/entityviewer/EquipmentModifier.java
@@ -4,21 +4,41 @@ import com.google.gson.JsonObject;
 import io.github.moulberry.notenoughupdates.NEUManager;
 import io.github.moulberry.notenoughupdates.NotEnoughUpdates;
 import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemStack;
 
 public class EquipmentModifier extends EntityViewerModifier {
     @Override
     public EntityLivingBase applyModifier(EntityLivingBase base, JsonObject info) {
         NEUManager manager = NotEnoughUpdates.INSTANCE.manager;
         if (info.has("hand"))
-            base.setCurrentItemOrArmor(0, manager.createItem(info.get("hand").getAsString()));
+            setCurrentItemOrArmor(base, 0, manager.createItem(info.get("hand").getAsString()));
         if (info.has("helmet"))
-            base.setCurrentItemOrArmor(4, manager.createItem(info.get("helmet").getAsString()));
+            setCurrentItemOrArmor(base, 4, manager.createItem(info.get("helmet").getAsString()));
         if (info.has("chestplate"))
-            base.setCurrentItemOrArmor(3, manager.createItem(info.get("chestplate").getAsString()));
+            setCurrentItemOrArmor(base, 3, manager.createItem(info.get("chestplate").getAsString()));
         if (info.has("leggings"))
-            base.setCurrentItemOrArmor(2, manager.createItem(info.get("leggings").getAsString()));
+            setCurrentItemOrArmor(base, 2, manager.createItem(info.get("leggings").getAsString()));
         if (info.has("feet"))
-            base.setCurrentItemOrArmor(1, manager.createItem(info.get("feet").getAsString()));
+            setCurrentItemOrArmor(base, 1, manager.createItem(info.get("feet").getAsString()));
         return base;
     }
+
+    public void setCurrentItemOrArmor(EntityLivingBase entity, int slot, ItemStack itemStack) {
+        if (entity instanceof EntityPlayer) {
+            setPlayerCurrentItemOrArmor((EntityPlayer) entity, slot, itemStack);
+        } else {
+            entity.setCurrentItemOrArmor(slot, itemStack);
+        }
+    }
+
+    // Biscuit person needs to learn how to code and not fuck up valid vanilla behaviour
+    public static void setPlayerCurrentItemOrArmor(EntityPlayer player, int slot, ItemStack itemStack) {
+        if (slot == 0) {
+            player.inventory.mainInventory[player.inventory.currentItem] = itemStack;
+        } else {
+            player.inventory.armorInventory[slot - 1] = itemStack;
+        }
+    }
+
 }