From 31e08f09abd6dd8351ade68ce0cd5a24b04f45b6 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 12:42:35 +0000 Subject: [PATCH] - Fixed the DealsDamage/opponent trigger of the whenever keyword to only trigger when dealing damage to the opponent. --- src/forge/GameActionUtil.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java index 139ab8a4e81..441d37ca8c9 100644 --- a/src/forge/GameActionUtil.java +++ b/src/forge/GameActionUtil.java @@ -5522,9 +5522,11 @@ public class GameActionUtil { if (damage > 0) { Object[] DealsDamage_Whenever_Parameters = new Object[3]; - DealsDamage_Whenever_Parameters[0] = c.getController().getOpponent(); DealsDamage_Whenever_Parameters[2] = c; - AllZone.GameAction.checkWheneverKeyword(c, "DealsDamage/Opponent", DealsDamage_Whenever_Parameters); + DealsDamage_Whenever_Parameters[0] = player; + AllZone.GameAction.checkWheneverKeyword(c, "DealsDamage/Player", DealsDamage_Whenever_Parameters); + if(!c.getController().equals(player)) + AllZone.GameAction.checkWheneverKeyword(c, "DealsDamage/Opponent", DealsDamage_Whenever_Parameters); CardList playerPerms = AllZoneUtil.getPlayerCardsInPlay(player);