From 484a4678440293efd6ee7453b379845fe1024475 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Sat, 17 Sep 2011 11:08:35 +0000
Subject: [PATCH] "Pathfinder" plays NEXT site, not current, haha.

---
 .../gempukku/lotro/cards/set1/gondor/Card1_110.java  |  2 +-
 .../PlayersPlayPhaseActionsInOrderGameProcess.java   | 10 +++++-----
 gemp-lotr/gemp-lotr-web/src/main/resources/log4j.xml | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_110.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_110.java
index 1d981e96a..eb8ffa5b1 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_110.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/gondor/Card1_110.java
@@ -28,7 +28,7 @@ public class Card1_110 extends AbstractEvent {
     @Override
     public PlayEventAction getPlayCardAction(String playerId, LotroGame game, PhysicalCard self, int twilightModifier) {
         PlayEventAction action = new PlayEventAction(self);
-        action.addEffect(new PlaySiteEffect(playerId, game.getGameState().getCurrentSiteNumber()));
+        action.addEffect(new PlaySiteEffect(playerId, game.getGameState().getCurrentSiteNumber() + 1));
         return action;
     }
 
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java
index b2e089c0c..19d517bff 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/timing/processes/turn/general/PlayersPlayPhaseActionsInOrderGameProcess.java
@@ -30,12 +30,12 @@ public class PlayersPlayPhaseActionsInOrderGameProcess implements GameProcess {
 
     @Override
     public void process() {
-        if (_game.getGameState().getCurrentPhase() == Phase.SKIRMISH) {
-            Skirmish skirmish = _game.getGameState().getSkirmish();
+        Skirmish skirmish = _game.getGameState().getSkirmish();
+        if (_game.getGameState().getCurrentPhase() == Phase.SKIRMISH
+                && (_game.getGameState().getSkirmish().isCancelled()
+                || skirmish.getFellowshipCharacter() == null || skirmish.getShadowCharacters().size() == 0)) {
             // If the skirmish is cancelled or one side of the skirmish is missing, no more phase actions can be played
-            if (_game.getGameState().getSkirmish().isCancelled()
-                    || skirmish.getFellowshipCharacter() == null || skirmish.getShadowCharacters().size() == 0)
-                _nextProcess = _followingGameProcess;
+            _nextProcess = _followingGameProcess;
         } else {
             String playerId = _playOrder.getNextPlayer();
             GatherPlayableActionsVisitor visitor = new GatherPlayableActionsVisitor(_game, playerId);
diff --git a/gemp-lotr/gemp-lotr-web/src/main/resources/log4j.xml b/gemp-lotr/gemp-lotr-web/src/main/resources/log4j.xml
index 01461959b..e6f29df25 100644
--- a/gemp-lotr/gemp-lotr-web/src/main/resources/log4j.xml
+++ b/gemp-lotr/gemp-lotr-web/src/main/resources/log4j.xml
@@ -8,19 +8,19 @@
         </layout>
     </appender>
     <appender name="R" class="org.apache.log4j.RollingFileAppender">
-        <param name="file" value="c:/dev/gemp-lotr.log"/>
+        <param name="file" value="i:/dev/gemp-lotr.log"/>
         <param name="MaxFileSize" value="10MB"/>
         <param name="MaxBackupIndex" value="20"/>
         <layout class="org.apache.log4j.PatternLayout">
-            <param name="ConversionPattern" value="%p %t %c - %m%n"/>
+            <param name="ConversionPattern" value="%d{ABSOLUTE} %5p %c{1}:%L - %m%n"/>
         </layout>
     </appender>
-    <logger name="com.gempukku">
-        <level value="error"/>
-        <appender-ref ref="stdout"/>
+    <logger name="com.gempukku" additivity="false">
+        <level value="debug"/>
+        <appender-ref ref="R"/>
     </logger>
     <root>
-        <priority value="debug"/>
+        <level value="error"/>
         <appender-ref ref="R"/>
     </root>
 </log4j:configuration>
\ No newline at end of file