Unstable 0.1300.0.10

2021-04-16 15:51:16 +03:00
parent f48dfb5862
commit 245b48c3a3
29 changed files with 289 additions and 84 deletions
@@ -3288,9 +3288,12 @@ namespace Barotrauma.Networking
            if (respawnManager != null)
            {
                string respawnText = string.Empty;
-                float textScale = 1.0f;
                Color textColor = Color.White;
-                bool canChooseRespawn = GameMain.GameSession.GameMode is CampaignMode && Character.Controlled == null && Level.Loaded?.Type != LevelData.LevelType.Outpost;
+                bool canChooseRespawn = 
+                    GameMain.GameSession.GameMode is CampaignMode && 
+                    Character.Controlled == null && 
+                    Level.Loaded?.Type != LevelData.LevelType.Outpost &&
+                    (characterInfo == null || HasSpawned);
                if (respawnManager.CurrentState == RespawnManager.State.Waiting &&
                    respawnManager.RespawnCountdownStarted)
                {