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

Fix special actions going through frozen stack (#8642)

Browse Source
This commit is contained in:
tool4ever
2025-09-04 21:16:46 +02:00
committed by GitHub
parent f1d448509e
commit 055cd40fb1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -331,6 +331,12 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
} }
} }
if (sp instanceof AbilityStatic || (sp.isTrigger() && sp.getTrigger().getOverridingAbility() instanceof AbilityStatic)) {
AbilityUtils.resolve(sp);
// AbilityStatic should do nothing below
return;
}
if (si == null && sp.isActivatedAbility() && !sp.isCopied()) { if (si == null && sp.isActivatedAbility() && !sp.isCopied()) {
// if not already copied use a fresh instance // if not already copied use a fresh instance
SpellAbility original = sp; SpellAbility original = sp;
@@ -354,12 +360,6 @@ public class MagicStack /* extends MyObservable */ implements Iterable<SpellAbil
addAbilityActivatedThisTurn(sp, source); addAbilityActivatedThisTurn(sp, source);
} }
if (sp instanceof AbilityStatic || (sp.isTrigger() && sp.getTrigger().getOverridingAbility() instanceof AbilityStatic)) {
AbilityUtils.resolve(sp);
// AbilityStatic should do nothing below
return;
}
// The ability is added to stack HERE // The ability is added to stack HERE
si = push(sp, si, id); si = push(sp, si, id);