feat: add quick access ref to NetIdentity.ServerObjectManager (#444)

* feat: add quick access ref to NetIdentity.ServerObjectManager * update samples
MirageNet · Oct 30, 2020 · d691ca4 · d691ca4
1 parent cc28239
commit d691ca4
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 7 deletions.
diff --git a/Assets/Mirror/Runtime/NetworkBehaviour.cs b/Assets/Mirror/Runtime/NetworkBehaviour.cs
@@ -92,6 +92,8 @@ public abstract class NetworkBehaviour : MonoBehaviour
         /// </summary>
         public NetworkServer Server => NetIdentity.Server;
 
+        public ServerObjectManager ServerObjectManager => NetIdentity.ServerObjectManager;
+
         /// <summary>
         /// The <see cref="NetworkClient">NetworkClient</see> associated to this object.
         /// </summary>
@@ -200,7 +202,7 @@ private void SyncObject_OnChange()
         {
             if (IsServer)
             {
-                NetIdentity.ServerObjectManager.DirtyObjects.Add(NetIdentity);
+                ServerObjectManager.DirtyObjects.Add(NetIdentity);
             }
         }
 
@@ -429,7 +431,7 @@ public void SetDirtyBit(ulong dirtyBit)
         {
             SyncVarDirtyBits |= dirtyBit;
             if (IsServer)
-                NetIdentity.ServerObjectManager.DirtyObjects.Add(NetIdentity);
+                ServerObjectManager.DirtyObjects.Add(NetIdentity);
         }
 
         /// <summary>

diff --git a/Assets/Mirror/Samples~/MultipleAdditiveScenes/Scripts/Reward.cs b/Assets/Mirror/Samples~/MultipleAdditiveScenes/Scripts/Reward.cs
@@ -50,7 +50,7 @@ public void ClaimPrize(GameObject player)
                 spawner.SpawnPrize();
 
                 // destroy this one
-                NetIdentity.ServerObjectManager.Destroy(gameObject);
+                ServerObjectManager.Destroy(gameObject);
             }
         }
     }

diff --git a/Assets/Mirror/Samples~/MultipleAdditiveScenes/Scripts/Spawner.cs b/Assets/Mirror/Samples~/MultipleAdditiveScenes/Scripts/Spawner.cs
@@ -21,7 +21,7 @@ public void SpawnPrize()
             Reward reward = newPrize.gameObject.GetComponent<Reward>();
             reward.spawner = this;
 
-            NetIdentity.ServerObjectManager.Spawn(newPrize);
+            ServerObjectManager.Spawn(newPrize);
             SceneManager.MoveGameObjectToScene(newPrize, gameObject.scene);
         }
     }

diff --git a/Assets/Mirror/Samples~/Tanks/Scripts/Projectile.cs b/Assets/Mirror/Samples~/Tanks/Scripts/Projectile.cs
@@ -33,7 +33,7 @@ void Start()
         [Server]
         void DestroySelf()
         {
-            NetIdentity.ServerObjectManager.Destroy(gameObject);
+            ServerObjectManager.Destroy(gameObject);
         }
 
         // [Server] because we don't want a warning if OnTriggerEnter is
@@ -51,7 +51,7 @@ void OnTriggerEnter(Collider co)
                 source.GetComponent<Tank>().score += damage;
             }
 
-            NetIdentity.ServerObjectManager.Destroy(gameObject);
+            ServerObjectManager.Destroy(gameObject);
         }
     }
 }
diff --git a/Assets/Mirror/Samples~/Tanks/Scripts/Tank.cs b/Assets/Mirror/Samples~/Tanks/Scripts/Tank.cs
@@ -77,7 +77,7 @@ void CmdFire()
         {
             GameObject projectile = Instantiate(projectilePrefab, projectileMount.position, transform.rotation);
             projectile.GetComponent<Projectile>().source = gameObject;
-            NetIdentity.ServerObjectManager.Spawn(projectile);
+            ServerObjectManager.Spawn(projectile);
             RpcOnFire();
         }