From df985013eb161b89774ac92c459d6bb759b3af0c Mon Sep 17 00:00:00 2001 From: sk89q Date: Tue, 11 Nov 2014 00:02:54 -0800 Subject: [PATCH] Handle null EntityTypes from SpawnEggs. Fixes WORLDGUARD-3179. --- .../bukkit/listener/EventAbstractionListener.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java b/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java index 34f3c22a..763d72dd 100644 --- a/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java +++ b/src/main/java/com/sk89q/worldguard/bukkit/listener/EventAbstractionListener.java @@ -836,7 +836,11 @@ private static void handleBlockRightClick(T even if (item != null && item.getType() == Material.MONSTER_EGG) { MaterialData data = item.getData(); if (data instanceof SpawnEgg) { - Events.fireToCancel(event, new SpawnEntityEvent(event, cause, placed.getLocation().add(0.5, 0, 0.5), ((SpawnEgg) data).getSpawnedType())); + @Nullable EntityType type = ((SpawnEgg) data).getSpawnedType(); + if (type == null) { + type = EntityType.SHEEP; // Haven't investigated why it's sometimes null + } + Events.fireToCancel(event, new SpawnEntityEvent(event, cause, placed.getLocation().add(0.5, 0, 0.5), type)); } }