From 9a0474d19627e846882dbfb0da4fefe331eeced8 Mon Sep 17 00:00:00 2001
From: "jeff@delmarus.com" <>
Date: Sun, 15 Aug 2021 15:24:05 -0500
Subject: [PATCH] - Fixed #8132

---
 Mage.Sets/src/mage/cards/c/CoffinQueen.java | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/c/CoffinQueen.java b/Mage.Sets/src/mage/cards/c/CoffinQueen.java
index 1891244c46..5d206a4067 100644
--- a/Mage.Sets/src/mage/cards/c/CoffinQueen.java
+++ b/Mage.Sets/src/mage/cards/c/CoffinQueen.java
@@ -1,4 +1,3 @@
-
 package mage.cards.c;
 
 import java.util.UUID;
@@ -104,7 +103,8 @@ class CoffinQueenDelayedTriggeredAbility extends DelayedTriggeredAbility {
     @Override
     public boolean checkEventType(GameEvent event, Game game) {
         return event.getType() == GameEvent.EventType.LOST_CONTROL
-                || event.getType() == GameEvent.EventType.UNTAPPED;
+                || event.getType() == GameEvent.EventType.UNTAPPED
+                || event.getType() == GameEvent.EventType.ZONE_CHANGE;
     }
 
     @Override
@@ -113,8 +113,16 @@ class CoffinQueenDelayedTriggeredAbility extends DelayedTriggeredAbility {
                 && event.getTargetId().equals(this.getSourceId())) {
             return true;
         }
-        return EventType.UNTAPPED == event.getType()
-                && event.getTargetId() != null && event.getTargetId().equals(getSourceId());
+        if (EventType.UNTAPPED == event.getType()
+                && event.getTargetId() != null
+                && event.getTargetId().equals(getSourceId())) {
+            return true;
+        }
+        if (EventType.ZONE_CHANGE == event.getType()
+                && event.getTargetId().equals(this.getSourceId())) {
+            return true;
+        }
+        return false;
     }
 
     @Override