ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cards that remove cards from game should now correctly get rid of attached and stacked cards.

Browse Source
This commit is contained in:
marcin.sciesinski
2020-03-26 08:58:54 -07:00
parent a89e59e7a9
commit a84a7ba5a4
1 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/effects/RemoveCardsFromTheGameEffect.java
View File

@@ -5,6 +5,7 @@ import com.gempukku.lotro.game.PhysicalCard;
import com.gempukku.lotro.game.state.LotroGame;
import com.gempukku.lotro.logic.GameUtils;
import com.gempukku.lotro.logic.timing.AbstractEffect;
import com.gempukku.lotro.logic.timing.results.DiscardCardsFromPlayResult;
import java.util.Collection;
import java.util.HashSet;
@@ -48,9 +49,21 @@ public class RemoveCardsFromTheGameEffect extends AbstractEffect {
if (physicalCard.getZone().isInPlay())
removedCards.add(physicalCard);
game.getGameState().removeCardsFromZone(_playerPerforming, removedCards);
Set<PhysicalCard> discardedCards = new HashSet<PhysicalCard>();
Set<PhysicalCard> toMoveFromZoneToDiscard = new HashSet<PhysicalCard>();
DiscardUtils.cardsToChangeZones(game, removedCards, discardedCards, toMoveFromZoneToDiscard);
Set<PhysicalCard> toRemoveFromZone = new HashSet<>();
toRemoveFromZone.addAll(removedCards);
toRemoveFromZone.addAll(toMoveFromZoneToDiscard);
game.getGameState().removeCardsFromZone(_playerPerforming, toRemoveFromZone);
for (PhysicalCard removedCard : removedCards)
game.getGameState().addCardToZone(game, removedCard, Zone.REMOVED);
for (PhysicalCard card : toMoveFromZoneToDiscard)
game.getGameState().addCardToZone(game, card, Zone.DISCARD);
game.getGameState().sendMessage(_playerPerforming + " removed " + GameUtils.getAppendedNames(removedCards) + " from the game using " + GameUtils.getCardLink(_source));