From 383969ce046a61db84d48774318009b1b4b8df73 Mon Sep 17 00:00:00 2001
From: Cal <cal@clockworkcaracal.com>
Date: Mon, 9 Sep 2024 21:05:12 -0600
Subject: [PATCH] fix bug, remove workaround

---
 evennia/contrib/base_systems/ingame_reports/menu.py    | 10 +++++-----
 evennia/contrib/base_systems/ingame_reports/reports.py |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/evennia/contrib/base_systems/ingame_reports/menu.py b/evennia/contrib/base_systems/ingame_reports/menu.py
index a7a4c98a2e..7759f4992b 100644
--- a/evennia/contrib/base_systems/ingame_reports/menu.py
+++ b/evennia/contrib/base_systems/ingame_reports/menu.py
@@ -24,11 +24,6 @@ if hasattr(settings, "INGAME_REPORT_STATUS_TAGS"):
 def menunode_list_reports(caller, raw_string, **kwargs):
     """Paginates and lists out reports for the provided hub"""
     hub = caller.ndb._evmenu.hub
-
-    page = kwargs.get("page", 0)
-    start = page * _REPORTS_PER_PAGE
-    end = start + _REPORTS_PER_PAGE
-    report_slice = report_list[start:end]
     hub_name = " ".join(hub.key.split("_")).title()
     text = f"Managing {hub_name}"
 
@@ -54,6 +49,11 @@ def menunode_list_reports(caller, raw_string, **kwargs):
     if not report_list:
         return "There is nothing there for you to manage.", {}
 
+    page = kwargs.get("page", 0)
+    start = page * _REPORTS_PER_PAGE
+    end = start + _REPORTS_PER_PAGE
+    report_slice = report_list[start:end]
+
     options = [
         {
             "desc": f"{datetime_format(report.date_created)} - {crop(report.message, 50)}",
diff --git a/evennia/contrib/base_systems/ingame_reports/reports.py b/evennia/contrib/base_systems/ingame_reports/reports.py
index 62d470676a..296f14b62c 100644
--- a/evennia/contrib/base_systems/ingame_reports/reports.py
+++ b/evennia/contrib/base_systems/ingame_reports/reports.py
@@ -67,8 +67,8 @@ def _get_report_hub(report_type):
     Note: If no matching valid script exists, this function will attempt to create it.
     """
     hub_key = f"{report_type}_reports"
-    # NOTE: due to a regression in GLOBAL_SCRIPTS, we use search_script instead of the container
-    if not (hub := search.search_script(hub_key)):
+    from evennia import GLOBAL_SCRIPTS
+    if not (hub := GLOBAL_SCRIPTS.get(hub_key)):
         hub = create.create_script(key=hub_key)
     return hub or None