From c8b11a6b1504839d103d0bde791b720e856b7888 Mon Sep 17 00:00:00 2001
From: Philip Cass <frymaster@127001.org>
Date: Fri, 17 Jul 2015 10:35:55 +0100
Subject: [PATCH] Add null check for projectile source.  Fixes #626

---
 src/main/java/de/diddiz/LogBlock/Consumer.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/diddiz/LogBlock/Consumer.java b/src/main/java/de/diddiz/LogBlock/Consumer.java
index aad555b..3c867b5 100644
--- a/src/main/java/de/diddiz/LogBlock/Consumer.java
+++ b/src/main/java/de/diddiz/LogBlock/Consumer.java
@@ -220,8 +220,12 @@ public class Consumer extends TimerTask {
         }
         if (killer instanceof Projectile) {
             ProjectileSource ps = ((Projectile) killer).getShooter();
-            killerActor = Actor.actorFromProjectileSource(ps);
-            weapon = itemIDfromProjectileEntity(killer);
+            if (ps == null) {
+                killerActor = Actor.actorFromEntity(killer);
+            } else {
+                killerActor = Actor.actorFromProjectileSource(ps);
+                weapon = itemIDfromProjectileEntity(killer);
+            }
         }
 
         queueKill(victim.getLocation(), killerActor, Actor.actorFromEntity(victim), weapon);