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 905b1d7b8..14f161963 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 @@ -366,7 +366,7 @@ public class Filters { new Filter() { @Override public boolean accepts(LotroGame game, PhysicalCard physicalCard) { - return (!game.getGameState().isFierceSkirmishes()) || game.getModifiersQuerying().hasKeyword(game, physicalCard, Keyword.FIERCE); + return (game.getGameState().getCurrentPhase() != Phase.ASSIGNMENT || !game.getGameState().isFierceSkirmishes()) || game.getModifiersQuerying().hasKeyword(game, physicalCard, Keyword.FIERCE); } })); diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_224_Tests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_224_Tests.java index 6f5fd1bfc..eb1787c1a 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_224_Tests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/cards/official/set01/Card_01_224_Tests.java @@ -106,9 +106,8 @@ public class Card_01_224_Tests //Can't quite get the rest - //assertEquals(2, scn.GetShadowCardChoiceCount()); // both enquea and TWK - //scn.ShadowChooseCard(enquea); - //We should now be asking freeps to choose the next skirmish to resolve and in a skirmish phase + assertEquals(2, scn.GetShadowCardChoiceCount()); // both enquea and TWK + scn.ShadowChooseCard(enquea); }