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

- Update scripts (m - z)

Browse Source
This commit is contained in:
swordshine
2014-03-16 12:16:57 +00:00
parent 86ee4c0c78
commit ad8dc923db
13 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -175,7 +175,7 @@ public class AbilityUtils {
}
} else if (defined.equals("DelayTriggerRemembered")) {
if (sa.isTrigger()) {
for (Object o : sa.getTriggerRemembered()) {
for (Object o : sa.getRootAbility().getTriggerRemembered()) {
if (o instanceof Card) {
cards.add(game.getCardState((Card) o));
}
@@ -832,7 +832,7 @@ public class AbilityUtils {
}
else if (defined.equals("DelayTriggerRemembered")) {
if (sa.isTrigger()) {
for (Object o : sa.getTriggerRemembered()) {
for (Object o : sa.getRootAbility().getTriggerRemembered()) {
if (o instanceof Player) {
players.add((Player) o);
}

4
forge-game/src/main/java/forge/game/spellability/SpellAbilityStackInstance.java
View File

@@ -21,6 +21,7 @@ import forge.game.card.Card;
import forge.game.player.Player;
import forge.game.trigger.TriggerType;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -71,6 +72,7 @@ public class SpellAbilityStackInstance {
// Triggers
private HashMap<String, Object> triggeringObjects = new HashMap<String, Object>();
private List<Object> triggerRemembered = new ArrayList<Object>();
private final HashMap<String, String> storedSVars = new HashMap<String, String>();
@@ -98,6 +100,7 @@ public class SpellAbilityStackInstance {
// Triggering info
this.triggeringObjects = sa.getTriggeringObjects();
this.triggerRemembered = sa.getTriggerRemembered();
final AbilitySub subAb = this.ability.getSubAbility();
if (subAb != null) {
@@ -149,6 +152,7 @@ public class SpellAbilityStackInstance {
// Triggered
this.ability.setAllTriggeringObjects(this.triggeringObjects);
this.ability.setTriggerRemembered(this.triggerRemembered);
// Add SVars back in
final Card source = this.ability.getHostCard();