Unstable 0.1400.7.0 (Coronavirus edition)

2021-07-23 21:01:17 +03:00
parent ee5308b39f
commit 47707c824a
133 changed files with 1310 additions and 533 deletions
@@ -942,6 +942,7 @@ namespace Barotrauma.MapCreatures.Behavior

            Anger += 0.01f;

+            bool wasRemoved = branch.Removed;
            Branches.Remove(branch);
            branch.Removed = true;

@@ -986,9 +987,11 @@ namespace Barotrauma.MapCreatures.Behavior
                Kill();
                return;
            }
-
 #if SERVER
-            SendNetworkMessage(this, NetworkHeader.BranchRemove, branch);
+            if (!wasRemoved)
+            {
+                SendNetworkMessage(this, NetworkHeader.BranchRemove, branch);
+            }
 #endif
        }