From 18c13599bb81471e0b4845bfbb7604fc90081e04 Mon Sep 17 00:00:00 2001
From: "marcins78@gmail.com"
 <marcins78@gmail.com@eb7970ca-0f6f-de4b-2938-835b230b9d1f>
Date: Mon, 10 Oct 2011 19:23:03 +0000
Subject: [PATCH] "Saruman's Staff"

---
 .../com/gempukku/lotro/cards/set1/wraith/Card1_213.java   | 7 +------
 .../src/main/java/com/gempukku/lotro/filters/Filters.java | 8 +++++++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_213.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_213.java
index 542322f66..f0d07584f 100644
--- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_213.java
+++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/set1/wraith/Card1_213.java
@@ -31,12 +31,7 @@ public class Card1_213 extends AbstractEvent {
                 new ChooseActiveCardEffect(self, playerId, "Choose a Nazgul", Filters.race(Race.NAZGUL)) {
                     @Override
                     protected void cardSelected(PhysicalCard nazgul) {
-                        boolean notAssigned = Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.RING_BEARER), Filters.notAssigned());
-                        if (notAssigned) {
-                            PhysicalCard fpChar = game.getGameState().getSkirmish().getFellowshipCharacter();
-                            if (fpChar != null && game.getModifiersQuerying().hasKeyword(game.getGameState(), fpChar, Keyword.RING_BEARER))
-                                notAssigned = false;
-                        }
+                        boolean notAssigned = Filters.canSpot(game.getGameState(), game.getModifiersQuerying(), Filters.keyword(Keyword.RING_BEARER), Filters.notAssignedToSkirmish());
                         action.appendEffect(
                                 new AddUntilEndOfPhaseModifierEffect(
                                         new StrengthModifier(self, Filters.sameCard(nazgul), notAssigned ? 2 : 3), Phase.SKIRMISH));
diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
index 9254fb328..5eca40fe4 100644
--- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
+++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/filters/Filters.java
@@ -157,7 +157,7 @@ public class Filters {
         };
     }
 
-    public static Filter notAssigned() {
+    public static Filter notAssignedToSkirmish() {
         return new Filter() {
             @Override
             public boolean accepts(GameState gameState, ModifiersQuerying modifiersQuerying, PhysicalCard physicalCard) {
@@ -166,6 +166,12 @@ public class Filters {
                             || assignment.getShadowCharacters().contains(physicalCard))
                         return false;
                 }
+                Skirmish skirmish = gameState.getSkirmish();
+                if (skirmish != null) {
+                    if (skirmish.getFellowshipCharacter() == physicalCard
+                            || skirmish.getShadowCharacters().contains(physicalCard))
+                        return false;
+                }
                 return true;
             }
         };