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

Minor cleanup

Browse Source
This commit is contained in:
TfT_02 2013-02-06 15:29:21 +01:00
parent ba4d0451ff
commit 2799bab206
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,7 +23,7 @@ public class Salvage {
public static int salvageUnlockLevel = Config.getInstance().getSalvageUnlockLevel(); public static int salvageUnlockLevel = Config.getInstance().getSalvageUnlockLevel();
public static int anvilID = Config.getInstance().getSalvageAnvilId(); public static int anvilID = Config.getInstance().getSalvageAnvilId();
public static void handleSalvage(final Player player, final Location location, final ItemStack inHand) { public static void handleSalvage(final Player player, final Location location, final ItemStack item) {
if (!configInstance.getSalvageEnabled()) { if (!configInstance.getSalvageEnabled()) {
return; return;
} }
@ -32,12 +32,16 @@ public class Salvage {
final int skillLevel = Users.getPlayer(player).getProfile().getSkillLevel(SkillType.REPAIR); final int skillLevel = Users.getPlayer(player).getProfile().getSkillLevel(SkillType.REPAIR);
final int unlockLevel = configInstance.getSalvageUnlockLevel(); final int unlockLevel = configInstance.getSalvageUnlockLevel();
if (skillLevel >= unlockLevel) { if (skillLevel < unlockLevel) {
final float currentdura = inHand.getDurability(); player.sendMessage(LocaleLoader.getString("Repair.Skills.AdeptSalvage"));
return;
}
final float currentdura = item.getDurability();
if (currentdura == 0) { if (currentdura == 0) {
final int salvagedAmount = getSalvagedAmount(inHand); final int salvagedAmount = getSalvagedAmount(item);
final int itemID = getSalvagedItemID(inHand); final int itemID = getSalvagedItemID(item);
player.setItemInHand(new ItemStack(Material.AIR)); player.setItemInHand(new ItemStack(Material.AIR));
location.setY(location.getY() + 1); location.setY(location.getY() + 1);
@ -50,10 +54,7 @@ public class Salvage {
player.sendMessage(LocaleLoader.getString("Repair.Skills.NotFullDurability")); player.sendMessage(LocaleLoader.getString("Repair.Skills.NotFullDurability"));
} }
} }
else {
player.sendMessage(LocaleLoader.getString("Repair.Skills.AdeptSalvage"));
}
}
} }
/** /**