external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 04:08:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cascade: fix Maelstrom Nexus and Golos

Browse Source
This commit is contained in:
Hans Mackowiak
2020-11-02 08:09:56 +01:00
parent 6c675fcbcc
commit bc9b2a0268
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/game/zone/MagicStack.java
View File

@@ -160,6 +160,7 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
add(sa); add(sa);
} }
// Add all waiting triggers onto the stack // Add all waiting triggers onto the stack
game.getTriggerHandler().resetActiveTriggers();
game.getTriggerHandler().runWaitingTriggers(); game.getTriggerHandler().runWaitingTriggers();
} }

1
forge-gui/src/main/java/forge/player/PlayerControllerHuman.java
View File

@@ -2450,6 +2450,7 @@ public class PlayerControllerHuman extends PlayerController implements IGameCont
final PaperCard c = carddb.getUniqueByName(f.getName()); final PaperCard c = carddb.getUniqueByName(f.getName());
final Card forgeCard = Card.fromPaperCard(c, p); final Card forgeCard = Card.fromPaperCard(c, p);
forgeCard.setTimestamp(game.getNextTimestamp());
game.getAction().invoke(new Runnable() { game.getAction().invoke(new Runnable() {
@Override @Override