From a6e23f97047ed8b248549d53f6387b6ffdeb0201 Mon Sep 17 00:00:00 2001
From: ssk97 <knipesteven@gmail.com>
Date: Mon, 17 Jul 2023 23:19:40 -0700
Subject: [PATCH] additional fixes for Kaito's watcher (#10646)

---
 Mage.Sets/src/mage/cards/k/KaitoDancingShadow.java             | 3 ++-
 .../filter/predicate/permanent/PermanentInListPredicate.java   | 2 +-
 .../permanent/PermanentReferenceInCollectionPredicate.java     | 3 +--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/k/KaitoDancingShadow.java b/Mage.Sets/src/mage/cards/k/KaitoDancingShadow.java
index 01b0b218539..efc36f69373 100644
--- a/Mage.Sets/src/mage/cards/k/KaitoDancingShadow.java
+++ b/Mage.Sets/src/mage/cards/k/KaitoDancingShadow.java
@@ -152,8 +152,9 @@ class KaitoDancingShadowWatcher extends Watcher {
     }
 
     //Return the set of permanents that the controller controlled which dealt combat damage to the player
+    //Returns empty set if there were none
     public Set<MageObjectReference> getPermanents(UUID controllerID, UUID damagedPlayerID) {
-        return permanents.get(controllerID).stream()
+        return permanents.getOrDefault(controllerID, Collections.emptyList()).stream()
                 .filter((mor) -> damagedPlayerID.equals(damageTarget.get(mor)))
                 .collect(Collectors.toSet());
     }
diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/PermanentInListPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/PermanentInListPredicate.java
index 99ea97bb6bd..b1ee4511e2d 100644
--- a/Mage/src/main/java/mage/filter/predicate/permanent/PermanentInListPredicate.java
+++ b/Mage/src/main/java/mage/filter/predicate/permanent/PermanentInListPredicate.java
@@ -20,6 +20,6 @@ public class PermanentInListPredicate implements Predicate<Permanent> {
 
     @Override
     public boolean apply(Permanent input, Game game) {
-        return (permanents != null && permanents.contains(input));
+        return (permanents.contains(input));
     }
 }
diff --git a/Mage/src/main/java/mage/filter/predicate/permanent/PermanentReferenceInCollectionPredicate.java b/Mage/src/main/java/mage/filter/predicate/permanent/PermanentReferenceInCollectionPredicate.java
index 4793fd92bee..cf80e66c40b 100644
--- a/Mage/src/main/java/mage/filter/predicate/permanent/PermanentReferenceInCollectionPredicate.java
+++ b/Mage/src/main/java/mage/filter/predicate/permanent/PermanentReferenceInCollectionPredicate.java
@@ -27,7 +27,6 @@ public class PermanentReferenceInCollectionPredicate implements Predicate<Perman
 
     @Override
     public boolean apply(Permanent input, Game game) {
-        return (references != null &&
-                references.contains(new MageObjectReference(input, game)));
+        return (references.contains(new MageObjectReference(input, game)));
     }
 }