diff options
author | KHobbits <rob@khobbits.co.uk> | 2011-08-24 03:09:27 +0100 |
---|---|---|
committer | KHobbits <rob@khobbits.co.uk> | 2011-08-24 03:09:27 +0100 |
commit | 30f0f78efcc0f4584fb33ffa61f15d96effb3c1d (patch) | |
tree | 3034169d37ebd8a6367d5af9950f140c3d24a66c | |
parent | 8cc249c2d3b871abbc5a2664c69c2a92325b1744 (diff) | |
download | Essentials-30f0f78efcc0f4584fb33ffa61f15d96effb3c1d.tar Essentials-30f0f78efcc0f4584fb33ffa61f15d96effb3c1d.tar.gz Essentials-30f0f78efcc0f4584fb33ffa61f15d96effb3c1d.tar.lz Essentials-30f0f78efcc0f4584fb33ffa61f15d96effb3c1d.tar.xz Essentials-30f0f78efcc0f4584fb33ffa61f15d96effb3c1d.zip |
Fixing NPE on Entity Listener (Powertool).
-rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java index 3e53e3eea..91c4bdce4 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsEntityListener.java @@ -37,13 +37,17 @@ public class EssentialsEntityListener extends EntityListener User attacker = ess.getUser(eAttack); ItemStack is = attacker.getItemInHand(); List<String> commandList = attacker.getPowertool(is); - for(String command : commandList) + if (commandList != null && !commandList.isEmpty()) { - if (command != null && !command.isEmpty()) + for (String command : commandList) { - attacker.getServer().dispatchCommand(attacker, command.replaceAll("\\{player\\}", defender.getName())); - event.setCancelled(true); - return; + + if (command != null && !command.isEmpty()) + { + attacker.getServer().dispatchCommand(attacker, command.replaceAll("\\{player\\}", defender.getName())); + event.setCancelled(true); + return; + } } } } |