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

Trigger: make getOverridingAbility copyable (for now only for AbilitySub)

Browse Source
This commit is contained in:
Hanmac
2016-07-22 19:56:34 +00:00
parent 0ebea0a495
commit 14f5998bec
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
forge-game/src/main/java/forge/game/trigger/Trigger.java
View File

@@ -25,6 +25,7 @@ import forge.game.phase.PhaseHandler;
import forge.game.phase.PhaseType; import forge.game.phase.PhaseType;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.spellability.Ability; import forge.game.spellability.Ability;
import forge.game.spellability.AbilitySub;
import forge.game.spellability.OptionalCost; import forge.game.spellability.OptionalCost;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
@@ -381,7 +382,6 @@ public abstract class Trigger extends TriggerReplacementBase {
* @return the triggered sa * @return the triggered sa
*/ */
public final Ability getTriggeredSA() { public final Ability getTriggeredSA() {
System.out.println("TriggeredSA = " + this.triggeredSA);
return this.triggeredSA; return this.triggeredSA;
} }
@@ -427,7 +427,16 @@ public abstract class Trigger extends TriggerReplacementBase {
final Trigger copy = tt.createTrigger(originalMapParams, newHost, intrinsic); final Trigger copy = tt.createTrigger(originalMapParams, newHost, intrinsic);
if (this.getOverridingAbility() != null) { if (this.getOverridingAbility() != null) {
copy.setOverridingAbility(this.getOverridingAbility()); SpellAbility old = this.getOverridingAbility();
SpellAbility sa = old;
// try to copy it if newHost is not the wanted host
if (!newHost.equals(old.getHostCard())) {
if (old instanceof AbilitySub) {
sa = ((AbilitySub)old).getCopy();
sa.setHostCard(newHost);
}
}
copy.setOverridingAbility(sa);
} }
// 2015-03-07 Removing the ID copying which makes copied triggers Identical to each other when removing // 2015-03-07 Removing the ID copying which makes copied triggers Identical to each other when removing