(24d02be32) Revert 8e2e2526 ("Spawn multiple monsters using the same spatial and temporal spreading logic as in events". Caused entity IDs to often differ between the server and clients in monster missions, leading to all sorts of syncing issues (the most frequent being IndexOutOfRange exceptions when attempting to read data for an incorrect entity).

2019-05-16 07:02:02 +03:00
parent d72187bbd0
commit 761726c9b1
10 changed files with 75 additions and 195 deletions
@@ -89,6 +89,21 @@ namespace Barotrauma
            }
        }

+        public override void Update(float deltaTime)
+        {
+            if (objectiveManager.CurrentObjective == this)
+            {
+                if (randomTimer > 0)
+                {
+                    randomTimer -= deltaTime;
+                }
+                else
+                {
+                    SetRandom();
+                }
+            }
+        }
+
        public override bool IsCompleted() => false;
        public override bool CanBeCompleted => true;

@@ -945,6 +945,10 @@ namespace Barotrauma
                    {
                        isCompleted = true;
                    }
+                    if (component.AIOperate(deltaTime, character, this))
+                    {
+                        isCompleted = true;
+                    }
                }
                else
                {
@@ -1145,24 +1145,6 @@ namespace Barotrauma
                SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
            }
            
-            if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
-            {
-                //apply some smoothing to the cursor positions of remote players when playing as a client
-                //to make aiming look a little less choppy
-                Vector2 smoothedCursorDiff = cursorPosition - SmoothedCursorPosition;
-                smoothedCursorDiff = NetConfig.InterpolateCursorPositionError(smoothedCursorDiff);
-                SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
-            }
-            
-            if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
-            {
-                //apply some smoothing to the cursor positions of remote players when playing as a client
-                //to make aiming look a little less choppy
-                Vector2 smoothedCursorDiff = cursorPosition - SmoothedCursorPosition;
-                smoothedCursorDiff = NetConfig.InterpolateCursorPositionError(smoothedCursorDiff);
-                SmoothedCursorPosition = cursorPosition - smoothedCursorDiff;
-            }
-            
            if (!(this is AICharacter) || Controlled == this || IsRemotePlayer)
            {
                if (speedMultipliers.Count == 0) return 1f;