(e42047dc1) Tester's build, January 30th 2020

Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterNetworking.cs

@@ -2,6 +2,7 @@
 using Microsoft.Xna.Framework;
 using System;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Barotrauma
 {
@@ -264,7 +265,8 @@ namespace Barotrauma
                 {
                     case NetEntityEvent.Type.InventoryState:
                         msg.WriteRangedInteger(0, 0, 3);
-                        Inventory.SharedWrite(msg, extraData);
+                        msg.Write(GameMain.Server.EntityEventManager.Events.Last()?.ID ?? (ushort)0);
+                        Inventory.ServerWrite(msg, c);
                         break;
                     case NetEntityEvent.Type.Control:
                         msg.WriteRangedInteger(1, 0, 3);

Barotrauma/BarotraumaServer/ServerSource/GameMain.cs

@@ -347,6 +347,7 @@ namespace Barotrauma
                     Timing.Accumulator -= Timing.Step;
                 }
 
+#if !DEBUG
                 if (Server?.OwnerConnection == null && !Console.IsOutputRedirected)
                 {
                     DebugConsole.UpdateCommandLine((int)(Timing.Accumulator * 800));
@@ -355,6 +356,9 @@ namespace Barotrauma
                 {
                     DebugConsole.Clear();
                 }
+#else
+                DebugConsole.UpdateCommandLine((int)(Timing.Accumulator * 800));
+#endif
 
                 int frameTime = (int)(((double)(stopwatch.ElapsedTicks - prevTicks) / frequency) * 1000.0);
                 frameTime = Math.Max(0, frameTime);

Barotrauma/BarotraumaServer/ServerSource/Items/Components/Machines/Reactor.cs

@@ -24,10 +24,10 @@ namespace Barotrauma.Items.Components
             if (!autoTemp && AutoTemp) blameOnBroken = c;
             if (turbineOutput < targetTurbineOutput) blameOnBroken = c;
             if (fissionRate > targetFissionRate) blameOnBroken = c;
-            if (!this.shutDown && shutDown) blameOnBroken = c;
+            if (!this._powerOn && shutDown) blameOnBroken = c;
 
             AutoTemp = autoTemp;
-            this.shutDown = shutDown;
+            this._powerOn = shutDown;
             targetFissionRate = fissionRate;
             targetTurbineOutput = turbineOutput;
 
@@ -44,7 +44,7 @@ namespace Barotrauma.Items.Components
         public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
         {
             msg.Write(autoTemp);
-            msg.Write(shutDown);
+            msg.Write(_powerOn);
             msg.WriteRangedSingle(temperature, 0.0f, 100.0f, 8);
             msg.WriteRangedSingle(targetFissionRate, 0.0f, 100.0f, 8);
             msg.WriteRangedSingle(targetTurbineOutput, 0.0f, 100.0f, 8);

Barotrauma/BarotraumaServer/ServerSource/Items/Item.cs

@@ -75,6 +75,7 @@ namespace Barotrauma
                         break;
                     }
                     msg.WriteRangedInteger(containerIndex, 0, components.Count - 1);
+                    msg.Write(GameMain.Server.EntityEventManager.Events.Last()?.ID ?? (ushort)0);
                     (components[containerIndex] as ItemContainer).Inventory.ServerWrite(msg, c);
                     break;
                 case NetEntityEvent.Type.Status:

Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs

@@ -765,6 +765,11 @@ namespace Barotrauma.Networking
 
         private void WriteEventErrorData(Client client, string errorStr)
         {
+            if (!Directory.Exists(ServerLog.SavePath))
+            {
+                Directory.CreateDirectory(ServerLog.SavePath);
+            }
+
             string filePath = "event_error_log_server_" + client.Name + "_" + ToolBox.RemoveInvalidFileNameChars(DateTime.UtcNow.ToShortTimeString() + ".log");
             filePath = Path.Combine(ServerLog.SavePath, filePath);
             if (File.Exists(filePath)) { return; }
@@ -774,6 +779,19 @@ namespace Barotrauma.Networking
                 errorStr, ""
             };
 
+            if (GameMain.GameSession?.GameMode != null)
+            {
+                errorLines.Add("Game mode: " + GameMain.GameSession.GameMode.Name);
+            }
+            if (GameMain.GameSession?.Submarine != null)
+            {
+                errorLines.Add("Submarine: " + GameMain.GameSession.Submarine.Name);
+            }
+            if (Level.Loaded != null)
+            {
+                errorLines.Add("Level: " + Level.Loaded.Seed + ", " + Level.Loaded.EqualityCheckVal);
+            }
+
             errorLines.Add("Entity IDs:");
             List<Entity> sortedEntities = Entity.GetEntityList();
             sortedEntities.Sort((e1, e2) => e1.ID.CompareTo(e2.ID));
@@ -797,6 +815,13 @@ namespace Barotrauma.Networking
                 }
             }
 
