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

Fix PlayEffect skipping some checks (e.g. split second on AI) (#8162)

Browse Source
This commit is contained in:
tool4ever
2025-07-23 18:26:27 +02:00
committed by GitHub
parent c6514e0183
commit 854d6640d1
5 changed files with 20 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3007,18 +3007,10 @@ public class AbilityUtils {
}
} else {
final Spell newSA = (Spell) s.copy(controller);
SpellAbilityRestriction res = new SpellAbilityRestriction();
// timing restrictions still apply
res.setPlayerTurn(s.getRestrictions().getPlayerTurn());
res.setOpponentTurn(s.getRestrictions().getOpponentTurn());
res.setPhases(s.getRestrictions().getPhases());
res.setZone(null);
newSA.setRestrictions(res);
// timing restrictions still apply
if (res.checkTimingRestrictions(tgtCard, newSA)
// still need to check the other restrictions like Aftermath
&& res.checkOtherRestrictions(tgtCard, newSA, controller)) {
newSA.setCastFromPlayEffect(true);
newSA.getRestrictions().setZone(null);
newSA.setCastFromPlayEffect(true);
// extra timing restrictions still apply
if (newSA.canPlay()) {
sas.add(newSA);
}
}

12
forge-game/src/main/java/forge/game/player/Player.java
View File

@@ -1713,14 +1713,7 @@ public class Player extends GameEntity implements Comparable<Player> {
if (!canCastSorcery() && (landSa == null || !landSa.withFlash(land, this))) {
return false;
}
}
// CantBeCast static abilities
if (StaticAbilityCantBeCast.cantPlayLandAbility(landSa, land, this)) {
return false;
}
if (land != null && !ignoreZoneAndTiming) {
final boolean mayPlay = landSa == null ? !land.mayPlay(this).isEmpty() : landSa.getMayPlay() != null;
if (land.getOwner() != this && !mayPlay) {
return false;
@@ -1732,6 +1725,11 @@ public class Player extends GameEntity implements Comparable<Player> {
}
}
// CantBeCast static abilities
if (StaticAbilityCantBeCast.cantPlayLandAbility(landSa, land, this)) {
return false;
}
// **** Check for land play limit per turn ****
// Dev Mode
if (getMaxLandPlaysInfinite()) {

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

@@ -72,7 +72,7 @@ public abstract class Spell extends SpellAbility implements java.io.Serializable
}
// CR 118.6 cost is unpayable
if (getPayCosts().hasManaCost() && getPayCosts().getCostMana().getMana().isNoCost()) {
if (!isCastFromPlayEffect() && getPayCosts().hasManaCost() && getPayCosts().getCostMana().getMana().isNoCost()) {
return false;
}

16
forge-game/src/main/java/forge/game/spellability/SpellAbilityRestriction.java
View File

@@ -353,6 +353,10 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
public final boolean checkActivatorRestrictions(final Card c, final SpellAbility sa) {
Player activator = sa.getActivatingPlayer();
if (sa.isCastFromPlayEffect()) {
return true;
}
if (sa.isSpell()) {
// Spells should always default to "controller" but use mayPlay check.
final CardPlayOption o = c.mayPlay(sa.getMayPlay());
@@ -615,14 +619,12 @@ public class SpellAbilityRestriction extends SpellAbilityVariables {
return false;
}
if (!sa.isCastFromPlayEffect()) {
if (!checkTimingRestrictions(c, sa)) {
return false;
}
if (!checkActivatorRestrictions(c, sa)) {
return false;
}
if (!checkActivatorRestrictions(c, sa)) {
return false;
}
if (!checkTimingRestrictions(c, sa)) {
return false;
}
if (!checkZoneRestrictions(c, sa)) {

2
forge-gui/res/cardsfolder/z/zenos_yae_galvus_shinryu_transcendent_rival.txt
View File

@@ -2,7 +2,7 @@ Name:Zenos yae Galvus
ManaCost:3 B B
Types:Legendary Creature Human Noble Warrior
PT:4/4
T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ My First Friend — When CARDNAME enters, choose a creature an opponent controls. Until end of turn, creatures other than Zenos yae Galvus and the chosen creature get -2/-2.
T:Mode$ ChangesZone | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigChoose | TriggerDescription$ My First Friend — When CARDNAME enters, choose a creature an opponent controls. Until end of turn, creatures other than CARDNAME and the chosen creature get -2/-2.
SVar:TrigChoose:DB$ ChooseCard | Choices$ Creature.OppCtrl | Mandatory$ True | SubAbility$ DBPumpAll
SVar:DBPumpAll:DB$ PumpAll | NumAtt$ -2 | NumDef$ -2 | ValidCards$ Creature.Other+!ChosenCardStrict | IsCurse$ True
T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | ValidCard$ Card.ChosenCardStrict | TriggerZones$ Battlefield | Execute$ TrigTransform | TriggerDescription$ When the chosen creature leaves the battlefield, transform CARDNAME.