From ac609c371404c40e92e46c19c5dff757042c58f1 Mon Sep 17 00:00:00 2001
From: Susucre <34709007+Susucre@users.noreply.github.com>
Date: Mon, 31 Jul 2023 01:25:56 +0200
Subject: [PATCH] clean combat watchers on Cleanup step, in case of 'end the
 turn' effect (#10705)

---
 Mage.Sets/src/mage/cards/a/AnowonTheRuinThief.java | 3 ++-
 Mage.Sets/src/mage/cards/q/QuartzwoodCrasher.java  | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Mage.Sets/src/mage/cards/a/AnowonTheRuinThief.java b/Mage.Sets/src/mage/cards/a/AnowonTheRuinThief.java
index 842ef250eb9..12f0f38bdaa 100644
--- a/Mage.Sets/src/mage/cards/a/AnowonTheRuinThief.java
+++ b/Mage.Sets/src/mage/cards/a/AnowonTheRuinThief.java
@@ -151,7 +151,8 @@ class AnowonTheRuinThiefWatcher extends Watcher {
 
     @Override
     public void watch(GameEvent event, Game game) {
-        if (event.getType() == GameEvent.EventType.COMBAT_DAMAGE_STEP_POST) {
+        if (event.getType() == GameEvent.EventType.COMBAT_DAMAGE_STEP_POST
+                || event.getType() == GameEvent.EventType.CLEANUP_STEP_POST) {
             damageMap.clear();
             return;
         }
diff --git a/Mage.Sets/src/mage/cards/q/QuartzwoodCrasher.java b/Mage.Sets/src/mage/cards/q/QuartzwoodCrasher.java
index 6d222c63694..28a5e93d802 100644
--- a/Mage.Sets/src/mage/cards/q/QuartzwoodCrasher.java
+++ b/Mage.Sets/src/mage/cards/q/QuartzwoodCrasher.java
@@ -134,7 +134,8 @@ class QuartzwoodCrasherWatcher extends Watcher {
 
     @Override
     public void watch(GameEvent event, Game game) {
-        if (event.getType() == GameEvent.EventType.COMBAT_DAMAGE_STEP_POST) {
+        if (event.getType() == GameEvent.EventType.COMBAT_DAMAGE_STEP_POST
+                || event.getType() == GameEvent.EventType.CLEANUP_STEP_POST) {
             damageMap.clear();
             return;
         }