From c513f93329658bf65f4330946725bc918ba48ea2 Mon Sep 17 00:00:00 2001
From: Sloth <sloth@cardforge.org>
Date: Sun, 16 Jun 2013 14:15:35 +0000
Subject: [PATCH] - Fixed "CARDNAME untaps during each other player's untap
 step." working on your own untap step.

---
 src/main/java/forge/game/phase/Untap.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/forge/game/phase/Untap.java b/src/main/java/forge/game/phase/Untap.java
index a256e3bc9d5..d9f3b309abf 100644
--- a/src/main/java/forge/game/phase/Untap.java
+++ b/src/main/java/forge/game/phase/Untap.java
@@ -193,11 +193,11 @@ public class Untap extends Phase {
         }
 
         // other players untapping during your untap phase
-        final List<Card> cardsWithKW = CardLists.getKeyword(game.getCardsIn(ZoneType.Battlefield),
+        List<Card> cardsWithKW = CardLists.getKeyword(game.getCardsIn(ZoneType.Battlefield),
                 "CARDNAME untaps during each other player's untap step.");
-        final List<Player> otherPlayers = player.getOpponents();
-        otherPlayers.addAll(player.getAllies());
-        CardLists.filter(cardsWithKW, CardPredicates.isControlledByAnyOf(otherPlayers));
+        final List<Player> otherPlayers = new ArrayList<Player>(game.getPlayers());
+        otherPlayers.remove(player);
+        cardsWithKW = CardLists.filter(cardsWithKW, CardPredicates.isControlledByAnyOf(otherPlayers));
         for (final Card cardWithKW : cardsWithKW) {
             cardWithKW.untap();
         }