charleslemaux/Mirror
1
0
Fork 0
mirror of https://github.com/MirrorNetworking/Mirror.git synced 2024-11-18 02:50:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(InterestManagement): Separate ResetState (#3743)

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

* Updated Template
This commit is contained in:
MrGadget 2024-01-20 04:46:29 -05:00 committed by GitHub
parent dd1a457f71
commit e10ab75bf5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Mirror/Components/InterestManagement/Distance/DistanceInterestManagement.cs
View File

@ -25,7 +25,7 @@ int GetVisRange(NetworkIdentity identity)
} }
[ServerCallback] [ServerCallback]
public override void Reset() public override void ResetState()
{ {
lastRebuildTime = 0D; lastRebuildTime = 0D;
CustomRanges.Clear(); CustomRanges.Clear();

2
Assets/Mirror/Components/InterestManagement/SpatialHashing/SpatialHashingInterestManagement.cs
View File

@ -72,7 +72,7 @@ public override void OnRebuildObservers(NetworkIdentity identity, HashSet<Networ
} }
[ServerCallback] [ServerCallback]
public override void Reset() public override void ResetState()
{ {
lastRebuildTime = 0D; lastRebuildTime = 0D;
} }

2
Assets/Mirror/Core/InterestManagementBase.cs
View File

@ -23,7 +23,7 @@ protected virtual void OnEnable()
} }
[ServerCallback] [ServerCallback]
public virtual void Reset() {} public virtual void ResetState() {}
// Callback used by the visibility system to determine if an observer // Callback used by the visibility system to determine if an observer
// (player) can see the NetworkIdentity. If this function returns true, // (player) can see the NetworkIdentity. If this function returns true,

4
Assets/Mirror/Core/NetworkServer.cs
View File

@ -161,7 +161,7 @@ static void Initialize()
// reset Interest Management so that rebuild intervals // reset Interest Management so that rebuild intervals
// start at 0 when starting again. // start at 0 when starting again.
if (aoi != null) aoi.Reset(); if (aoi != null) aoi.ResetState();
// reset NetworkTime // reset NetworkTime
NetworkTime.ResetStatics(); NetworkTime.ResetStatics();
@ -244,7 +244,7 @@ public static void Shutdown()
OnDisconnectedEvent = null; OnDisconnectedEvent = null;
OnErrorEvent = null; OnErrorEvent = null;
if (aoi != null) aoi.Reset(); if (aoi != null) aoi.ResetState();
} }
static void RemoveTransportHandlers() static void RemoveTransportHandlers()

2
Assets/ScriptTemplates/54-Mirror__Custom Interest Management-CustomInterestManagement.cs.txt
View File

@ -75,7 +75,7 @@ public class #SCRIPTNAME# : InterestManagement
/// Called by NetworkServer in Initialize and Shutdown /// Called by NetworkServer in Initialize and Shutdown
/// </summary> /// </summary>
[ServerCallback] [ServerCallback]
public override void Reset() { } public override void ResetState() { }
[ServerCallback] [ServerCallback]
void Update() void Update()