Don't repair potions and wool.

2013-03-27 14:09:10 +01:00
parent 7977915aa1
commit 45f2605794
1 changed files with 4 additions and 1 deletions
@@ -538,7 +538,10 @@ public class ArenaListener
            
            // Dirty hack for invincible weapons
            ItemStack weapon = p.getInventory().getContents()[p.getInventory().getHeldItemSlot()];
-            if (weapon != null) weapon.setDurability((short) 0);
+            if (weapon != null &&               // Avoid NPE
+                weapon.getTypeId() != 373 &&    // Prevent potion -> water bottle
+                weapon.getTypeId() != 35)       // Prevent wool -> white wool
+                weapon.setDurability((short) 0);

            ArenaPlayerStatistics aps = arena.getArenaPlayer(p).getStats();
            aps.add("dmgDone", event.getDamage());