Bugfix: It was possible to add more than <maxamount> to redstone/lapi…

…s/... modifiers if they were exactly at a lvlup threshold
SlimeKnights · Jul 30, 2014 · 527934d · 527934d
1 parent f6877b5
commit 527934d
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 1 deletion.
diff --git a/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java b/src/main/java/tconstruct/modifiers/tools/ModAntiSpider.java
@@ -24,6 +24,9 @@ protected boolean canModify (ItemStack tool, ItemStack[] input)
         if (!tags.hasKey(key))
             return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max;
 
+        if(matchingAmount(input) > max)
+            return false;
+
         int keyPair[] = tags.getIntArray(key);
         if (keyPair[0] + matchingAmount(input) <= keyPair[1])
             return true;

diff --git a/src/main/java/tconstruct/modifiers/tools/ModAttack.java b/src/main/java/tconstruct/modifiers/tools/ModAttack.java
@@ -45,6 +45,9 @@ protected boolean canModify (ItemStack tool, ItemStack[] input)
             if (!validType(toolItem))
                 return false;
 
+            if(matchingAmount(input) > max)
+                return false;
+
             NBTTagCompound tags = tool.getTagCompound().getCompoundTag(toolItem.getBaseTagName());
             if (!tags.hasKey(key))
                 return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max;

diff --git a/src/main/java/tconstruct/modifiers/tools/ModBlaze.java b/src/main/java/tconstruct/modifiers/tools/ModBlaze.java
@@ -28,6 +28,9 @@ protected boolean canModify (ItemStack tool, ItemStack[] input)
             if (!validType(toolItem))
                 return false;
 
+            if(matchingAmount(input) > max)
+                return false;
+
             NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
             if (!tags.hasKey(key))
                 return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max;

diff --git a/src/main/java/tconstruct/modifiers/tools/ModLapis.java b/src/main/java/tconstruct/modifiers/tools/ModLapis.java
@@ -33,6 +33,9 @@ protected boolean canModify (ItemStack tool, ItemStack[] input)
             if (!validType(toolItem))
                 return false;
 
+            if(matchingAmount(input) > max)
+                return false;
+
             NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
 
             if (tags.getBoolean("Silk Touch"))

diff --git a/src/main/java/tconstruct/modifiers/tools/ModPiston.java b/src/main/java/tconstruct/modifiers/tools/ModPiston.java
@@ -29,6 +29,9 @@ protected boolean canModify (ItemStack tool, ItemStack[] input)
             if (!validType(toolItem))
                 return false;
 
+            if(matchingAmount(input) > max)
+                return false;
+
             NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
             if (!tags.hasKey(key))
                 return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max;

diff --git a/src/main/java/tconstruct/modifiers/tools/ModRedstone.java b/src/main/java/tconstruct/modifiers/tools/ModRedstone.java
@@ -28,14 +28,17 @@ protected boolean canModify (ItemStack tool, ItemStack[] input)
             if (!validType(toolItem))
                 return false;
 
+            if(matchingAmount(input) > max)
+                return false;
+
             NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
             if (!tags.hasKey(key))
                 return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max;
 
             int keyPair[] = tags.getIntArray(key);
+
             if (keyPair[0] + matchingAmount(input) <= keyPair[1])
                 return true;
-
             else if (keyPair[0] == keyPair[1])
                 return tags.getInteger("Modifiers") > 0;
         }

diff --git a/src/main/java/tconstruct/modifiers/tools/ModSmite.java b/src/main/java/tconstruct/modifiers/tools/ModSmite.java
@@ -19,6 +19,9 @@ public ModSmite(String type, int effect, ItemStack[] items, int[] values)
     @Override
     protected boolean canModify (ItemStack tool, ItemStack[] input)
     {
+        if(matchingAmount(input) > max)
+            return false;
+
         NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool");
         if (!tags.hasKey(key))
             return tags.getInteger("Modifiers") > 0 && matchingAmount(input) <= max;