1
0
mirror of https://github.com/essentials/Essentials.git synced 2025-08-12 09:35:26 +02:00

Fixing NPE on Entity Listener (Powertool).

This commit is contained in:
KHobbits
2011-08-24 03:09:27 +01:00
parent 767362c9d8
commit 13056601b7

View File

@@ -37,8 +37,11 @@ public class EssentialsEntityListener extends EntityListener
User attacker = ess.getUser(eAttack);
ItemStack is = attacker.getItemInHand();
List<String> commandList = attacker.getPowertool(is);
if (commandList != null && !commandList.isEmpty())
{
for (String command : commandList)
{
if (command != null && !command.isEmpty())
{
attacker.getServer().dispatchCommand(attacker, command.replaceAll("\\{player\\}", defender.getName()));
@@ -48,6 +51,7 @@ public class EssentialsEntityListener extends EntityListener
}
}
}
}
if (event instanceof EntityDamageEvent || event instanceof EntityDamageByBlockEvent || event instanceof EntityDamageByProjectileEvent)
{