Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-05 07:58:08 +01:00
Code Issues Projects Releases Wiki Activity

Fix Nukkit related compilation issue

Browse Source
This commit is contained in:
Aurora Lahtela 2024-11-30 10:57:33 +02:00
parent acd83a41c3
commit 7de29e72f9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Plan/nukkit/src/main/java/com/djrapitops/plan/gathering/listeners/nukkit/DeathEventListener.java
View File

@ -18,8 +18,8 @@ package com.djrapitops.plan.gathering.listeners.nukkit;
import cn.nukkit.Player; import cn.nukkit.Player;
import cn.nukkit.entity.Entity; import cn.nukkit.entity.Entity;
import cn.nukkit.entity.EntityTameable;
import cn.nukkit.entity.item.EntityEndCrystal; import cn.nukkit.entity.item.EntityEndCrystal;
import cn.nukkit.entity.passive.EntityTameable;
import cn.nukkit.entity.projectile.EntityProjectile; import cn.nukkit.entity.projectile.EntityProjectile;
import cn.nukkit.event.EventHandler; import cn.nukkit.event.EventHandler;
import cn.nukkit.event.EventPriority; import cn.nukkit.event.EventPriority;
@ -131,13 +131,13 @@ public class DeathEventListener implements Listener {
EntityDamageEvent entityDamageEvent = dead.getLastDamageCause(); EntityDamageEvent entityDamageEvent = dead.getLastDamageCause();
Entity killer = ((EntityDamageByEntityEvent) entityDamageEvent).getDamager(); Entity killer = ((EntityDamageByEntityEvent) entityDamageEvent).getDamager();
if (killer instanceof Player) return getItemInHand((Player) killer); if (killer instanceof Player) return getItemInHand((Player) killer);
if (killer instanceof EntityTameable) return getPetType((EntityTameable) killer); if (killer instanceof EntityTameable) return getPetType(killer);
// EntityProjectile, EntityEndCrystal and all other causes that are not known yet // EntityProjectile, EntityEndCrystal and all other causes that are not known yet
return new EntityNameFormatter().apply(killer.getName()); return new EntityNameFormatter().apply(killer.getName());
} }
private String getPetType(EntityTameable tameable) { private String getPetType(Entity tameable) {
return tameable.getName(); return tameable.getName();
} }
@ -156,7 +156,7 @@ public class DeathEventListener implements Listener {
} }
private Optional<Player> getOwner(EntityTameable tameable) { private Optional<Player> getOwner(EntityTameable tameable) {
if (!tameable.isTamed()) { if (!tameable.hasOwner()) {
return Optional.empty(); return Optional.empty();
} }