Fix Redstone and Attack modifiers eating your free modifiers on part …

…replacement.
SlimeKnights · Aug 12, 2014 · 7763ea4 · 7763ea4
1 parent 99f9dfd
commit 7763ea4
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/src/main/java/iguanaman/iguanatweakstconstruct/replacing/ReplacementLogic.java b/src/main/java/iguanaman/iguanatweakstconstruct/replacing/ReplacementLogic.java
@@ -224,6 +224,7 @@ private static void handleMaterialTraits(NBTTagCompound tags, int oldMaterialId,
         // nothing to do fi they're the same :)
         if(oldMaterialId == newMaterialId)
             return;
+
         ToolMaterial oldMat = TConstructRegistry.getMaterial(oldMaterialId);
         ToolMaterial newMat = TConstructRegistry.getMaterial(newMaterialId);
 
@@ -259,6 +260,8 @@ private static void reapplyRedstone(NBTTagCompound tags, ItemStack itemStack)
         if(!tags.hasKey("Redstone"))
             return;
 
+        int modifiers = tags.getInteger("Modifiers"); // backup modifiers
+
         // find the redstone modifier
         for(ItemModifier mod : ModifyBuilder.instance.itemModifiers)
             if(mod instanceof ModRedstone)
@@ -282,6 +285,9 @@ private static void reapplyRedstone(NBTTagCompound tags, ItemStack itemStack)
                 while(rLvl-- > 0)
                     modRedstone.modify(new ItemStack[]{new ItemStack(Items.redstone)}, itemStack); // tags belong to oldTool
             }
+
+        // restore modifiers
+        tags.setInteger("Modifiers", modifiers);
     }
 
     // same as reapplyRedstone but for Attack modifier
@@ -291,7 +297,9 @@ private static void reapplyAttack(NBTTagCompound tags, ItemStack itemStack)
         if(!tags.hasKey("ModAttack"))
             return;
 
-        // find the redstone modifier
+        int modifiers = tags.getInteger("Modifiers"); // backup modifiers
+
+        // find the correct(!!, not glove attack) modifier
         for(ItemModifier mod : ModifyBuilder.instance.itemModifiers)
             if(mod.key.equals("ModAttack"))
             {
@@ -312,6 +320,9 @@ private static void reapplyAttack(NBTTagCompound tags, ItemStack itemStack)
                 while(qLvl-- > 0)
                     modAttack.modify(new ItemStack[]{new ItemStack(Items.quartz)}, itemStack); // tags belong to oldTool
             }
+
+        // restore modifiers
+        tags.setInteger("Modifiers", modifiers);
     }
 
     // removes the mobhead modifier and rendering