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

Made Update internal in Int Mgmt Components

Browse Source 
- also standardized on using [ServerCallback]
This commit is contained in:
MrGadget1024 2021-10-30 02:47:26 -04:00
parent 895279ee79
commit 52d1445091
5 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -53,11 +53,10 @@ public override void OnRebuildObservers(NetworkIdentity identity, HashSet<Networ
} }
} }
void Update() // internal so we can update from tests
[ServerCallback]
internal void Update()
{ {
// only on server
if (!NetworkServer.active) return;
// rebuild all spawned NetworkIdentity's observers every interval // rebuild all spawned NetworkIdentity's observers every interval
if (NetworkTime.localTime >= lastRebuildTime + rebuildInterval) if (NetworkTime.localTime >= lastRebuildTime + rebuildInterval)
{ {

3
Assets/Mirror/Components/InterestManagement/Match/MatchInterestManagement.cs
View File

@ -43,8 +43,9 @@ public override void OnDestroyed(NetworkIdentity identity)
RebuildMatchObservers(currentMatch); RebuildMatchObservers(currentMatch);
} }
// internal so we can update from tests
[ServerCallback] [ServerCallback]
void Update() internal void Update()
{ {
// for each spawned: // for each spawned:
// if match changed: // if match changed:

7
Assets/Mirror/Components/InterestManagement/Scene/SceneInterestManagement.cs
View File

@ -37,11 +37,10 @@ public override void OnDestroyed(NetworkIdentity identity)
RebuildSceneObservers(currentScene); RebuildSceneObservers(currentScene);
} }
void Update() // internal so we can update from tests
[ServerCallback]
internal void Update()
{ {
// only on server
if (!NetworkServer.active) return;
// for each spawned: // for each spawned:
// if scene changed: // if scene changed:
// add previous to dirty // add previous to dirty

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

@ -62,11 +62,9 @@ public override void OnRebuildObservers(NetworkIdentity identity, HashSet<Networ
// update everyone's position in the grid // update everyone's position in the grid
// (internal so we can update from tests) // (internal so we can update from tests)
[ServerCallback]
internal void Update() internal void Update()
{ {
// only on server
if (!NetworkServer.active) return;
// NOTE: unlike Scene/MatchInterestManagement, this rebuilds ALL // NOTE: unlike Scene/MatchInterestManagement, this rebuilds ALL
// entities every INTERVAL. consider the other approach later. // entities every INTERVAL. consider the other approach later.

12
Assets/Mirror/Components/InterestManagement/Team/TeamInterestManagement.cs
View File

@ -35,17 +35,15 @@ public override void OnSpawned(NetworkIdentity identity)
public override void OnDestroyed(NetworkIdentity identity) public override void OnDestroyed(NetworkIdentity identity)
{ {
// Do nothing if server has shut down (or not started)
if (!NetworkServer.active) return;
lastObjectTeam.TryGetValue(identity, out string currentTeam); lastObjectTeam.TryGetValue(identity, out string currentTeam);
lastObjectTeam.Remove(identity); lastObjectTeam.Remove(identity);
if (currentTeam != string.Empty && teamObjects.TryGetValue(currentTeam, out HashSet<NetworkIdentity> objects) && objects.Remove(identity)) if (currentTeam != string.Empty && teamObjects.TryGetValue(currentTeam, out HashSet<NetworkIdentity> objects) && objects.Remove(identity))
RebuildTeamObservers(currentTeam); RebuildTeamObservers(currentTeam);
} }
// internal so we can update from tests
[ServerCallback] [ServerCallback]
void Update() internal void Update()
{ {
// for each spawned: // for each spawned:
// if team changed: // if team changed:
@ -116,9 +114,6 @@ void RebuildTeamObservers(string teamId)
public override bool OnCheckObserver(NetworkIdentity identity, NetworkConnection newObserver) public override bool OnCheckObserver(NetworkIdentity identity, NetworkConnection newObserver)
{ {
// Do nothing if server has shut down (or not started)
if (!NetworkServer.active) return false;
// Always observed if no NetworkTeam component // Always observed if no NetworkTeam component
if (!identity.TryGetComponent<NetworkTeam>(out NetworkTeam identityNetworkTeam)) if (!identity.TryGetComponent<NetworkTeam>(out NetworkTeam identityNetworkTeam))
return true; return true;
@ -133,9 +128,6 @@ public override bool OnCheckObserver(NetworkIdentity identity, NetworkConnection
public override void OnRebuildObservers(NetworkIdentity identity, HashSet<NetworkConnection> newObservers, bool initialize) public override void OnRebuildObservers(NetworkIdentity identity, HashSet<NetworkConnection> newObservers, bool initialize)
{ {
// Do nothing if server has shut down (or not started)
if (!NetworkServer.active) return;
// If this object doesn't have a NetworkTeam then it's visible to all clients // If this object doesn't have a NetworkTeam then it's visible to all clients
if (!identity.TryGetComponent<NetworkTeam>(out NetworkTeam networkTeam)) if (!identity.TryGetComponent<NetworkTeam>(out NetworkTeam networkTeam))
{ {