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

Merge remote-tracking branch 'upstream/master' into patch-carddb-performance

Browse Source
This commit is contained in:
leriomaggio
2021-08-27 12:13:23 +01:00
parent dbe0e15674 33850f45ce
commit 172c170b2d
2 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
forge-game/src/main/java/forge/game/GameActionUtil.java
View File

@@ -24,6 +24,8 @@ import org.apache.commons.lang3.StringUtils;
import com.google.common.collect.Iterables; import com.google.common.collect.Iterables;
import com.google.common.collect.Lists; import com.google.common.collect.Lists;
import com.google.common.collect.Sets; import com.google.common.collect.Sets;
import com.google.common.collect.Table;
import com.google.common.collect.TreeBasedTable;
import forge.card.MagicColor; import forge.card.MagicColor;
import forge.card.mana.ManaCost; import forge.card.mana.ManaCost;
@@ -41,6 +43,7 @@ import forge.game.card.CounterType;
import forge.game.cost.Cost; import forge.game.cost.Cost;
import forge.game.keyword.Keyword; import forge.game.keyword.Keyword;
import forge.game.keyword.KeywordInterface; import forge.game.keyword.KeywordInterface;
import forge.game.keyword.KeywordsChange;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.player.PlayerController; import forge.game.player.PlayerController;
import forge.game.replacement.ReplacementEffect; import forge.game.replacement.ReplacementEffect;
@@ -682,4 +685,26 @@ public final class GameActionUtil {
return completeList; return completeList;
} }
} // end class GameActionUtil public static void checkStaticAfterPaying(Card c) {
Table<Long, Long, KeywordsChange> oldKW = TreeBasedTable.create((TreeBasedTable<Long, Long, KeywordsChange>) c.getChangedCardKeywords());
// this should be the last time checkStaticAbilities is called before SpellCast triggers to
// - setup Cascade dependent on high enough X (Imoti)
// - remove Replicate if Djinn Illuminatus gets sacrificed as payment
// because this will remove the payment SVars for Replicate we need to restore them
c.getGame().getAction().checkStaticAbilities(false);
Table<Long, Long, KeywordsChange> updatedKW = c.getChangedCardKeywords();
for (Table.Cell<Long, Long, KeywordsChange> entry : oldKW.cellSet()) {
for (KeywordInterface ki : entry.getValue().getKeywords()) {
// check if this keyword existed previously
if ((ki.getOriginal().startsWith("Replicate") || ki.getOriginal().startsWith("Conspire")) && updatedKW.get(entry.getRowKey(), entry.getColumnKey()) != null) {
updatedKW.put(entry.getRowKey(), entry.getColumnKey(), oldKW.get(entry.getRowKey(), entry.getColumnKey()));
}
}
}
c.updateKeywords();
c.getGame().getTriggerHandler().resetActiveTriggers();
}
}

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

@@ -35,6 +35,7 @@ import com.google.common.collect.Sets;
import forge.GameCommand; import forge.GameCommand;
import forge.game.Game; import forge.game.Game;
import forge.game.GameActionUtil;
import forge.game.GameLogEntryType; import forge.game.GameLogEntryType;
import forge.game.GameObject; import forge.game.GameObject;
import forge.game.ability.AbilityKey; import forge.game.ability.AbilityKey;
@@ -455,6 +456,8 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
game.getPhaseHandler().setPriority(sp.getActivatingPlayer()); game.getPhaseHandler().setPriority(sp.getActivatingPlayer());
} }
GameActionUtil.checkStaticAfterPaying(sp.getHostCard());
if (sp.isSpell() && !sp.isCopied()) { if (sp.isSpell() && !sp.isCopied()) {
thisTurnCast.add(CardUtil.getLKICopy(sp.getHostCard())); thisTurnCast.add(CardUtil.getLKICopy(sp.getHostCard()));
sp.getActivatingPlayer().addSpellCastThisTurn(); sp.getActivatingPlayer().addSpellCastThisTurn();