From 4d7caa923b8e5d8a892a2fd99ba490595cf9fd73 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Fri, 23 Aug 2019 13:45:58 -0700 Subject: [PATCH] Fixed cards that block removing burdens --- .../modifiers/CantRemoveBurdensModifier.java | 2 +- .../lotro/at/IndividualCardAtTest.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/CantRemoveBurdensModifier.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/CantRemoveBurdensModifier.java index 9c8c5a99f..6b97c5b48 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/CantRemoveBurdensModifier.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/modifiers/CantRemoveBurdensModifier.java @@ -10,7 +10,7 @@ public class CantRemoveBurdensModifier extends AbstractModifier { private Filter _sourceFilters; public CantRemoveBurdensModifier(PhysicalCard source, Condition condition, Filterable... sourceFilters) { - super(source, "Can't remove burdens", null, condition, ModifierEffect.BURDEN_MODIFIER); + super(source, "Can't remove burdens", Filters.and(sourceFilters), condition, ModifierEffect.BURDEN_MODIFIER); _sourceFilters = Filters.and(sourceFilters); } diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/IndividualCardAtTest.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/IndividualCardAtTest.java index b6b0113de..83747d03e 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/IndividualCardAtTest.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/at/IndividualCardAtTest.java @@ -1051,4 +1051,22 @@ public class IndividualCardAtTest extends AbstractAtTest { assertNull(getCardActionId(_userFeedback.getAwaitingDecision(P1), "Use Frodo's Pipe")); } + + @Test + public void blockRemovingBurdens() throws CardNotFoundException, DecisionResultInvalidException { + initializeSimplestGame(); + + PhysicalCardImpl blackBreath = new PhysicalCardImpl(100, "1_207", P1, _library.getLotroCardBlueprint("1_207")); + PhysicalCardImpl sam = new PhysicalCardImpl(100, "1_311", P1, _library.getLotroCardBlueprint("1_311")); + + _game.getGameState().attachCard(_game, blackBreath, _game.getGameState().getRingBearer(P1)); + _game.getGameState().addCardToZone(_game, sam, Zone.FREE_CHARACTERS); + + skipMulligans(); + + final int burdensBefore = _game.getGameState().getBurdens(); + playerDecided(P1, getCardActionId(_userFeedback.getAwaitingDecision(P1), "Use Sam")); + + assertEquals(burdensBefore, _game.getGameState().getBurdens()); + } }