From bf60a0a6584a7d8b5349b03857e9bcfff6cc4a56 Mon Sep 17 00:00:00 2001 From: ceikry Date: Fri, 15 Apr 2022 22:07:34 -0500 Subject: [PATCH] NPCs should no longer be able to kill you with a projectile fired shortly before or during death --- .../src/main/java/core/game/node/entity/combat/DeathTask.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); } /**