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

GameActionUtil: fix getFirstSpellAbility using castSA

Browse Source
This commit is contained in:
Hans Mackowiak
2025-08-30 11:07:57 +02:00
parent 997d489a7e
commit b07a9944aa
3 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -242,6 +242,7 @@ public final class GameActionUtil {
} }
stackCopy.setLastKnownZone(game.getStackZone()); stackCopy.setLastKnownZone(game.getStackZone());
stackCopy.setCastFrom(oldZone); stackCopy.setCastFrom(oldZone);
stackCopy.setCastSA(sa);
lkicheck = true; lkicheck = true;
stackCopy.clearStaticChangedCardKeywords(false); stackCopy.clearStaticChangedCardKeywords(false);

5
forge-game/src/main/java/forge/game/ability/effects/PermanentCreatureEffect.java
View File

@@ -15,8 +15,9 @@ public class PermanentCreatureEffect extends PermanentEffect {
public String getStackDescription(final SpellAbility sa) { public String getStackDescription(final SpellAbility sa) {
final CardState source = sa.getCardState(); final CardState source = sa.getCardState();
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
sb.append(CardTranslation.getTranslatedName(source.getName())).append(" - ").append(Localizer.getInstance().getMessage("lblCreature")).append(" ").append(source.getBasePowerString()); sb.append(CardTranslation.getTranslatedName(source.getName())).append(" - ").append(Localizer.getInstance().getMessage("lblCreature")).append(" ");
sb.append(" / ").append(source.getBaseToughnessString()); sb.append(sa.getParamOrDefault("SetPower", source.getBasePowerString()));
sb.append(" / ").append(sa.getParamOrDefault("SetToughness", source.getBaseToughnessString()));
return sb.toString(); return sb.toString();
} }
} }

3
forge-game/src/main/java/forge/game/card/CardState.java
View File

@@ -468,6 +468,9 @@ public class CardState extends GameObject implements IHasSVars, ITranslatable {
return Iterables.getFirst(getIntrinsicSpellAbilities(), null); return Iterables.getFirst(getIntrinsicSpellAbilities(), null);
} }
public final SpellAbility getFirstSpellAbility() { public final SpellAbility getFirstSpellAbility() {
if (this.card.getCastSA() != null) {
return this.card.getCastSA();
}
return Iterables.getFirst(getNonManaAbilities(), null); return Iterables.getFirst(getNonManaAbilities(), null);
} }