Merge branch 'main' of https://github.com/jimdroberts/FishMMO

Vitalii2612 · May 18, 2023 · 2beb1b0 · 2beb1b0
2 parents 728454d + ad175ef
commit 2beb1b0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 6 deletions.
diff --git a/FishMMO/Assets/FishNet/Runtime/Managing/Object/ManagedObjects.cs b/FishMMO/Assets/FishNet/Runtime/Managing/Object/ManagedObjects.cs
@@ -133,7 +133,7 @@ internal virtual void Despawn(NetworkObject nob, DespawnType despawnType, bool a
                         /* If client-host has visibility
                          * then disable and wait for client-host to get destroy
                          * message. Otherwise destroy immediately. */
-                        if (nob.Observers.Contains(NetworkManager.ClientManager.Connection))
+                        if (NetworkManager.IsHost && nob.Observers.Contains(NetworkManager.ClientManager.Connection))
                             NetworkManager.ServerManager.Objects.AddToPending(nob);
                         else
                             destroy = true;

diff --git a/FishMMO/Assets/FishNet/Runtime/Object/NetworkObject.cs b/FishMMO/Assets/FishNet/Runtime/Object/NetworkObject.cs
@@ -667,7 +667,8 @@ internal void Deinitialize(bool asServer)
 
             if (asServer)
             {
-                IsDeinitializing = true;
+				NetworkObserver?.Deinitialize(false);
+				IsDeinitializing = true;
             }
             else
             {

diff --git a/FishMMO/Assets/FishNet/Runtime/Observing/NetworkObserver.cs b/FishMMO/Assets/FishNet/Runtime/Observing/NetworkObserver.cs
@@ -177,13 +177,13 @@ internal void Initialize(NetworkObject networkObject)
                     {
                         observerFound = true;
 
-                        /* Make an instance of each condition so values are
+						/* Make an instance of each condition so values are
                          * not overwritten when the condition exist more than
                          * once in the scene. Double edged sword of using scriptable
                          * objects for conditions. */
-                        _observerConditions[i] = _observerConditions[i].Clone();
-                        ObserverCondition oc = _observerConditions[i];
-                        oc.Initialize(_networkObject);
+						ObserverCondition oc = _observerConditions[i].Clone();
+						_observerConditions[i] = oc;
+
                         //If timed also register as containing timed conditions.
                         if (oc.Timed())
                             _timedConditions.Add(oc);
@@ -200,6 +200,11 @@ internal void Initialize(NetworkObject networkObject)
                     return;
             }
 
+            for (int i = 0; i < _observerConditions.Count; i++)
+            {
+                _observerConditions[i].Initialize(networkObject);
+			}
+
 
             RegisterTimedConditions();
         }

diff --git a/.../Assets/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta b/.../Assets/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/LiteNetLib.csproj.meta