From b59f77e2ac525a252bbdc96eca5fff459510bd2d Mon Sep 17 00:00:00 2001
From: elcnesh <elcnesh@cardforge.org>
Date: Mon, 28 Jul 2014 15:28:50 +0000
Subject: [PATCH] Fix some more references to getOpponent().

---
 forge-game/src/main/java/forge/game/CardTraitBase.java     | 7 +++++--
 forge-game/src/main/java/forge/game/GameAction.java        | 2 +-
 .../src/main/java/forge/game/ability/AbilityUtils.java     | 4 ++--
 forge-gui/res/cardsfolder/g/goblin_festival.txt            | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/forge-game/src/main/java/forge/game/CardTraitBase.java b/forge-game/src/main/java/forge/game/CardTraitBase.java
index 37b2d5508e9..12d5ad5772e 100644
--- a/forge-game/src/main/java/forge/game/CardTraitBase.java
+++ b/forge-game/src/main/java/forge/game/CardTraitBase.java
@@ -222,8 +222,9 @@ public abstract class CardTraitBase extends GameObject {
                 list.addAll(this.getHostCard().getController().getCardsIn(presentZone));
             }
             if (presentPlayer.equals("Opponent") || presentPlayer.equals("Any")) {
-                for (Player p : this.getHostCard().getController().getOpponents())
+                for (final Player p : this.getHostCard().getController().getOpponents()) {
                     list.addAll(p.getCardsIn(presentZone));
+                }
             }
     
             list = CardLists.getValidCards(list, sIsPresent.split(","), this.getHostCard().getController(), this.getHostCard());
@@ -262,7 +263,9 @@ public abstract class CardTraitBase extends GameObject {
                 list.addAll(this.getHostCard().getController().getCardsIn(presentZone));
             }
             if (presentPlayer.equals("Opponent") || presentPlayer.equals("Any")) {
-                list.addAll(this.getHostCard().getController().getOpponent().getCardsIn(presentZone));
+                for (final Player p : this.getHostCard().getController().getOpponents()) {
+                    list.addAll(p.getCardsIn(presentZone));
+                }
             }
     
             list = CardLists.getValidCards(list, sIsPresent.split(","), this.getHostCard().getController(), this.getHostCard());
diff --git a/forge-game/src/main/java/forge/game/GameAction.java b/forge-game/src/main/java/forge/game/GameAction.java
index 5b2f62ec202..a6b25fee176 100644
--- a/forge-game/src/main/java/forge/game/GameAction.java
+++ b/forge-game/src/main/java/forge/game/GameAction.java
@@ -963,7 +963,7 @@ public class GameAction {
             final Player pl = (Player) entity;
             boolean invalid = false;
 
-            if (tgt.canOnlyTgtOpponent() && !c.getController().getOpponent().equals(pl)) {
+            if (tgt.canOnlyTgtOpponent() && !c.getController().isOpponentOf(pl)) {
                 invalid = true;
             }
             else if (pl.hasProtectionFrom(c)) {
diff --git a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
index 73c541cd417..d08591084ed 100644
--- a/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
+++ b/forge-game/src/main/java/forge/game/ability/AbilityUtils.java
@@ -886,10 +886,10 @@ public class AbilityUtils {
                 }
             }
         }
-        else if (defined.equals("RememberedOpponent")) {
+        else if (defined.equals("RememberedOpponents")) {
             for (final Object rem : card.getRemembered()) {
                 if (rem instanceof Player) {
-                    players.add(((Player) rem).getOpponent());
+                    players.addAll(((Player) rem).getOpponents());
                 }
             }
         }
diff --git a/forge-gui/res/cardsfolder/g/goblin_festival.txt b/forge-gui/res/cardsfolder/g/goblin_festival.txt
index 21f206d8cd4..3d9080f0404 100644
--- a/forge-gui/res/cardsfolder/g/goblin_festival.txt
+++ b/forge-gui/res/cardsfolder/g/goblin_festival.txt
@@ -4,7 +4,7 @@ Types:Enchantment
 A:AB$ DealDamage | Cost$ 2 | NumDmg$ 1 | ValidTgts$ Creature,Player | TgtPrompt$ Select target creature or player | SubAbility$ RememberActivator | SpellDescription$ CARDNAME deals 1 damage to target creature or player. Flip a coin. If you lose the flip, choose one of your opponents. That player gains control of CARDNAME.
 SVar:RememberActivator:DB$ Pump | RememberObjects$ You | Static$ True | StackDescription$ None | SubAbility$ ControlFlip
 SVar:ControlFlip:DB$ FlipACoin | Defined$ Remembered | LoseSubAbility$ ChooseOpp | WinSubAbility$ DBCleanup
-SVar:ChooseOpp:DB$ ChoosePlayer | Defined$ Remembered | Choices$ RememberedOpponent | AILogic$ Curse | SubAbility$ LoseControl
+SVar:ChooseOpp:DB$ ChoosePlayer | Defined$ Remembered | Choices$ RememberedOpponents | AILogic$ Curse | SubAbility$ LoseControl
 SVar:LoseControl:DB$ GainControl | Defined$ Self | NewController$ ChosenPlayer | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 SVar:Picture:http://www.wizards.com/global/images/magic/general/goblin_festival.jpg