From 6800d80cae5e2d5295a4cb8513d717f4628ae7b6 Mon Sep 17 00:00:00 2001
From: Evan Kranzler <theelk801@gmail.com>
Date: Tue, 19 Sep 2017 11:41:16 -0400
Subject: [PATCH] updated Crown of Doom

---
 Mage.Sets/src/mage/cards/c/CrownOfDoom.java | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/c/CrownOfDoom.java b/Mage.Sets/src/mage/cards/c/CrownOfDoom.java
index 6226d57717e..851c8ecd923 100644
--- a/Mage.Sets/src/mage/cards/c/CrownOfDoom.java
+++ b/Mage.Sets/src/mage/cards/c/CrownOfDoom.java
@@ -47,6 +47,7 @@ import mage.filter.StaticFilters;
 import mage.filter.predicate.ObjectSourcePlayer;
 import mage.filter.predicate.ObjectSourcePlayerPredicate;
 import mage.game.Game;
+import mage.game.permanent.Permanent;
 import mage.players.Player;
 import mage.target.TargetPlayer;
 import mage.target.targetpointer.FixedTarget;
@@ -57,7 +58,7 @@ import mage.target.targetpointer.FixedTarget;
  */
 public class CrownOfDoom extends CardImpl {
 
-    private static final FilterPlayer filter = new FilterPlayer("player other than Crown of Doom's owner");
+    private static final FilterPlayer filter = new FilterPlayer("player other than {this}'s owner");
 
     static {
         filter.add(new CrownOfDoomPredicate());
@@ -95,17 +96,17 @@ class CrownOfDoomPredicate implements ObjectSourcePlayerPredicate<ObjectSourcePl
 
     @Override
     public boolean apply(ObjectSourcePlayer<Player> input, Game game) {
-        Player player = input.getObject();
-        UUID playerId = input.getPlayerId();
-        if (player == null || playerId == null) {
+        Player targetPlayer = input.getObject();
+        Permanent sourceObject = game.getPermanentOrLKIBattlefield(input.getSourceId());
+        if (targetPlayer == null || sourceObject == null) {
             return false;
         }
-        return !player.getId().equals(playerId);
+        return !targetPlayer.getId().equals(sourceObject.getOwnerId());
     }
 
     @Override
     public String toString() {
-        return "Owner()";
+        return "Owner(" + ')';
     }
 }