EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2025-07-03 22:24:43 +02:00
Code Issues Projects Releases Wiki Activity

Cleaner way to avoid salvaging chainmail.

Browse Source
This commit is contained in:
GJ
2013-05-28 12:59:10 -04:00
parent 54f135aebd
commit b0eb4b93a8
2 changed files with 2 additions and 2 deletions
src/main/java/com/gmail/nossr50
listeners
PlayerListener.java
skills
repair
Repair.java

2
src/main/java/com/gmail/nossr50/listeners/PlayerListener.java

@ -356,7 +356,7 @@ public class PlayerListener implements Listener {
}
}
/* 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();
event.setCancelled(true);

2
src/main/java/com/gmail/nossr50/skills/repair/Repair.java

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