v0.10.5.1

2020-09-22 11:31:56 -03:00
parent 44032d0ae0
commit 0002ad2c50
343 changed files with 12276 additions and 5023 deletions
@@ -90,6 +90,19 @@ namespace Barotrauma
                    yield return CoroutineStatus.Success;
                }

+                //switched control to some other character during the transition -> remove control again
+                if (Character.Controlled != null)
+                {
+                    prevControlled = Character.Controlled;
+                    if (RemoveControlFromCharacter)
+                    {
+#if CLIENT
+                        GameMain.LightManager.LosEnabled = false;
+#endif
+                        Character.Controlled = null;
+                    }
+                }
+
                if (prevControlled != null && prevControlled.Removed)
                {
                    prevControlled = null;