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

Still assign weapon appropriately for projectile kills with no owner

Browse Source
This commit is contained in:
Philip Cass
2015-07-24 11:36:10 +01:00
parent c8b11a6b15
commit c7d152400e
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -219,12 +219,12 @@ public class Consumer extends TimerTask {
weapon = ((Player) killer).getItemInHand().getTypeId(); weapon = ((Player) killer).getItemInHand().getTypeId();
} }
if (killer instanceof Projectile) { if (killer instanceof Projectile) {
weapon = itemIDfromProjectileEntity(killer);
ProjectileSource ps = ((Projectile) killer).getShooter(); ProjectileSource ps = ((Projectile) killer).getShooter();
if (ps == null) { if (ps == null) {
killerActor = Actor.actorFromEntity(killer); killerActor = Actor.actorFromEntity(killer);
} else { } else {
killerActor = Actor.actorFromProjectileSource(ps); killerActor = Actor.actorFromProjectileSource(ps);
weapon = itemIDfromProjectileEntity(killer);
} }
} }