From 6242eadcb831a9a271175dca3d6ea3d5c9fd8c7b Mon Sep 17 00:00:00 2001
From: marcins78 <marcins78@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Tue, 8 Jan 2013 14:08:56 +0000
Subject: [PATCH] Errors with invalid state (cards in or not in zones expected)
 are now logged, instead of cancelling game.

---
 .../main/java/com/gempukku/lotro/game/state/GameState.java  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
index 90374f215..2fedde161 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/game/state/GameState.java
@@ -7,10 +7,12 @@ import com.gempukku.lotro.logic.PlayerOrder;
 import com.gempukku.lotro.logic.decisions.AwaitingDecision;
 import com.gempukku.lotro.logic.modifiers.ModifierFlag;
 import com.gempukku.lotro.logic.timing.GameStats;
+import org.apache.log4j.Logger;
 
 import java.util.*;
 
 public class GameState {
+    private static Logger _log = Logger.getLogger(GameState.class);
     private static final int LAST_MESSAGE_STORED_COUNT = 15;
     private PlayerOrder _playerOrder;
 
@@ -395,7 +397,7 @@ public class GameState {
         for (PhysicalCard card : cards) {
             List<PhysicalCardImpl> zoneCards = getZoneCards(card.getOwner(), card.getBlueprint().getCardType(), card.getZone());
             if (!zoneCards.contains(card))
-                throw new RuntimeException("Card was not found in the expected zone");
+                _log.error("Card was not found in the expected zone");
         }
 
         for (PhysicalCard card : cards) {
@@ -460,7 +462,7 @@ public class GameState {
             zoneCards.add(0, (PhysicalCardImpl) card);
 
         if (card.getZone() != null)
-            throw new RuntimeException("Card was in " + card.getZone() + " when tried to add to zone: " + zone);
+            _log.error("Card was in " + card.getZone() + " when tried to add to zone: " + zone);
 
         ((PhysicalCardImpl) card).setZone(zone);