+            errorLines.Add("");
+            errorLines.Add("Last debug messages:");
+            for (int i = DebugConsole.Messages.Count - 1; i > 0 && i > DebugConsole.Messages.Count - 15; i--)
+            {
+                errorLines.Add("   " + DebugConsole.Messages[i].Time + " - " + DebugConsole.Messages[i].Text);
+            }
+
             File.WriteAllLines(filePath, errorLines);
         }
 

Barotrauma/BarotraumaServer/ServerSource/Networking/Primitives/Peers/Server/LidgrenServerPeer.cs

@@ -67,7 +67,7 @@ namespace Barotrauma.Networking
             {
                 AcceptIncomingConnections = true,
                 AutoExpandMTU = false,
-                MaximumConnections = serverSettings.MaxPlayers * 2,
+                MaximumConnections = NetConfig.MaxPlayers * 2,
                 EnableUPnP = serverSettings.EnableUPnP,
                 Port = serverSettings.Port
             };
@@ -80,7 +80,7 @@ namespace Barotrauma.Networking
             netPeerConfiguration.EnableMessageType(NetIncomingMessageType.ConnectionApproval);
 
             netServer = new NetServer(netPeerConfiguration);
-            
+
             netServer.Start();
 
             if (serverSettings.EnableUPnP)

Barotrauma/BarotraumaServer/ServerSource/Networking/ServerSettings.cs

@@ -48,7 +48,7 @@ namespace Barotrauma.Networking
             outMsg.Write(ServerMessageText);
             outMsg.Write((byte)MaxPlayers);
             outMsg.Write(HasPassword);
-            outMsg.Write(isPublic);
+            outMsg.Write(IsPublic);
             outMsg.WritePadBits();
             outMsg.WriteRangedInteger(TickRate, 1, 60);
 
@@ -186,12 +186,11 @@ namespace Barotrauma.Networking
             SerializableProperty.SerializeProperties(this, doc.Root, true);
 
             doc.Root.SetAttributeValue("name", ServerName);
-            doc.Root.SetAttributeValue("public", isPublic);
+            doc.Root.SetAttributeValue("public", IsPublic);
             doc.Root.SetAttributeValue("port", Port);
 #if USE_STEAM
             doc.Root.SetAttributeValue("queryport", QueryPort);
 #endif
-            doc.Root.SetAttributeValue("maxplayers", maxPlayers);
             doc.Root.SetAttributeValue("enableupnp", EnableUPnP);
 
             doc.Root.SetAttributeValue("autorestart", autoRestart);

Barotrauma/BarotraumaServer/ServerSource/Program.cs

@@ -25,20 +25,19 @@ namespace Barotrauma
         {
             GameMain game = null;
 
-#if !DEBUG || TRUE
+#if !DEBUG
             try
             {
 #endif
-
                 Console.WriteLine("Barotrauma Dedicated Server " + GameMain.Version +
                     " (" + AssemblyInfo.GetBuildString() + ", branch " + AssemblyInfo.GetGitBranch() + ", revision " + AssemblyInfo.GetGitRevision() + ")");
 
                 game = new GameMain(args);
 
                 game.Run();
-                if (GameSettings.SendUserStatistics) GameAnalytics.OnQuit();
+                if (GameSettings.SendUserStatistics) { GameAnalytics.OnQuit(); }
                 SteamManager.ShutDown();
-#if !DEBUG || TRUE
+#if !DEBUG
             }
             catch (Exception e)
             {