From 3f09836c644a9ff6830186989cdd6ead4be775d1 Mon Sep 17 00:00:00 2001
From: "Alex W. Jackson" <alex.w.jackson@gmail.com>
Date: Sat, 24 Sep 2022 01:13:28 -0400
Subject: [PATCH] Fix BlockingOrBlockedWatcher not handling attackers removed
 from combat

---
 .../java/mage/watchers/common/BlockingOrBlockedWatcher.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Mage/src/main/java/mage/watchers/common/BlockingOrBlockedWatcher.java b/Mage/src/main/java/mage/watchers/common/BlockingOrBlockedWatcher.java
index d565605e1f1..0e8b886c0a2 100644
--- a/Mage/src/main/java/mage/watchers/common/BlockingOrBlockedWatcher.java
+++ b/Mage/src/main/java/mage/watchers/common/BlockingOrBlockedWatcher.java
@@ -32,6 +32,9 @@ public class BlockingOrBlockedWatcher extends Watcher {
                 blockerMap.clear();
                 return;
             case REMOVED_FROM_COMBAT:
+                // remove attacker
+                blockerMap.remove(new MageObjectReference(event.getTargetId(), game));
+                // remove blocker
                 blockerMap
                         .values()
                         .stream()