From 579e435421c55313236d376fc6262214ddc50597 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Sat, 15 Oct 2011 18:55:11 +0000
Subject: [PATCH] - "The One Ring, Isildur's Bane" will be taken off at the end
 of Regroup if it was put on during Regroup

---
 .../gempukku/lotro/cards/set1/Card1_001.java  | 41 +++++++++++++------
 .../src/main/webapp/includes/changeLog.html   |  1 +
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java
index 5dfbb757f..db9435505 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/Card1_001.java
@@ -68,20 +68,37 @@ public class Card1_001 extends AbstractAttachable {
                 action.appendEffect(new PreventCardEffect(woundEffect, self.getAttachedTo()));
                 action.appendEffect(new AddBurdenEffect(self, 2));
                 action.appendEffect(new PutOnTheOneRingEffect());
-                action.appendEffect(new AddUntilStartOfPhaseActionProxyEffect(
-                        new AbstractActionProxy() {
-                            @Override
-                            public List<? extends Action> getRequiredAfterTriggers(LotroGame lotroGame, EffectResult effectResult) {
-                                if (effectResult.getType() == EffectResult.Type.START_OF_PHASE
-                                        && ((StartOfPhaseResult) effectResult).getPhase() == Phase.REGROUP) {
-                                    ActivateCardAction action = new ActivateCardAction(self);
-                                    action.appendEffect(new TakeOffTheOneRingEffect());
-                                    return Collections.singletonList(action);
+                if (game.getGameState().getCurrentPhase() == Phase.REGROUP) {
+                    action.appendEffect(new AddUntilEndOfPhaseActionProxyEffect(
+                            new AbstractActionProxy() {
+                                @Override
+                                public List<? extends Action> getRequiredAfterTriggers(LotroGame lotroGame, EffectResult effectResult) {
+                                    if (effectResult.getType() == EffectResult.Type.END_OF_PHASE
+                                            && ((StartOfPhaseResult) effectResult).getPhase() == Phase.REGROUP) {
+                                        ActivateCardAction action = new ActivateCardAction(self);
+                                        action.appendEffect(new TakeOffTheOneRingEffect());
+                                        return Collections.singletonList(action);
+                                    }
+                                    return null;
                                 }
-                                return null;
                             }
-                        }
-                        , Phase.REGROUP));
+                            , Phase.REGROUP));
+                } else {
+                    action.appendEffect(new AddUntilStartOfPhaseActionProxyEffect(
+                            new AbstractActionProxy() {
+                                @Override
+                                public List<? extends Action> getRequiredAfterTriggers(LotroGame lotroGame, EffectResult effectResult) {
+                                    if (effectResult.getType() == EffectResult.Type.START_OF_PHASE
+                                            && ((StartOfPhaseResult) effectResult).getPhase() == Phase.REGROUP) {
+                                        ActivateCardAction action = new ActivateCardAction(self);
+                                        action.appendEffect(new TakeOffTheOneRingEffect());
+                                        return Collections.singletonList(action);
+                                    }
+                                    return null;
+                                }
+                            }
+                            , Phase.REGROUP));
+                }
 
                 actions.add(action);
                 return actions;
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 646994dea..4021215fd 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
@@ -3,6 +3,7 @@
 - Permanents will no longer highlight in had if they have Response action on them
 - Fixed all the cards that were supposed to discard themselves on use, but did not (i.e. "Gondor Bowmen")
 - Drawing cards now correctly triggers "Verily I Come"
+- "The One Ring, Isildur's Bane" will be taken off at the end of Regroup if it was put on during Regroup
 
 <b>14 Oct. 2011</b>
 - Uruviel and all other copying site allies should now correctly have modifiers off sites