github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2025-01-13 19:11:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Congregation at Dawn - Fixed a bug that the game is locked while resolution of the put cards back effect.

Browse source
This commit is contained in:
LevelX2 2014-06-05 23:16:14 +02:00
parent a2f04a0188
commit 6b817b0669
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Mage.Sets/src/mage/sets/ravnika/CongregationAtDawn.java
View file

@ -101,27 +101,29 @@ class CongregationAtDawnEffect extends OneShotEffect {
if (target.getTargets().size() > 0) { if (target.getTargets().size() > 0) {
Cards revealed = new CardsImpl(); Cards revealed = new CardsImpl();
for (UUID cardId : (List<UUID>) target.getTargets()) { for (UUID cardId : (List<UUID>) target.getTargets()) {
Card card = controller.getLibrary().getCard(cardId, game); Card card = controller.getLibrary().remove(cardId, game);
revealed.add(card); revealed.add(card);
} }
controller.revealCards(sourceObject.getName(), revealed, game); controller.revealCards(sourceObject.getName(), revealed, game);
controller.shuffleLibrary(game); controller.shuffleLibrary(game);
TargetCard targetToLib = new TargetCard(Zone.PICK, new FilterCard(textTop)); TargetCard targetToLib = new TargetCard(Zone.PICK, new FilterCard(textTop));
target.setRequired(true); target.setRequired(true);
while (revealed.size() > 1) {
controller.choose(Outcome.Neutral, revealed, target, game); while (revealed.size() > 1 && controller.isInGame()) {
controller.choose(Outcome.Neutral, revealed, targetToLib, game);
Card card = revealed.get(targetToLib.getFirstTarget(), game); Card card = revealed.get(targetToLib.getFirstTarget(), game);
if (card != null) { if (card != null) {
revealed.remove(card); revealed.remove(card);
card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true); controller.moveCardToLibraryWithInfo(card, source.getSourceId(), game, Zone.LIBRARY, true, false);
} }
targetToLib.clearChosen(); targetToLib.clearChosen();
} }
if (revealed.size() == 1) { if (revealed.size() == 1) {
Card card = revealed.get(revealed.iterator().next(), game); Card card = revealed.get(revealed.iterator().next(), game);
card.moveToZone(Zone.LIBRARY, source.getSourceId(), game, true); controller.moveCardToLibraryWithInfo(card, source.getSourceId(), game, Zone.LIBRARY, true, false);
} }
} }