From bac0e9a8c142b92937a5ecafb94a55bbf3c7ebd6 Mon Sep 17 00:00:00 2001
From: Andrew Bastien <volundmush@gmail.com>
Date: Sat, 9 Sep 2023 12:28:04 -0400
Subject: [PATCH] Cleaning up GlobalScriptContainer from some junk logic.

---
 evennia/__init__.py         | 14 +++++++-------
 evennia/utils/containers.py |  4 +---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/evennia/__init__.py b/evennia/__init__.py
index e0452b4879..fc68e75c9d 100644
--- a/evennia/__init__.py
+++ b/evennia/__init__.py
@@ -106,6 +106,9 @@ MONITOR_HANDLER = None
 GLOBAL_SCRIPTS = None
 OPTION_CLASSES = None
 
+# variables
+PORTAL_MODE = False
+
 
 def _create_version():
     """
@@ -160,6 +163,8 @@ def _init(portal_mode=False):
     global EvMenu, EvTable, EvForm, EvMore, EvEditor
     global ANSIString, FuncParser
     global AttributeProperty, TagProperty, TagCategoryProperty
+    global PORTAL_MODE
+    PORTAL_MODE = portal_mode
 
     # Parent typeclasses
     # utilities
@@ -187,7 +192,7 @@ def _init(portal_mode=False):
     from .utils import ansi, gametime, logger
     from .utils.ansi import ANSIString
 
-    if not portal_mode:
+    if not PORTAL_MODE:
         # containers
         from .utils.containers import GLOBAL_SCRIPTS, OPTION_CLASSES
 
@@ -219,7 +224,7 @@ def _init(portal_mode=False):
     )
     from .utils.utils import class_from_module
 
-    if portal_mode:
+    if PORTAL_MODE:
         # Set up the PortalSessionHandler
         from evennia.server.portal import portalsessionhandler
 
@@ -377,11 +382,6 @@ def _init(portal_mode=False):
     del SystemCmds
     del _EvContainer
 
-    # delayed starts - important so as to not back-access evennia before it has
-    # finished initializing
-    if not portal_mode:
-        GLOBAL_SCRIPTS.start()
-
 
 def set_trace(term_size=(140, 80), debugger="auto"):
     """
diff --git a/evennia/utils/containers.py b/evennia/utils/containers.py
index 20d766b3c0..70b7b43f7d 100644
--- a/evennia/utils/containers.py
+++ b/evennia/utils/containers.py
@@ -155,9 +155,7 @@ class GlobalScriptContainer(Container):
                 return None
 
             # store a hash representation of the setup
-            script.attributes.add("_global_script_settings", compare_hash, category="settings_hash")
-
-        self.scripts[key] = script
+            script.attributes.add("global_script_settings", compare_hash, category="settings_hash")
 
         return script