(5d67aa3f5) Merge remote-tracking branch 'origin/dev' into enemy-ai

2019-03-25 19:50:58 +02:00
parent 1fa94dd2b9
commit 965a378f0e
9 changed files with 78 additions and 72 deletions
@@ -432,12 +432,16 @@ namespace Barotrauma
            {
                if (ForceFluctuationStrength > 0.0f)
                {
-                    forceFluctuationTimer += deltaTime;
-                    if (forceFluctuationTimer > ForceFluctuationInterval)
+                    //no need for force fluctuation (or network updates) if the trigger limits velocity and there are no triggerers
+                    if (forceMode != TriggerForceMode.LimitVelocity || triggerers.Any())
                    {
-                        NeedsNetworkSyncing = true;
-                        currentForceFluctuation = Rand.Range(1.0f - ForceFluctuationStrength, 1.0f);
-                        forceFluctuationTimer = 0.0f;
+                        forceFluctuationTimer += deltaTime;
+                        if (forceFluctuationTimer > ForceFluctuationInterval)
+                        {
+                            NeedsNetworkSyncing = true;
+                            currentForceFluctuation = Rand.Range(1.0f - ForceFluctuationStrength, 1.0f);
+                            forceFluctuationTimer = 0.0f;
+                        }
                    }
                }