From 7f16339bd9022c4fd02ae72a242e4227e62dff40 Mon Sep 17 00:00:00 2001 From: TfT_02 Date: Sun, 2 Dec 2012 22:44:26 +0100 Subject: [PATCH] Fixed a small bug where players could salvage items in creative mode --- .gitignore | 2 +- .../gmail/nossr50/skills/repair/Salvage.java | 38 ++++++++++--------- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index f934fc574..3fa62546b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# Eclipse stuffs +# Eclipse stuff /.classpath /.project /.settings diff --git a/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java b/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java index 6da4df75c..a67fea83b 100644 --- a/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java +++ b/src/main/java/com/gmail/nossr50/skills/repair/Salvage.java @@ -27,27 +27,29 @@ public class Salvage { return; } - final PlayerProfile profile = Users.getProfile(player); - final int skillLevel = profile.getSkillLevel(SkillType.REPAIR); - final int unlockLevel = configInstance.getSalvageUnlockLevel(); + if (player.getGameMode().equals(0)){ + final PlayerProfile profile = Users.getProfile(player); + final int skillLevel = profile.getSkillLevel(SkillType.REPAIR); + final int unlockLevel = configInstance.getSalvageUnlockLevel(); - if (skillLevel >= unlockLevel) { - final World world = player.getWorld(); - final float currentdura = inHand.getDurability(); + if (skillLevel >= unlockLevel) { + final World world = player.getWorld(); + final float currentdura = inHand.getDurability(); - if (currentdura == 0) { - final int salvagedAmount = getSalvagedAmount(inHand); - final int itemID = getSalvagedItemID(inHand); + if (currentdura == 0) { + final int salvagedAmount = getSalvagedAmount(inHand); + final int itemID = getSalvagedItemID(inHand); - player.setItemInHand(new ItemStack(0)); - location.setY(location.getY() + 1); - world.dropItem(location, new ItemStack(itemID, salvagedAmount)); - player.sendMessage(LocaleLoader.getString("Repair.Skills.SalvageSuccess")); - } else { - player.sendMessage(LocaleLoader.getString("Repair.Skills.NotFullDurability")); - } - } else { - player.sendMessage(LocaleLoader.getString("Repair.Skills.AdeptSalvage")); + player.setItemInHand(new ItemStack(0)); + location.setY(location.getY() + 1); + world.dropItem(location, new ItemStack(itemID, salvagedAmount)); + player.sendMessage(LocaleLoader.getString("Repair.Skills.SalvageSuccess")); + } else { + player.sendMessage(LocaleLoader.getString("Repair.Skills.NotFullDurability")); + } + } else { + player.sendMessage(LocaleLoader.getString("Repair.Skills.AdeptSalvage")); + } } }