Unstable v0.19.1.0

2022-08-19 13:59:08 -03:00
parent 6b55adcdd9
commit 1219615d64
192 changed files with 3875 additions and 2648 deletions
@@ -37,7 +37,7 @@ namespace Barotrauma.Steam
                });
        }

-        internal static void SubscribeToServerMods(IEnumerable<UInt64> missingIds, string rejoinEndpoint, ulong rejoinLobby, string rejoinServerName)
+        internal static void SubscribeToServerMods(IEnumerable<UInt64> missingIds, ConnectCommand rejoinCommand)
        {
            CloseAllMessageBoxes();
            GUIMessageBox msgBox = new GUIMessageBox(headerText: "", text: TextManager.Get("PreparingWorkshopDownloads"),
@@ -59,9 +59,7 @@ namespace Barotrauma.Steam
                    InitiateDownloads(items, onComplete: () =>
                    {
                        ContentPackageManager.UpdateContentPackageList();
-                        GameMain.Instance.ConnectEndpoint = rejoinEndpoint;
-                        GameMain.Instance.ConnectLobby = rejoinLobby;
-                        GameMain.Instance.ConnectName = rejoinServerName;
+                        GameMain.Instance.ConnectCommand = Option<ConnectCommand>.Some(rejoinCommand);
                    });
                });
        }