From 3391171267020de135229b92162963fd103b1e8a Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Sat, 7 Jan 2012 01:09:42 +0000
Subject: [PATCH] - "Uruk Warrior" now correctly can use it's ability in
 Maneuver phase, rather than in Shadow phase.

---
 .../lotro/cards/set1/isengard/Card1_156.java         |  2 +-
 .../lotro/logic/modifiers/ModifiersLogic.java        | 12 ++++++------
 .../src/main/webapp/includes/changeLog.html          |  3 +++
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_156.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_156.java
index 3d594e87c..6b0a46e55 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_156.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/isengard/Card1_156.java
@@ -32,7 +32,7 @@ public class Card1_156 extends AbstractMinion {
 
     @Override
     protected List<? extends Action> getExtraPhaseActions(String playerId, LotroGame game, PhysicalCard self) {
-        if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.SHADOW, self, 0)
+        if (PlayConditions.canUseShadowCardDuringPhase(game, Phase.MANEUVER, self, 0)
                 && PlayConditions.canSpot(game, 6, CardType.COMPANION)) {
             ActivateCardAction action = new ActivateCardAction(self);
             action.appendEffect(
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java
index ea5c6cd7c..8cd40287c 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/ModifiersLogic.java
@@ -18,22 +18,22 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying {
 
     private Set<Modifier> _skipSet = new HashSet<Modifier>();
 
-    private Map<Phase, Map<PhysicalCard, LimitCounter>> _counters = new HashMap<Phase, Map<PhysicalCard, LimitCounter>>();
+    private Map<Phase, Map<Integer, LimitCounter>> _counters = new HashMap<Phase, Map<Integer, LimitCounter>>();
 
     private int _drawnThisPhaseCount = 0;
     private Map<Integer, Integer> _woundsPerPhaseMap = new HashMap<Integer, Integer>();
 
     @Override
     public LimitCounter getUntilEndOfPhaseLimitCounter(PhysicalCard card, Phase phase) {
-        Map<PhysicalCard, LimitCounter> limitCounterMap = _counters.get(phase);
+        Map<Integer, LimitCounter> limitCounterMap = _counters.get(phase);
         if (limitCounterMap == null) {
-            limitCounterMap = new HashMap<PhysicalCard, LimitCounter>();
+            limitCounterMap = new HashMap<Integer, LimitCounter>();
             _counters.put(phase, limitCounterMap);
         }
-        LimitCounter limitCounter = limitCounterMap.get(card);
+        LimitCounter limitCounter = limitCounterMap.get(card.getCardId());
         if (limitCounter == null) {
             limitCounter = new DefaultLimitCounter();
-            limitCounterMap.put(card, limitCounter);
+            limitCounterMap.put(card.getCardId(), limitCounter);
         }
         return limitCounter;
     }
@@ -117,7 +117,7 @@ public class ModifiersLogic implements ModifiersEnvironment, ModifiersQuerying {
             removeModifiers(list);
             list.clear();
         }
-        Map<PhysicalCard, LimitCounter> counterMap = _counters.get(phase);
+        Map<Integer, LimitCounter> counterMap = _counters.get(phase);
         if (counterMap != null)
             counterMap.clear();
 
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 0a26fb823..71785eb35 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>6 Jan. 2012</b>
+- "Uruk Warrior" now correctly can use it's ability in Maneuver phase, rather than in Shadow phase.
+
 <b>4 Jan. 2012</b>
 - "Ellesar's Edict" should now correctly discard the Wraith.