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: NetworkServer.SpawnObserversForConnection refactored to support all visibility cases (ForceShown/ForceHidden/Default) and all systems (legacy/new/default). fixes #2606

Browse Source
This commit is contained in:
vis2k 2021-03-06 13:52:29 +08:00
parent a277f5c7b7
commit 425e3131dc
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
Assets/Mirror/Runtime/NetworkServer.cs
View File

@ -777,30 +777,48 @@ static void SpawnObserversForConnection(NetworkConnection conn)
{ {
// Debug.Log("Sending spawn message for current server objects name='" + identity.name + "' netId=" + identity.netId + " sceneId=" + identity.sceneId.ToString("X")); // Debug.Log("Sending spawn message for current server objects name='" + identity.name + "' netId=" + identity.netId + " sceneId=" + identity.sceneId.ToString("X"));
// not force hidden? // we need to support three cases:
if (identity.visible != Visibility.ForceHidden) // - legacy system (identity has .visibility)
// - new system (networkserver has .aoi)
// - default case: no .visibility and no .aoi means add all
// connections by default)
//
// ForceHidden/ForceShown overwrite all systems so check it
// first!
// ForceShown: add no matter what
if (identity.visible == Visibility.ForceShown)
{ {
// legacy system support (for now) identity.AddObserver(conn);
}
// ForceHidden: don't show no matter what
else if (identity.visible == Visibility.ForceHidden)
{
// do nothing
}
// default: legacy system / new system / no system support
else if (identity.visible == Visibility.Default)
{
// legacy system
#pragma warning disable 618 #pragma warning disable 618
if (identity.visibility != null) if (identity.visibility != null)
{ {
// call OnCheckObserver
if (identity.visibility.OnCheckObserver(conn)) if (identity.visibility.OnCheckObserver(conn))
{
identity.AddObserver(conn); identity.AddObserver(conn);
}
} }
#pragma warning restore 618 #pragma warning restore 618
// new system // new system
else if (aoi != null)
{
// call OnCheckObserver
if (aoi.OnCheckObserver(identity, conn))
identity.AddObserver(conn);
}
// no system: add all observers by default
else else
{ {
// add observer: identity.AddObserver(conn);
// -> if there is no interest management system then simply
// always add (everyone sees everyone by default)
// -> if there is a system then ask the system to check
if (aoi == null || aoi.OnCheckObserver(identity, conn))
{
identity.AddObserver(conn);
}
} }
} }
} }