OBT/1.2.0(Spring Update)

Sync with Upstream

Barotrauma/BarotraumaClient/ClientSource/Networking/GameClient.cs

@@ -1,6 +1,7 @@
 using Barotrauma.Extensions;
 using Barotrauma.IO;
 using Barotrauma.Items.Components;
+using Barotrauma.LuaCs.Events;
 using Barotrauma.Steam;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Input;
@@ -603,8 +604,6 @@ namespace Barotrauma.Networking
         {
             ServerPacketHeader header = (ServerPacketHeader)inc.ReadByte();
 
-            GameMain.LuaCs.Networking.NetMessageReceived(inc, header);
-
             if (roundInitStatus == RoundInitStatus.WaitingForStartGameFinalize
                 && header is not (
                     ServerPacketHeader.STARTGAMEFINALIZE
@@ -2905,8 +2904,6 @@ namespace Barotrauma.Networking
 
         public void Quit()
         {
-            GameMain.LuaCs.Stop();
-            
             ClientPeer?.Close(PeerDisconnectPacket.WithReason(DisconnectReason.Disconnected));
             
             GUIMessageBox.MessageBoxes.RemoveAll(c => c?.UserData is RoundSummary);
@@ -3006,7 +3003,8 @@ namespace Barotrauma.Networking
 
         public override void AddChatMessage(ChatMessage message)
         {
-            var should = GameMain.LuaCs.Hook.Call<bool?>("chatMessage", message.Text, message.SenderClient, message.Type, message);
+            bool? should = null;
+            LuaCsSetup.Instance.EventService.PublishEvent<IEventChatMessage>(x => should = x.OnChatMessage(message.Text, message.SenderClient, message.Type, message) ?? should);
             if (should != null && should.Value) { return; }
 
             if (string.IsNullOrEmpty(message.Text)) { return; }

Barotrauma/BarotraumaClient/ClientSource/Networking/Primitives/Peers/LidgrenClientPeer.cs

@@ -30,6 +30,13 @@ namespace Barotrauma.Networking
             {
                 DualStack = GameSettings.CurrentConfig.UseDualModeSockets
             };
+            if (NetConfig.UseLenientHandshake)
+            {
+                // More lenient timeouts for local testing, so the server would start even without perfect conditions
+                netPeerConfiguration.ConnectionTimeout = 60.0f;
+                netPeerConfiguration.ResendHandshakeInterval = 5.0f;
+                netPeerConfiguration.MaximumHandshakeAttempts = 20;
+            }
             if (endpoint.NetEndpoint.Address.AddressFamily == AddressFamily.InterNetworkV6)
             {
                 netPeerConfiguration.LocalAddress = System.Net.IPAddress.IPv6Any;