From 25a5e37cc6d7861ec5b2c8d7be3e5254127e7146 Mon Sep 17 00:00:00 2001
From: Fabian Dill <fabian.dill@web.de>
Date: Wed, 17 Apr 2024 08:20:57 +0200
Subject: [PATCH] Core: switch to singleton pattern

---
 BaseClasses.py | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/BaseClasses.py b/BaseClasses.py
index 22fb73617f..d323e0e194 100644
--- a/BaseClasses.py
+++ b/BaseClasses.py
@@ -129,6 +129,9 @@ class MultiWorld():
                                      f"running since {time.perf_counter()-self.entered:.0f} seconds ago.")
                         self.current_function = ""
 
+    observer = Observer()
+    observer.start()
+
     class RegionManager:
         region_cache: Dict[int, Dict[str, Region]]
         entrance_cache: Dict[int, Dict[str, Entrance]]
@@ -194,8 +197,6 @@ class MultiWorld():
         self.local_early_items = {player: {} for player in self.player_ids}
         self.indirect_connections = {}
         self.start_inventory_from_pool: Dict[int, Options.StartInventoryPool] = {}
-        self.observer = self.Observer()
-        self.observer.start()
 
         for player in range(1, players + 1):
             def set_player_attr(attr, val):
@@ -249,11 +250,6 @@ class MultiWorld():
                                                       "world's random object instead (usually self.random)")
         self.plando_options = PlandoOptions.none
 
-    def __del__(self):
-        observer = getattr(self, "observer", None)
-        if observer:
-            observer.shutdown = True
-
     def get_all_ids(self) -> Tuple[int, ...]:
         return self.player_ids + tuple(self.groups)