From 38c641b9482056deb44e6475112a6e0aba5c9767 Mon Sep 17 00:00:00 2001
From: MrGadget <9826063+MrGadget1024@users.noreply.github.com>
Date: Thu, 2 Dec 2021 07:54:39 -0500
Subject: [PATCH] feat: Added Reset to Interest Management (#3008)

* feat: Added Reset to Interest Management
- Used in Distance and Spatial to reset `lastRebuildTime`.

* Updated Template

* Update Assets/Mirror/Runtime/NetworkServer.cs

Co-authored-by: vis2k <info@noobtuts.com>
---
 .../Distance/DistanceInterestManagement.cs               | 6 ++++++
 .../SpatialHashing/SpatialHashingInterestManagement.cs   | 6 ++++++
 Assets/Mirror/Runtime/InterestManagement.cs              | 2 ++
 Assets/Mirror/Runtime/NetworkServer.cs                   | 9 ++++++++-
 ...m Interest Management-CustomInterestManagement.cs.txt | 9 +++++++++
 5 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/Assets/Mirror/Components/InterestManagement/Distance/DistanceInterestManagement.cs b/Assets/Mirror/Components/InterestManagement/Distance/DistanceInterestManagement.cs
index ec601cba84..ad432be146 100644
--- a/Assets/Mirror/Components/InterestManagement/Distance/DistanceInterestManagement.cs
+++ b/Assets/Mirror/Components/InterestManagement/Distance/DistanceInterestManagement.cs
@@ -20,6 +20,12 @@ int GetVisRange(NetworkIdentity identity)
             return custom != null ? custom.visRange : visRange;
         }
 
+        [ServerCallback]
+        public override void Reset()
+        {
+            lastRebuildTime = 0D;
+        }
+
         public override bool OnCheckObserver(NetworkIdentity identity, NetworkConnection newObserver)
         {
             int range = GetVisRange(identity);
diff --git a/Assets/Mirror/Components/InterestManagement/SpatialHashing/SpatialHashingInterestManagement.cs b/Assets/Mirror/Components/InterestManagement/SpatialHashing/SpatialHashingInterestManagement.cs
index 3db189f2db..b164d870cd 100644
--- a/Assets/Mirror/Components/InterestManagement/SpatialHashing/SpatialHashingInterestManagement.cs
+++ b/Assets/Mirror/Components/InterestManagement/SpatialHashing/SpatialHashingInterestManagement.cs
@@ -60,6 +60,12 @@ public override void OnRebuildObservers(NetworkIdentity identity, HashSet<Networ
             grid.GetWithNeighbours(current, newObservers);
         }
 
+        [ServerCallback]
+        public override void Reset()
+        {
+            lastRebuildTime = 0D;
+        }
+
         // update everyone's position in the grid
         // (internal so we can update from tests)
         [ServerCallback]
diff --git a/Assets/Mirror/Runtime/InterestManagement.cs b/Assets/Mirror/Runtime/InterestManagement.cs
index 44c91e374a..4932b71153 100644
--- a/Assets/Mirror/Runtime/InterestManagement.cs
+++ b/Assets/Mirror/Runtime/InterestManagement.cs
@@ -25,6 +25,8 @@ void Awake()
             else Debug.LogError($"Only one InterestManagement component allowed. {NetworkClient.aoi.GetType()} has been set up already.");
         }
 
+        public virtual void Reset() {}
+
         // Callback used by the visibility system to determine if an observer
         // (player) can see the NetworkIdentity. If this function returns true,
         // the network connection will be added as an observer.
diff --git a/Assets/Mirror/Runtime/NetworkServer.cs b/Assets/Mirror/Runtime/NetworkServer.cs
index f58329e394..ee3eddc300 100644
--- a/Assets/Mirror/Runtime/NetworkServer.cs
+++ b/Assets/Mirror/Runtime/NetworkServer.cs
@@ -60,17 +60,22 @@ static void Initialize()
             if (initialized)
                 return;
 
-            initialized = true;
             // Debug.Log($"NetworkServer Created version {Version.Current}");
 
             //Make sure connections are cleared in case any old connections references exist from previous sessions
             connections.Clear();
 
+            // reset Interest Management so that rebuild intervals
+            // start at 0 when starting again.
+            if (aoi != null) aoi.Reset();
+
             // reset NetworkTime
             NetworkTime.Reset();
 
             Debug.Assert(Transport.activeTransport != null, "There was no active transport when calling NetworkServer.Listen, If you are calling Listen manually then make sure to set 'Transport.activeTransport' first");
             AddTransportHandlers();
+
+            initialized = true;
         }
 
         static void AddTransportHandlers()
@@ -180,6 +185,8 @@ public static void Shutdown()
             // we don't want to use those hooks after Shutdown anymore.
             OnConnectedEvent = null;
             OnDisconnectedEvent = null;
+
+            if (aoi != null) aoi.Reset();
         }
 
         // connections /////////////////////////////////////////////////////////
diff --git a/Assets/ScriptTemplates/53-Mirror__Custom Interest Management-CustomInterestManagement.cs.txt b/Assets/ScriptTemplates/53-Mirror__Custom Interest Management-CustomInterestManagement.cs.txt
index 9369617d5c..932324cb29 100644
--- a/Assets/ScriptTemplates/53-Mirror__Custom Interest Management-CustomInterestManagement.cs.txt	
+++ b/Assets/ScriptTemplates/53-Mirror__Custom Interest Management-CustomInterestManagement.cs.txt	
@@ -78,6 +78,15 @@ public class #SCRIPTNAME# : InterestManagement
         base.SetHostVisibility(identity, visible);
     }
 
+    /// <summary>
+    /// Called by NetworkServer in Initialize and Shutdown
+    /// </summary>
+    [ServerCallback]
+    public override void Reset()
+    {
+        base.Reset();
+    }
+
     [ServerCallback]
     void Update()
     {