From bddbd365d89f22ebb72d6f1d7c99c25d877fb0e7 Mon Sep 17 00:00:00 2001 From: Sol Date: Fri, 16 Oct 2015 00:03:23 +0000 Subject: [PATCH] - Starting to fix using the right variables for getImportantStackObjects --- .../src/main/java/forge/game/trigger/TriggerAttacks.java | 3 ++- forge-game/src/main/java/forge/game/trigger/TriggerPhase.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java b/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java index 6c60be77361..e5f1bdb8912 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java @@ -114,7 +114,8 @@ public class TriggerAttacks extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Attacker: ").append(this.getRunParams().get("Attacker")); + + sb.append("Attacker: ").append(sa.getTriggeringObject("Attacker")); return sb.toString(); } } diff --git a/forge-game/src/main/java/forge/game/trigger/TriggerPhase.java b/forge-game/src/main/java/forge/game/trigger/TriggerPhase.java index 66dbd24fb55..843368ac05d 100644 --- a/forge-game/src/main/java/forge/game/trigger/TriggerPhase.java +++ b/forge-game/src/main/java/forge/game/trigger/TriggerPhase.java @@ -67,7 +67,7 @@ public class TriggerPhase extends Trigger { @Override public String getImportantStackObjects(SpellAbility sa) { StringBuilder sb = new StringBuilder(); - sb.append("Player: ").append(this.getRunParams().get("Player")); + sb.append("Phase: ").append(sa.getTriggeringObject("Player")); return sb.toString(); } }