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

Fix static trigger messing up LTB trigger

Browse Source
This commit is contained in:
tool4EvEr
2023-03-04 15:10:03 +01:00
parent 96c94ffa95
commit 0657bdc243
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -1378,7 +1378,7 @@ public class AbilityUtils {
Player pl = sa.getActivatingPlayer(); Player pl = sa.getActivatingPlayer();
final Game game = pl.getGame(); final Game game = pl.getGame();
if (sa.isTrigger() && sa.getParent() == null) { if (sa.isTrigger() && !sa.getTrigger().isStatic() && sa.getParent() == null) {
// when trigger cost are paid before the effect does resolve, need to clean the trigger // when trigger cost are paid before the effect does resolve, need to clean the trigger
game.getTriggerHandler().resetActiveTriggers(); game.getTriggerHandler().resetActiveTriggers();
} }

2
forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
View File

@@ -207,7 +207,7 @@ public class AnimateEffect extends AnimateEffectBase {
if (sa.hasParam("AtEOT") && !tgts.isEmpty()) { if (sa.hasParam("AtEOT") && !tgts.isEmpty()) {
registerDelayedTrigger(sa, sa.getParam("AtEOT"), tgts); registerDelayedTrigger(sa, sa.getParam("AtEOT"), tgts);
} }
} // animateResolve extends SpellEffect { }
/* (non-Javadoc) /* (non-Javadoc)
* @see forge.card.abilityfactory.SpellEffect#getStackDescription(java.util.Map, forge.card.spellability.SpellAbility) * @see forge.card.abilityfactory.SpellEffect#getStackDescription(java.util.Map, forge.card.spellability.SpellAbility)

2
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -2564,7 +2564,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
continue; continue;
} }
for (final StaticAbility stAb : ca.getStaticAbilities()) { for (final StaticAbility stAb : ca.getStaticAbilities()) {
if (stAb.isSuppressed() || !stAb.checkConditions()) { if (!stAb.checkConditions()) {
continue; continue;
} }

2
forge-game/src/main/java/forge/game/cost/CostAdjustment.java
View File

@@ -430,7 +430,7 @@ public class CostAdjustment {
} }
private static boolean checkRequirement(final SpellAbility sa, final StaticAbility st) { private static boolean checkRequirement(final SpellAbility sa, final StaticAbility st) {
if (st.isSuppressed() || !st.checkConditions()) { if (!st.checkConditions()) {
return false; return false;
} }

2
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -1752,7 +1752,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
} }
public boolean isZeroTargets() { public boolean isZeroTargets() {
return getMinTargets() == 0 && getTargets().size() == 0; return getMinTargets() == 0 && getTargets().isEmpty();
} }
public boolean isMinTargetChosen() { public boolean isMinTargetChosen() {