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

Fix NPE when entities die without a damager

Browse Source 
Fixes #745
This commit is contained in:
Brokkonaut
2019-02-23 18:17:14 +01:00
parent 34eeb52c8d
commit 8b1ee254b4
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/de/diddiz/LogBlock/listeners/AdvancedEntityLogging.java
View File

@@ -160,12 +160,16 @@ public class AdvancedEntityLogging extends LoggingListener {
public void onEntityDeath(EntityDeathEvent event) { public void onEntityDeath(EntityDeathEvent event) {
LivingEntity entity = event.getEntity(); LivingEntity entity = event.getEntity();
if (Config.isLogging(entity.getWorld(), EntityLogging.DESTROY, entity)) { if (Config.isLogging(entity.getWorld(), EntityLogging.DESTROY, entity)) {
Actor actor; Actor actor = null;
EntityDamageEvent lastDamage = entity.getLastDamageCause(); EntityDamageEvent lastDamage = entity.getLastDamageCause();
if (lastDamage instanceof EntityDamageByEntityEvent) { if (lastDamage instanceof EntityDamageByEntityEvent) {
actor = Actor.actorFromEntity(((EntityDamageByEntityEvent) lastDamage).getDamager()); Entity damager = ((EntityDamageByEntityEvent) lastDamage).getDamager();
} else { if (damager != null) {
actor = new Actor(lastDamage.getCause().toString()); actor = Actor.actorFromEntity(damager);
}
}
if (actor == null) {
actor = new Actor(lastDamage == null ? "UNKNOWN" : lastDamage.getCause().toString());
} }
queueEntitySpawnOrKill(entity, actor, EntityChange.EntityChangeType.KILL); queueEntitySpawnOrKill(entity, actor, EntityChange.EntityChangeType.KILL);
} }