Add null check for projectile source. Fixes #626
This commit is contained in:
1 parent
ce323f5f50
commit
c8b11a6b15
1 file changed
+6
-2
@@ -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);
|
||||
|
||||
Reference in new issue
Block a user