From a1296596fadc5ca24714a005ed136b62cb9d17cd Mon Sep 17 00:00:00 2001 From: bm01 Date: Tue, 5 Jun 2012 15:39:04 +0200 Subject: [PATCH] Fixed possible NPE when a projectile doesn't have a shooter --- .../java/com/gmail/nossr50/listeners/EntityListener.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java index 7865f8437..1d2d514d4 100644 --- a/src/main/java/com/gmail/nossr50/listeners/EntityListener.java +++ b/src/main/java/com/gmail/nossr50/listeners/EntityListener.java @@ -64,6 +64,11 @@ public class EntityListener implements Listener { if (attacker instanceof Projectile) { attacker = ((Projectile) attacker).getShooter(); + + //There is no shooter when a projectile is thrown by a dispenser + if (attacker == null) { + return; + } } else if (attacker instanceof Tameable) { AnimalTamer animalTamer = ((Tameable) attacker).getOwner();