diff --git a/src/engine/objects/PlayerCombatStats.java b/src/engine/objects/PlayerCombatStats.java index 3098f8b5..be5267db 100644 --- a/src/engine/objects/PlayerCombatStats.java +++ b/src/engine/objects/PlayerCombatStats.java @@ -1006,7 +1006,7 @@ public class PlayerCombatStats { if(mod <= 0) mod = 0; if(mod == 0){ - healthConsume(pc, (int) (deltaTime * 0.6f * 2.5f)); + healthConsume(pc, (int) (consumed * 2.5f)); }else { while (!worked) { worked = pc.stamina.compareAndSet(current,mod); @@ -1020,7 +1020,8 @@ public class PlayerCombatStats { float current = pc.health.get(); float mod = current - amount; if(mod <= 0){ - pc.killCharacter("water"); + if (pc.isAlive.compareAndSet(true, false)) + pc.killCharacter("Water"); return; } while(!worked){