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

- Tweaked "TriggeredDefendingPlayer"

Browse Source
This commit is contained in:
swordshine
2015-01-15 13:46:02 +00:00
parent 5e5060256a
commit f3a490db3d
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/game/combat/CombatUtil.java
View File

@@ -300,6 +300,7 @@ public class CombatUtil {
otherAttackers.remove(c); otherAttackers.remove(c);
runParams.put("OtherAttackers", otherAttackers); runParams.put("OtherAttackers", otherAttackers);
runParams.put("Attacked", combat.getDefenderByAttacker(c)); runParams.put("Attacked", combat.getDefenderByAttacker(c));
runParams.put("DefendingPlayer", combat.getDefenderPlayerByAttacker(c));
game.getTriggerHandler().runTrigger(TriggerType.Attacks, runParams, false); game.getTriggerHandler().runTrigger(TriggerType.Attacks, runParams, false);
// Annihilator: can be copied by Strionic Resonator now // Annihilator: can be copied by Strionic Resonator now

6
forge-game/src/main/java/forge/game/trigger/TriggerAttacks.java
View File

@@ -94,8 +94,7 @@ public class TriggerAttacks extends Trigger {
} }
if (this.mapParams.containsKey("DefendingPlayerPoisoned")) { if (this.mapParams.containsKey("DefendingPlayerPoisoned")) {
Card attacker = (Card) runParams2.get("Attacker"); Player defendingPlayer = (Player) runParams2.get("DefendingPlayer");
Player defendingPlayer = attacker.getGame().getCombat().getDefenderPlayerByAttacker(attacker);
if (defendingPlayer.getPoisonCounters() == 0) { if (defendingPlayer.getPoisonCounters() == 0) {
return false; return false;
} }
@@ -109,7 +108,6 @@ public class TriggerAttacks extends Trigger {
public final void setTriggeringObjects(final SpellAbility sa) { public final void setTriggeringObjects(final SpellAbility sa) {
sa.setTriggeringObject("Attacker", this.getRunParams().get("Attacker")); sa.setTriggeringObject("Attacker", this.getRunParams().get("Attacker"));
sa.setTriggeringObject("Defender", this.getRunParams().get("Attacked")); sa.setTriggeringObject("Defender", this.getRunParams().get("Attacked"));
final Player defendingPlayer = ((Card) this.getRunParams().get("Attacker")).getGame().getCombat().getDefenderPlayerByAttacker((Card) this.getRunParams().get("Attacker")); sa.setTriggeringObject("DefendingPlayer", this.getRunParams().get("DefendingPlayer"));
sa.setTriggeringObject("DefendingPlayer", defendingPlayer);
} }
} }