From 0060a6961d510b49a0b214bb51f6ee94b6bb9db5 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Mon, 26 Mar 2012 06:29:10 +0000
Subject: [PATCH] - "Pillage of Rohan" and other similar cards should be active
 at the right time now (only on your turn).

---
 .../gempukku/lotro/game/state/GameState.java  | 25 +++++++++++++------
 .../src/main/webapp/includes/changeLog.html   |  3 +++
 2 files changed, 20 insertions(+), 8 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 78b104a7f..a0dc1a7e0 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
@@ -786,17 +786,26 @@ public class GameState {
         return _fierceSkirmishes;
     }
 
-    public boolean isCardInPlayActive(PhysicalCard card) {
+    private boolean isCardInPlayActive(PhysicalCard card) {
         Side side = card.getBlueprint().getSide();
         // Either it's not attached or attached to active card
         // AND is a site or fp/ring of current player or shadow of any other player
-        return (card.getBlueprint().getCardType() == CardType.SITE && _currentPhase != Phase.PUT_RING_BEARER && _currentPhase != Phase.PLAY_STARTING_FELLOWSHIP)
-                || (
-                card.getAttachedTo() == null &&
-                        ((card.getOwner().equals(_currentPlayerId) && (side == Side.FREE_PEOPLE))
-                                || (!card.getOwner().equals(_currentPlayerId) && (side == Side.SHADOW))))
-                || (
-                card.getAttachedTo() != null && isCardInPlayActive(card.getAttachedTo()));
+        if (card.getBlueprint().getCardType() == CardType.SITE)
+            return _currentPhase != Phase.PUT_RING_BEARER && _currentPhase != Phase.PLAY_STARTING_FELLOWSHIP;
+
+        if (card.getBlueprint().getCardType() == CardType.THE_ONE_RING)
+            return card.getOwner().equals(_currentPlayerId);
+
+        if (card.getOwner().equals(_currentPlayerId) && side == Side.SHADOW)
+            return false;
+
+        if (!card.getOwner().equals(_currentPlayerId) && side == Side.FREE_PEOPLE)
+            return false;
+
+        if (card.getAttachedTo() != null)
+            return isCardInPlayActive(card.getAttachedTo());
+
+        return true;
     }
 
     public void startAffectingCardsForCurrentPlayer(LotroGame game) {
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 10b2997ff..75e175cc7 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>26 Mar. 2012</b>
+- "Pillage of Rohan" and other similar cards should be active at the right time now (only on your turn).
+
 <b>16 Mar. 2012</b>
 - When "Mountain-troll" is played with discarding 5 minions, now it should properly gain Fierce.
 - "Gimli, Feared Axeman" should now properly be usable when a card is discarded by an action of an opponent.