Jelajahi Sumber

Cleaner way to avoid salvaging chainmail.

GJ 12 tahun lalu
induk
melakukan
b0eb4b93a8

+ 1 - 1
src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@@ -356,7 +356,7 @@ public class PlayerListener implements Listener {
                         }
                         }
                     }
                     }
                     /* SALVAGE CHECKS */
                     /* SALVAGE CHECKS */
-                    else if (blockID == Repair.salvageAnvilId && Permissions.salvage(player) && Repair.isSalvageable(heldItem) && !ItemUtils.isChainmailArmor(heldItem)) {
+                    else if (blockID == Repair.salvageAnvilId && Permissions.salvage(player) && Repair.isSalvageable(heldItem)) {
                         RepairManager repairManager = mcMMOPlayer.getRepairManager();
                         RepairManager repairManager = mcMMOPlayer.getRepairManager();
                         event.setCancelled(true);
                         event.setCancelled(true);
 
 

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

@@ -33,7 +33,7 @@ public class Repair {
             return true;
             return true;
         }
         }
 
 
-        if (Config.getInstance().getSalvageArmor() && ItemUtils.isMinecraftArmor(item)) {
+        if (Config.getInstance().getSalvageArmor() && !ItemUtils.isChainmailArmor(item) && ItemUtils.isMinecraftArmor(item)) {
             return true;
             return true;
         }
         }