Upstream/WorldGuard
1
0
Fork 0
mirror of https://github.com/EngineHub/WorldGuard.git synced 2024-10-01 16:17:28 +02:00
Code Issues Projects Releases Wiki Activity

Fixed NPE with null ItemStack for pumpkin scuba in EntityDamageEvent.

Browse Source
This commit is contained in:
sk89q 2012-03-02 10:33:14 -08:00
parent 10296cb736
commit ddefbfe2cf
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/sk89q/worldguard/bukkit/WorldGuardEntityListener.java
View File

@ -414,10 +414,13 @@ public void onEntityDamage(EntityDamageEvent event) {
event.setCancelled(true); event.setCancelled(true);
return; return;
} }
ItemStack helmet = player.getInventory().getHelmet();
if (type == DamageCause.DROWNING && wcfg.pumpkinScuba if (type == DamageCause.DROWNING && wcfg.pumpkinScuba
&& (player.getInventory().getHelmet().getTypeId() == BlockID.PUMPKIN && helmet != null
|| player.getInventory().getHelmet().getTypeId() == BlockID.JACKOLANTERN)) { && (helmet.getTypeId() == BlockID.PUMPKIN
|| helmet.getTypeId() == BlockID.JACKOLANTERN)) {
player.setRemainingAir(player.getMaximumAir()); player.setRemainingAir(player.getMaximumAir());
event.setCancelled(true); event.setCancelled(true);
return; return;