From d000dbe72f2848a448364a94e740c595ca38b6e6 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Sun, 18 Sep 2011 20:31:12 +0000
Subject: [PATCH] Fixing sanctuary rule and game not starting if there is
 finished game with the player.

---
 .../gempukku/lotro/logic/timing/rules/SanctuaryRule.java    | 2 +-
 .../src/main/java/com/gempukku/lotro/hall/HallServer.java   | 6 +++---
 .../main/java/com/gempukku/lotro/server/ServerResource.java | 2 +-
 gemp-lotr/todo.txt                                          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/SanctuaryRule.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/SanctuaryRule.java
index ed2466cc5..a5e4f260c 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/SanctuaryRule.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/rules/SanctuaryRule.java
@@ -32,7 +32,7 @@ public class SanctuaryRule {
                         if (effectResult.getType() == EffectResult.Type.START_OF_TURN
                                 && game.getModifiersQuerying().hasKeyword(game.getGameState(), game.getGameState().getCurrentSite(), Keyword.SANCTUARY)) {
                             DefaultCostToEffectAction action = new DefaultCostToEffectAction(null, null, "Sanctuary healing");
-                            action.addEffect(new HealCompanion(game.getGameState().getCurrentPlayerId(), action, 0));
+                            action.addEffect(new HealCompanion(game.getGameState().getCurrentPlayerId(), action, 1));
                             return Collections.singletonList(action);
                         }
                         return null;
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
index b1408f5e3..a05b9fe93 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
@@ -142,7 +142,7 @@ public class HallServer extends AbstractServer {
                 visitor.visitTable(runningGame.getKey(), lotroGameMediator.getGameStatus(), lotroGameMediator.getPlayersPlaying());
         }
 
-        String playerTable = getPlayerTable(participantId);
+        String playerTable = getNonFinishedPlayerTable(participantId);
         if (playerTable != null) {
             String gameId = _runningTables.get(playerTable);
             if (gameId != null) {
@@ -153,7 +153,7 @@ public class HallServer extends AbstractServer {
         }
     }
 
-    public String getPlayerTable(String playerId) {
+    private String getNonFinishedPlayerTable(String playerId) {
         for (Map.Entry<String, AwaitingTable> table : _awaitingTables.entrySet()) {
             if (table.getValue().hasPlayer(playerId))
                 return table.getKey();
@@ -162,7 +162,7 @@ public class HallServer extends AbstractServer {
         for (Map.Entry<String, String> runningTable : _runningTables.entrySet()) {
             String gameId = runningTable.getValue();
             LotroGameMediator lotroGameMediator = _lotroServer.getGameById(gameId);
-            if (lotroGameMediator != null)
+            if (lotroGameMediator != null && !lotroGameMediator.getGameStatus().equals("Finished"))
                 if (lotroGameMediator.getPlayersPlaying().contains(playerId))
                     return runningTable.getKey();
         }
diff --git a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java
index c3e2f76bf..fe3f22188 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java
+++ b/gemp-lotr/gemp-lotr-web/src/main/java/com/gempukku/lotro/server/ServerResource.java
@@ -37,7 +37,7 @@ import java.util.Set;
 @Path("/")
 public class ServerResource {
     private static final Logger _logger = Logger.getLogger(ServerResource.class);
-    private boolean _test = true;
+    private boolean _test = false;
 
     private HallServer _hallServer;
     private LotroServer _lotroServer;
diff --git a/gemp-lotr/todo.txt b/gemp-lotr/todo.txt
index aa0633ef1..d2cfb0697 100644
--- a/gemp-lotr/todo.txt
+++ b/gemp-lotr/todo.txt
@@ -8,7 +8,6 @@ Next priority:
 25. Remove all non-essencial alerts, instead add warnings to chat panel.
 13. Add dead/discard pile displays.
 14. Add hand/deck card count displays.
-19. Add filtering cards to deck-builder.
 16. Add an option to watch an ongoing game (spectator).
 24. The events that are played and cards affected should be shown to the players briefly using animations to make it
  aestheticly pleasing.
@@ -48,3 +47,4 @@ with Filters.sameCard(...) filter.
 29. Player registration and login.
 32. Created tables do not disappear when the player closes the browser.
 33. When a player stops responding during preparation time of the game, the game is not properly finished.
+19. Add filtering cards to deck-builder.