From e10ab75bf511c0578ed38d3b771173d4cc725868 Mon Sep 17 00:00:00 2001
From: MrGadget <9826063+MrGadget1024@users.noreply.github.com>
Date: Sat, 20 Jan 2024 04:46:29 -0500
Subject: [PATCH] fix(InterestManagement): Separate ResetState (#3743)

* fix(InterestManagement): Separate ResetState
We should not have hijacked Unity's callback for runtime resets.

* Updated Template
---
 .../InterestManagement/Distance/DistanceInterestManagement.cs | 2 +-
 .../SpatialHashing/SpatialHashingInterestManagement.cs        | 2 +-
 Assets/Mirror/Core/InterestManagementBase.cs                  | 2 +-
 Assets/Mirror/Core/NetworkServer.cs                           | 4 ++--
 ...Custom Interest Management-CustomInterestManagement.cs.txt | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Assets/Mirror/Components/InterestManagement/Distance/DistanceInterestManagement.cs b/Assets/Mirror/Components/InterestManagement/Distance/DistanceInterestManagement.cs
index 044155877..654996191 100644
--- a/Assets/Mirror/Components/InterestManagement/Distance/DistanceInterestManagement.cs
+++ b/Assets/Mirror/Components/InterestManagement/Distance/DistanceInterestManagement.cs
@@ -25,7 +25,7 @@ int GetVisRange(NetworkIdentity identity)
         }
 
         [ServerCallback]
-        public override void Reset()
+        public override void ResetState()
         {
             lastRebuildTime = 0D;
             CustomRanges.Clear();
diff --git a/Assets/Mirror/Components/InterestManagement/SpatialHashing/SpatialHashingInterestManagement.cs b/Assets/Mirror/Components/InterestManagement/SpatialHashing/SpatialHashingInterestManagement.cs
index 298603497..066a1c5ee 100644
--- a/Assets/Mirror/Components/InterestManagement/SpatialHashing/SpatialHashingInterestManagement.cs
+++ b/Assets/Mirror/Components/InterestManagement/SpatialHashing/SpatialHashingInterestManagement.cs
@@ -72,7 +72,7 @@ public override void OnRebuildObservers(NetworkIdentity identity, HashSet<Networ
         }
 
         [ServerCallback]
-        public override void Reset()
+        public override void ResetState()
         {
             lastRebuildTime = 0D;
         }
diff --git a/Assets/Mirror/Core/InterestManagementBase.cs b/Assets/Mirror/Core/InterestManagementBase.cs
index 8fed86860..ec60d640e 100644
--- a/Assets/Mirror/Core/InterestManagementBase.cs
+++ b/Assets/Mirror/Core/InterestManagementBase.cs
@@ -23,7 +23,7 @@ protected virtual void OnEnable()
         }
 
         [ServerCallback]
-        public virtual void Reset() {}
+        public virtual void ResetState() {}
 
         // Callback used by the visibility system to determine if an observer
         // (player) can see the NetworkIdentity. If this function returns true,
diff --git a/Assets/Mirror/Core/NetworkServer.cs b/Assets/Mirror/Core/NetworkServer.cs
index d6e2fcfee..c7ba80e89 100644
--- a/Assets/Mirror/Core/NetworkServer.cs
+++ b/Assets/Mirror/Core/NetworkServer.cs
@@ -161,7 +161,7 @@ static void Initialize()
 
             // reset Interest Management so that rebuild intervals
             // start at 0 when starting again.
-            if (aoi != null) aoi.Reset();
+            if (aoi != null) aoi.ResetState();
 
             // reset NetworkTime
             NetworkTime.ResetStatics();
@@ -244,7 +244,7 @@ public static void Shutdown()
             OnDisconnectedEvent = null;
             OnErrorEvent = null;
 
-            if (aoi != null) aoi.Reset();
+            if (aoi != null) aoi.ResetState();
         }
 
         static void RemoveTransportHandlers()
diff --git a/Assets/ScriptTemplates/54-Mirror__Custom Interest Management-CustomInterestManagement.cs.txt b/Assets/ScriptTemplates/54-Mirror__Custom Interest Management-CustomInterestManagement.cs.txt
index a47caf1bc..5523ac9ae 100644
--- a/Assets/ScriptTemplates/54-Mirror__Custom Interest Management-CustomInterestManagement.cs.txt	
+++ b/Assets/ScriptTemplates/54-Mirror__Custom Interest Management-CustomInterestManagement.cs.txt	
@@ -75,7 +75,7 @@ public class #SCRIPTNAME# : InterestManagement
     /// Called by NetworkServer in Initialize and Shutdown
     /// </summary>
     [ServerCallback]
-    public override void Reset() { }
+    public override void ResetState() { }
 
     [ServerCallback]
     void Update()