Unstable 0.1300.0.5

2021-04-01 16:09:18 +03:00
parent 862221635c
commit 96b2184811
54 changed files with 429 additions and 122 deletions
@@ -126,6 +126,8 @@ namespace Barotrauma.Networking

        public void ClientRead(IReadMessage incMsg)
        {
+            cachedServerListInfo = null;
+
            ServerName = incMsg.ReadString();
            ServerMessageText = incMsg.ReadString();
            MaxPlayers = incMsg.ReadByte();
@@ -928,6 +930,7 @@ namespace Barotrauma.Networking

        public bool ToggleSettingsFrame(GUIButton button, object obj)
        {
+            if (GameMain.NetworkMember == null) { return false; }
            if (settingsFrame == null)
            {
                CreateSettingsFrame();
@@ -949,5 +952,12 @@ namespace Barotrauma.Networking

            return false;
        }
+
+        private ServerInfo cachedServerListInfo = null;
+        public ServerInfo GetServerListInfo()
+        {
+            cachedServerListInfo ??= GameMain.ServerListScreen.UpdateServerInfoWithServerSettings(GameMain.Client.ClientPeer.ServerConnection, this);
+            return cachedServerListInfo;
+        }
    }
 }