diff options
| author | snowleo <schneeleo@gmail.com> | 2011-10-08 19:41:41 +0200 |
|---|---|---|
| committer | snowleo <schneeleo@gmail.com> | 2011-10-08 19:41:41 +0200 |
| commit | bde34ee59a0b897fc1dd5f1591af0bf929e7af3c (patch) | |
| tree | 46e83878c5530851458d5c6353506edf144f8272 | |
| parent | e7aeb27a7862277c9aec66883bd5ed63c4a67849 (diff) | |
| download | Essentials-bde34ee59a0b897fc1dd5f1591af0bf929e7af3c.tar Essentials-bde34ee59a0b897fc1dd5f1591af0bf929e7af3c.tar.gz Essentials-bde34ee59a0b897fc1dd5f1591af0bf929e7af3c.tar.lz Essentials-bde34ee59a0b897fc1dd5f1591af0bf929e7af3c.tar.xz Essentials-bde34ee59a0b897fc1dd5f1591af0bf929e7af3c.zip | |
Fix NPE in /repair
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/commands/Commandrepair.java | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java index 029901867..d6bcad464 100644 --- a/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java +++ b/Essentials/src/com/earth2me/essentials/commands/Commandrepair.java @@ -30,6 +30,10 @@ public class Commandrepair extends EssentialsCommand if (args[0].equalsIgnoreCase("hand")) { final ItemStack item = user.getItemInHand(); + if (item == null) + { + throw new Exception(Util.i18n("repairInvalidType")); + } final String itemName = item.getType().toString().toLowerCase(); final Trade charge = new Trade("repair-" + itemName.replace('_', '-'), ess); @@ -84,6 +88,10 @@ public class Commandrepair extends EssentialsCommand { for (ItemStack item : items) { + if (item == null) + { + continue; + } final String itemName = item.getType().toString().toLowerCase(); final Trade charge = new Trade("repair-" + itemName.replace('_', '-'), ess); try |