From 1e4a54baca307f844f02794a04564d85d7508a1a Mon Sep 17 00:00:00 2001 From: snowleo Date: Sun, 20 Nov 2011 16:50:08 +0100 Subject: Prevent NPE with creatures that are not added to bucket yet. --- .../essentials/protect/EssentialsProtectEntityListener.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'EssentialsProtect/src/com') diff --git a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java index bbf67607f..f901844d2 100644 --- a/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java +++ b/EssentialsProtect/src/com/earth2me/essentials/protect/EssentialsProtectEntityListener.java @@ -14,6 +14,7 @@ import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.craftbukkit.CraftServer; import org.bukkit.craftbukkit.CraftWorld; +import org.bukkit.entity.CreatureType; import org.bukkit.entity.Creeper; import org.bukkit.entity.Entity; import org.bukkit.entity.Fireball; @@ -309,7 +310,12 @@ public class EssentialsProtectEntityListener extends EntityListener { return; } - final String creatureName = event.getCreatureType().toString().toLowerCase(); + final CreatureType creature = event.getCreatureType(); + if (creature == null) + { + return; + } + final String creatureName = creature.toString().toLowerCase(); if (creatureName == null || creatureName.isEmpty()) { return; -- cgit v1.2.3