From 57b50857cc9733dd96975822906f5cbb5d53b90e Mon Sep 17 00:00:00 2001
From: ThomasLerner <tsl26@case.edu>
Date: Sun, 9 Apr 2017 18:23:34 -0400
Subject: [PATCH] Update IceCave.java

I used getOpponents, but that required changing input from source.getControllerId() to spell.getControllerId() so that it would get the opponents of the player who played the spell, rather than the opponents of the player who controls Ice Cave. I also implemented a null check for the spellController as I made it.
---
 Mage.Sets/src/mage/cards/i/IceCave.java | 26 ++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/i/IceCave.java b/Mage.Sets/src/mage/cards/i/IceCave.java
index 81770bbbe90..e6474dd0f7c 100644
--- a/Mage.Sets/src/mage/cards/i/IceCave.java
+++ b/Mage.Sets/src/mage/cards/i/IceCave.java
@@ -94,19 +94,23 @@ class IceCaveEffect extends OneShotEffect {
         Player controller = game.getPlayer(source.getControllerId());
         Permanent sourcePermanent = game.getPermanentOrLKIBattlefield(source.getSourceId());
         Spell spell = (Spell) game.getStack().getStackObject(targetPointer.getFirst(game, source));
-        if(sourcePermanent != null && spell != null) {
+        if(sourcePermanent != null && spell != null && controller != null) {
+            Player spellController = game.getPlayer(spell.getControllerId());
             Cost cost = new ManaCostsImpl(spell.getSpellAbility().getManaCosts().getText());
-            for (UUID playerId : game.getState().getPlayerList(source.getControllerId())) {
-                Player player = game.getPlayer(playerId);
-                if(player.getId() != spell.getControllerId()) {
-                    cost.clearPaid();
-                    if (cost.canPay(source, source.getSourceId(), player.getId(), game)
-                            && player.chooseUse(outcome, "Pay " + cost.getText() + " to counter " + spell.getIdName() + '?', source, game)) {
-                        if (cost.pay(source, game, source.getSourceId(), playerId, false, null)) {
-                            game.informPlayers(player.getLogName() + " pays" + cost.getText() + " to counter " + spell.getIdName() + '.');
-                            game.getStack().counter(spell.getId(), source.getSourceId(), game);
+            if (spellController != null) {
+                for (UUID playerId : game.getOpponents(spell.getControllerId())) {
+                    Player player = game.getPlayer(playerId);
+                    if (player != null) {
+                        cost.clearPaid();
+                        if (cost.canPay(source, source.getSourceId(), player.getId(), game)
+                                && player.chooseUse(outcome, "Pay " + cost.getText() + " to counter " + spell.getIdName() + '?', source, game)) {
+                            if (cost.pay(source, game, source.getSourceId(), playerId, false, null)) {
+                                game.informPlayers(player.getLogName() + " pays" + cost.getText() + " to counter " + spell.getIdName() + '.');
+                                game.getStack().counter(spell.getId(), source.getSourceId(), game);
+                                return true;
+                            }
                         }
-                    } 
+                    }
                 }
             }
         }