From 4041633eec67cef78e581fe0a634ad6e50b36823 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Mon, 23 Jul 2018 18:33:32 +0300
Subject: [PATCH] Clamping velocity when correcting submarine position

---
 Barotrauma/BarotraumaShared/Source/Map/SubmarineBody.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Barotrauma/BarotraumaShared/Source/Map/SubmarineBody.cs b/Barotrauma/BarotraumaShared/Source/Map/SubmarineBody.cs
index bdf43b42e..09f9e7a30 100644
--- a/Barotrauma/BarotraumaShared/Source/Map/SubmarineBody.cs
+++ b/Barotrauma/BarotraumaShared/Source/Map/SubmarineBody.cs
@@ -190,6 +190,11 @@ namespace Barotrauma
 
                 Body.CorrectPosition(memPos, deltaTime, out newVelocity, out newPosition);
                 Vector2 moveAmount = ConvertUnits.ToDisplayUnits(newPosition - Body.SimPosition);
+                newVelocity = newVelocity.ClampLength(100.0f);
+                if (!MathUtils.IsValid(newVelocity))
+                {
+                    return;
+                }
 
                 List<Submarine> subsToMove = submarine.GetConnectedSubs();
                 foreach (Submarine dockedSub in subsToMove)