From a6fb0d6735608b37ce1fe1bda3eea7d96f30da08 Mon Sep 17 00:00:00 2001 From: jendave Date: Sat, 6 Aug 2011 09:52:39 +0000 Subject: [PATCH] fix up special case of WheneverKeyword:DrawCard:ControllingPlayer_Opponent --- src/forge/GameAction.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/forge/GameAction.java b/src/forge/GameAction.java index 4744cf2cf81..9fde0cb1434 100644 --- a/src/forge/GameAction.java +++ b/src/forge/GameAction.java @@ -866,15 +866,13 @@ public class GameAction { if(Conditions[y].contains("ControllingPlayer_Self")) { if(!card.getController().equals(Custom_Parameters[0])) k[4] = "Null"; } - //TODO - fix this up for the Player class conversion - /* if(Conditions[y].contains("ControllingPlayer_Opponent")) { // Special Case for Draw Card if(Event.equals("DrawCard")) { - if(!card.getController().equals(getOpponent((String) Custom_Parameters[0]))) k[4] = "Null"; + if(!card.getController().equals(((Player) Custom_Parameters[0]).getOpponent())) k[4] = "Null"; } else if(!card.getController().equals(c.getController().getOpponent())) k[4] = "Null"; } - */ + if(Conditions[y].contains("Enchanted_Creature")) { if(((Card)Custom_Parameters[2]).getEnchantedBy().contains(card) == false) k[4] = "Null"; }