From fd8bfbf1f06153db3c5a23a064a93fb357c99b45 Mon Sep 17 00:00:00 2001 From: Andreas Troelsen Date: Thu, 21 Mar 2013 23:51:06 +0100 Subject: [PATCH] Fix NPE caused by weaponless damage. --- src/com/garbagemule/MobArena/ArenaListener.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/com/garbagemule/MobArena/ArenaListener.java b/src/com/garbagemule/MobArena/ArenaListener.java index 74296de..35e4e70 100644 --- a/src/com/garbagemule/MobArena/ArenaListener.java +++ b/src/com/garbagemule/MobArena/ArenaListener.java @@ -537,7 +537,8 @@ public class ArenaListener } // Dirty hack for invincible weapons - p.getInventory().getContents()[p.getInventory().getHeldItemSlot()].setDurability((short) 0); + ItemStack weapon = p.getInventory().getContents()[p.getInventory().getHeldItemSlot()]; + if (weapon != null) weapon.setDurability((short) 0); ArenaPlayerStatistics aps = arena.getArenaPlayer(p).getStats(); aps.add("dmgDone", event.getDamage());