EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-23 05:36:46 +01:00
Code Issues Projects Releases Wiki Activity

Shears are in isIronTool(), no need to check explicitly

Browse Source
This commit is contained in:
TfT_02 2013-02-06 14:59:36 +01:00
parent 40773ee6f6
commit ba4d0451ff
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/gmail/nossr50/skills/repair/Salvage.java
View File

@ -85,7 +85,7 @@ public class Salvage {
int salvagedItem = 0; int salvagedItem = 0;
if (ItemChecks.isDiamondTool(inHand) || ItemChecks.isDiamondArmor(inHand)) salvagedItem = 264; if (ItemChecks.isDiamondTool(inHand) || ItemChecks.isDiamondArmor(inHand)) salvagedItem = 264;
else if (ItemChecks.isGoldTool(inHand) || ItemChecks.isGoldArmor(inHand)) salvagedItem = 266; else if (ItemChecks.isGoldTool(inHand) || ItemChecks.isGoldArmor(inHand)) salvagedItem = 266;
else if (ItemChecks.isIronTool(inHand) || ItemChecks.isIronArmor(inHand) || inHand.getType() == Material.BUCKET || inHand.getType() == Material.SHEARS) salvagedItem = 265; else if (ItemChecks.isIronTool(inHand) || ItemChecks.isIronArmor(inHand) || inHand.getType() == Material.BUCKET) salvagedItem = 265;
else if (ItemChecks.isStoneTool(inHand)) salvagedItem = 4; else if (ItemChecks.isStoneTool(inHand)) salvagedItem = 4;
else if (ItemChecks.isWoodTool(inHand)) salvagedItem = 5; else if (ItemChecks.isWoodTool(inHand)) salvagedItem = 5;
else if (ItemChecks.isLeatherArmor(inHand)) salvagedItem = 334; else if (ItemChecks.isLeatherArmor(inHand)) salvagedItem = 334;
@ -111,7 +111,7 @@ public class Salvage {
* @return true if the item is salvageable, false otherwise * @return true if the item is salvageable, false otherwise
*/ */
public static boolean isSalvageable(final ItemStack is) { public static boolean isSalvageable(final ItemStack is) {
if (configInstance.getSalvageTools() && (ItemChecks.isTool(is) || ItemChecks.isStringTool(is) || is.getType() == Material.BUCKET || is.getType() == Material.SHEARS)) { if (configInstance.getSalvageTools() && (ItemChecks.isTool(is) || ItemChecks.isStringTool(is) || is.getType() == Material.BUCKET)) {
return true; return true;
} }
if (configInstance.getSalvageArmor() && ItemChecks.isArmor(is)) { if (configInstance.getSalvageArmor() && ItemChecks.isArmor(is)) {