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

Fix TriggersWhenSpent affected by Veyran (#3586)

Browse Source 
Co-authored-by: tool4EvEr <tool4EvEr@192.168.0.59>
This commit is contained in:
tool4ever
2023-08-01 20:18:40 +02:00
committed by GitHub
parent 17cea24dd5
commit 546c4bcf1e
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@ public class AbilityApiBased extends AbilityActivated {
effect = api.getSpellEffect(); effect = api.getSpellEffect();
if (api.equals(ApiType.Mana) || api.equals(ApiType.ManaReflected)) { if (api.equals(ApiType.Mana) || api.equals(ApiType.ManaReflected)) {
this.setManaPart(new AbilityManaPart(sourceCard, mapParams)); this.setManaPart(new AbilityManaPart(this, mapParams));
this.setUndoable(true); // will try at least this.setUndoable(true); // will try at least
} }

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

@@ -25,7 +25,7 @@ public class SpellApiBased extends Spell {
this.setIntrinsic(true); this.setIntrinsic(true);
if (api.equals(ApiType.Mana) || api.equals(ApiType.ManaReflected)) { if (api.equals(ApiType.Mana) || api.equals(ApiType.ManaReflected)) {
this.setManaPart(new AbilityManaPart(sourceCard, mapParams)); this.setManaPart(new AbilityManaPart(this, mapParams));
} }
if (api.equals(ApiType.ChangeZone) || api.equals(ApiType.ChangeZoneAll)) { if (api.equals(ApiType.ChangeZone) || api.equals(ApiType.ChangeZoneAll)) {

5
forge-game/src/main/java/forge/game/spellability/AbilityManaPart.java
View File

@@ -85,7 +85,7 @@ public class AbilityManaPart implements java.io.Serializable {
/** /**
* <p> * <p>
* Constructor for AbilityMana. * Dev Mode Constructor for AbilityMana.
* </p> * </p>
* *
* @param sourceCard * @param sourceCard
@@ -320,6 +320,9 @@ public class AbilityManaPart implements java.io.Serializable {
TriggerHandler handler = card.getGame().getTriggerHandler(); TriggerHandler handler = card.getGame().getTriggerHandler();
Trigger trig = TriggerHandler.parseTrigger(sVarHolder.getSVar(this.triggersWhenSpent), sourceCard, false, sVarHolder); Trigger trig = TriggerHandler.parseTrigger(sVarHolder.getSVar(this.triggersWhenSpent), sourceCard, false, sVarHolder);
if (sVarHolder instanceof SpellAbility) {
trig.setSpawningAbility((SpellAbility) sVarHolder);
}
handler.registerOneTrigger(trig); handler.registerOneTrigger(trig);
} }

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

@@ -87,7 +87,7 @@ public final class AbilitySub extends SpellAbility implements java.io.Serializab
effect = api.getSpellEffect(); effect = api.getSpellEffect();
if (api.equals(ApiType.Mana) || api.equals(ApiType.ManaReflected)) { if (api.equals(ApiType.Mana) || api.equals(ApiType.ManaReflected)) {
this.setManaPart(new AbilityManaPart(ca, mapParams)); this.setManaPart(new AbilityManaPart(this, mapParams));
} }
if (api.equals(ApiType.ChangeZone) || api.equals(ApiType.ChangeZoneAll)) { if (api.equals(ApiType.ChangeZone) || api.equals(ApiType.ChangeZoneAll)) {