using NetworkObjectReference for held object

Author: fernando-cortez

Assets/Scripts/Gameplay/Action/PickUpAction.cs

@@ -38,8 +38,7 @@ public PickUpAction(ServerCharacter parent, ref ActionRequestData data) : base(p
         public override bool Start()
         {
             // play animation based on if a heavy object is already held and start timer
-            if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.TryGetValue(m_NetworkPickUpState.heldObject.Value,
-                    out var heldObject))
+            if (m_NetworkPickUpState.heldNetworkObjectReference.TryGet(out var heldObject))
             {
                 Data.TargetIds = null;
 
@@ -75,11 +74,10 @@ public override bool Start()
 
         void PickUpOrDrop()
         {
-            if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.TryGetValue(m_NetworkPickUpState.heldObject.Value,
-                    out var heldObject))
+            if (m_NetworkPickUpState.heldNetworkObjectReference.TryGet(out var heldObject))
             {
                 // pickup object found inside of hierarchy; drop it
-                m_NetworkPickUpState.heldObject.Value = 0;
+                m_NetworkPickUpState.heldNetworkObjectReference = default;
                 heldObject.transform.SetParent(null);
                 return;
             }
@@ -116,7 +114,7 @@ void PickUpOrDrop()
                 return;
             }
 
-            m_NetworkPickUpState.heldObject.Value = heavyNetworkObject.NetworkObjectId;
+            m_NetworkPickUpState.heldNetworkObjectReference = heavyNetworkObject;
 
             Data.TargetIds = new ulong[] { heavyNetworkObject.NetworkObjectId };
 

Assets/Scripts/Gameplay/GameplayObjects/NetworkPickUpState.cs

@@ -5,6 +5,6 @@ namespace Unity.Multiplayer.Samples.BossRoom
 {
     public class NetworkPickUpState : NetworkBehaviour
     {
-        public NetworkVariable<ulong> heldObject;
+        public NetworkObjectReference heldNetworkObjectReference;
     }
 }

Assets/Scripts/Gameplay/GameplayObjects/ServerDropItemOnFaint.cs

@@ -32,9 +32,9 @@ void OnValueChanged(LifeState previousValue, LifeState newValue)
         {
             if (newValue == LifeState.Fainted)
             {
-                if (NetworkManager.Singleton.SpawnManager.SpawnedObjects.TryGetValue(m_NetworkPickUpState.heldObject.Value, out var heavyNetworkObject))
+                if (m_NetworkPickUpState.heldNetworkObjectReference.TryGet(out var heavyNetworkObject))
                 {
-                    m_NetworkPickUpState.heldObject.Value = 0;
+                    m_NetworkPickUpState.heldNetworkObjectReference = default;
                     heavyNetworkObject.transform.SetParent(null);
                 }
             }