feedc0de/LogBlock
1
0
Fork 0
forked from LogBlock/LogBlock
Code Pull Requests Activity

Add null check for projectile source. Fixes #626

Browse Source
This commit is contained in:
Philip Cass
2015-07-17 10:35:55 +01:00
parent ce323f5f50
commit c8b11a6b15
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/de/diddiz/LogBlock/Consumer.java
View File

@@ -220,8 +220,12 @@ public class Consumer extends TimerTask {
} }
if (killer instanceof Projectile) { if (killer instanceof Projectile) {
ProjectileSource ps = ((Projectile) killer).getShooter(); ProjectileSource ps = ((Projectile) killer).getShooter();
killerActor = Actor.actorFromProjectileSource(ps); if (ps == null) {
weapon = itemIDfromProjectileEntity(killer); killerActor = Actor.actorFromEntity(killer);
} else {
killerActor = Actor.actorFromProjectileSource(ps);
weapon = itemIDfromProjectileEntity(killer);
}
} }
queueKill(victim.getLocation(), killerActor, Actor.actorFromEntity(victim), weapon); queueKill(victim.getLocation(), killerActor, Actor.actorFromEntity(victim), weapon);