From 75375f2ed553745e9fcaebec2bf48b15a7cf02fe Mon Sep 17 00:00:00 2001
From: Jeff Wadsworth <jeff@delmarus.com>
Date: Fri, 7 Jan 2022 10:24:17 -0600
Subject: [PATCH] - Fixed #8497

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

diff --git a/Mage/src/main/java/mage/watchers/common/ControlCombatRedundancyWatcher.java b/Mage/src/main/java/mage/watchers/common/ControlCombatRedundancyWatcher.java
index d7f75a965c..12507b09d3 100644
--- a/Mage/src/main/java/mage/watchers/common/ControlCombatRedundancyWatcher.java
+++ b/Mage/src/main/java/mage/watchers/common/ControlCombatRedundancyWatcher.java
@@ -15,7 +15,7 @@ import java.util.UUID;
  */
 public class ControlCombatRedundancyWatcher extends Watcher { // workaround for solving timestamp issues regarding "you choose which creatures block and how those creatures block" effects
 
-    private static final class PlayerDuration {
+    private static final class PlayerDuration implements java.io.Serializable {  // class must be serilizable Bug #8497
 
         private final Duration duration;
         private final UUID playerId;
@@ -63,6 +63,7 @@ public class ControlCombatRedundancyWatcher extends Watcher { // workaround for
 
     public static void addBlockingController(UUID playerId, Duration duration, Game game) {
         ControlCombatRedundancyWatcher watcher = game.getState().getWatcher(ControlCombatRedundancyWatcher.class);
+        System.out.println("The watcher is okay? " + watcher);
         watcher.blockingControllers.add(0, new PlayerDuration(duration, playerId));
     }