diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/CharacterDeathRule.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/CharacterDeathRule.java index 485e2635a..ddd84121c 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/CharacterDeathRule.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/CharacterDeathRule.java @@ -52,7 +52,7 @@ public class CharacterDeathRule { } public void checkCharactersZeroVitality(LotroGame game) { - if (game.getGameState().getCurrentPhase() != Phase.PUT_RING_BEARER) { + if (game.getGameState().getCurrentPhase() != Phase.PUT_RING_BEARER && game.getGameState().getCurrentPhase() == Phase.BETWEEN_TURNS) { GameState gameState = game.getGameState(); Collection characters = Filters.filterActive(gameState, game.getModifiersQuerying(), diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html index 637875c5d..81c0ab96d 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/includes/changeLog.html @@ -1,4 +1,7 @@
+27 Nov. 2011
+- Characters should not die between turns.
+
 26 Nov. 2011
 - "Rallying Call" now removes (1) when used.