From 4c44d9a26a17def9f3372903ce79e145bf86e997 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Sun, 27 Nov 2011 17:53:21 +0000
Subject: [PATCH] - Characters should not die between turns.

---
 .../gempukku/lotro/logic/timing/rules/CharacterDeathRule.java  | 2 +-
 .../gemp-lotr-web/src/main/webapp/includes/changeLog.html      | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

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<PhysicalCard> 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 @@
 <pre style="font-size:80%">
+<b>27 Nov. 2011</b>
+- Characters should not die between turns.
+
 <b>26 Nov. 2011</b>
 - "Rallying Call" now removes (1) when used.