diff --git a/Server/src/main/java/core/game/node/entity/combat/DeathTask.java b/Server/src/main/java/core/game/node/entity/combat/DeathTask.java index e1ef0d543..ec01e6224 100644 --- a/Server/src/main/java/core/game/node/entity/combat/DeathTask.java +++ b/Server/src/main/java/core/game/node/entity/combat/DeathTask.java @@ -168,7 +168,8 @@ public final class DeathTask extends NodeTask { * @return {@code True} if so. */ public static boolean isDead(Entity e) { - return e.getAttribute("state:death", false); + if (e instanceof NPC) return ((NPC) e).getRespawnTick() > GameWorld.getTicks() || e.getAttribute("state:death", false); + else return e.getAttribute("state:death", false); } /**