Pārlūkot izejas kodu

Best way to handle minimum quantities.

Check repair function first, assuming the item isn't null, otherwise
check the config. If not found, check config.
GJ 11 gadi atpakaļ
vecāks
revīzija
af98c8eb59

+ 0 - 4
src/main/java/com/gmail/nossr50/skills/repair/Repair.java

@@ -108,10 +108,6 @@ public class Repair {
             }
             }
         }
         }
 
 
-        if (quantity <= 0) {
-            return 2;
-        }
-
         return quantity;
         return quantity;
     }
     }
 }
 }

+ 2 - 2
src/main/java/com/gmail/nossr50/skills/repair/config/RepairConfig.java

@@ -132,10 +132,10 @@ public class RepairConfig extends ConfigLoader {
             }
             }
 
 
             // Minimum Quantity
             // Minimum Quantity
-            int minimumQuantity = (itemMaterial != null && repairMaterial != null ? Repair.getRepairAndSalvageQuantities(new ItemStack(itemMaterial), repairMaterial, repairMetadata) : config.getInt("Repairables." + key + ".MinimumQuantity", 2));
+            int minimumQuantity = (itemMaterial != null ? Repair.getRepairAndSalvageQuantities(new ItemStack(itemMaterial), repairMaterial, repairMetadata) : config.getInt("Repairables." + key + ".MinimumQuantity", 2));
 
 
             if (minimumQuantity <= 0 && itemMaterial != null) {
             if (minimumQuantity <= 0 && itemMaterial != null) {
-                minimumQuantity = Repair.getRepairAndSalvageQuantities(new ItemStack(itemMaterial));
+                minimumQuantity = config.getInt("Repairables." + key + ".MinimumQuantity", 2);
             }
             }
 
 
             if (minimumQuantity <= 0) {
             if (minimumQuantity <= 0) {