(99feac023) Unstable 0.9.704.0

Barotrauma/BarotraumaServer/ServerSource/Characters/CharacterNetworking.cs

@@ -394,7 +394,7 @@ namespace Barotrauma
 
                 tempBuffer.WritePadBits();
 
-                msg.Write((byte)tempBuffer.LengthBytes);
+                msg.WriteVariableUInt32((uint)tempBuffer.LengthBytes);
                 msg.Write(tempBuffer.Buffer, 0, tempBuffer.LengthBytes);
             }
         }

Barotrauma/BarotraumaServer/ServerSource/DebugConsole.cs

@@ -439,7 +439,7 @@ namespace Barotrauma
                     client.GivePermission(permission);
                     GameMain.Server.UpdateClientPermissions(client);
                     NewMessage("Granted " + perm + " permissions to " + client.Name + ".", Color.White);
-                }, args, 2);
+                }, args, 1);
             });
 
             AssignOnExecute("revokeperm", (string[] args) =>
@@ -474,7 +474,7 @@ namespace Barotrauma
                     client.RemovePermission(permission);
                     GameMain.Server.UpdateClientPermissions(client);
                     NewMessage("Revoked " + perm + " permissions from " + client.Name + ".", Color.White);
-                }, args, 2);
+                }, args, 1);
             });
 
             AssignOnExecute("giverank", (string[] args) =>
@@ -511,7 +511,7 @@ namespace Barotrauma
                     client.SetPermissions(preset.Permissions, preset.PermittedCommands);
                     GameMain.Server.UpdateClientPermissions(client);
                     NewMessage("Assigned the rank \"" + preset.Name + "\" to " + client.Name + ".", Color.White);
-                }, args, 2);
+                }, args, 1);
             });
 
             AssignOnExecute("givecommandperm", (string[] args) =>
@@ -552,7 +552,7 @@ namespace Barotrauma
                     client.SetPermissions(client.Permissions, client.PermittedConsoleCommands.Union(grantedCommands).Distinct().ToList());
                     GameMain.Server.UpdateClientPermissions(client);
                     NewMessage("Gave the client \"" + client.Name + "\" the permission to use console commands " + string.Join(", ", grantedCommands.Select(c => c.names[0])) + ".", Color.White);
-                }, args, 2);
+                }, args, 1);
             });
 
             AssignOnExecute("revokecommandperm", (string[] args) =>
@@ -592,7 +592,7 @@ namespace Barotrauma
                     client.SetPermissions(client.Permissions, client.PermittedConsoleCommands.Except(revokedCommands).ToList());
                     GameMain.Server.UpdateClientPermissions(client);
                     NewMessage("Revoked \"" + client.Name + "\"'s permission to use the console commands " + string.Join(", ", revokedCommands.Select(c => c.names[0])) + ".", Color.White);
-                }, args, 2);
+                }, args, 1);
             });
 
             AssignOnExecute("showperm", (string[] args) =>

Barotrauma/BarotraumaServer/ServerSource/Events/Missions/CargoMission.cs

@@ -0,0 +1,16 @@
+using Barotrauma.Networking;
+
+namespace Barotrauma
+{
+    partial class CargoMission : Mission
+    {
+        public override void ServerWriteInitial(IWriteMessage msg, Client c)
+        {
+            msg.Write((ushort)items.Count);
+            foreach (Item item in items)
+            {
+                item.WriteSpawnData(msg, item.ID);
+            }
+        }
+    }
+}

Barotrauma/BarotraumaServer/ServerSource/Events/Missions/CombatMission.cs

@@ -109,5 +109,10 @@ namespace Barotrauma
                 }
             }
         }
+
+        public override void ServerWriteInitial(IWriteMessage msg, Client c)
+        {
+            //do nothing
+        }
     }
 }

Barotrauma/BarotraumaServer/ServerSource/Events/Missions/Mission.cs

@@ -13,5 +13,7 @@ namespace Barotrauma
 
             GameServer.Log(TextManager.Get("MissionInfo") + ": " + header + " - " + message, ServerLog.MessageType.ServerMessage);
         }
+
+        public abstract void ServerWriteInitial(IWriteMessage msg, Client c);
     }
 }

Barotrauma/BarotraumaServer/ServerSource/Events/Missions/MonsterMission.cs

@@ -0,0 +1,22 @@
+using Barotrauma.Networking;
+using System;
+
+namespace Barotrauma
+{
+    partial class MonsterMission : Mission
+    {
+        public override void ServerWriteInitial(IWriteMessage msg, Client c)
+        {
+            if (monsters.Count == 0 && monsterFiles.Count > 0)
+            {
+                throw new InvalidOperationException("Server attempted to write monster mission data when no monsters had been spawned.");
+            }
+
+            msg.Write((byte)monsters.Count);
+            foreach (Character monster in monsters)
+            {
+                monster.WriteSpawnData(msg, monster.ID);
+            }
+        }
+    }
+}

Barotrauma/BarotraumaServer/ServerSource/Events/Missions/SalvageMission.cs

@@ -0,0 +1,12 @@
+using Barotrauma.Networking;
+
+namespace Barotrauma
+{
+    partial class SalvageMission : Mission    
+    {
+        public override void ServerWriteInitial(IWriteMessage msg, Client c)
+        {
+            item.WriteSpawnData(msg, item.ID);
+        }
+    }
+}

Barotrauma/BarotraumaServer/ServerSource/GameSession/GameModes/MultiPlayerCampaign.cs

@@ -273,10 +273,8 @@ namespace Barotrauma
             }
 
             Map.SelectLocation(selectedLocIndex == UInt16.MaxValue ? -1 : selectedLocIndex);
-            if (Map.SelectedConnection != null)
-            {
-                Map.SelectMission(selectedMissionIndex);
-            }
+            if (Map.SelectedLocation == null) { Map.SelectRandomLocation(preferUndiscovered: true); }
+            if (Map.SelectedConnection != null) { Map.SelectMission(selectedMissionIndex); }
 
             List<PurchasedItem> currentItems = new List<PurchasedItem>(CargoManager.PurchasedItems);
             foreach (PurchasedItem pi in currentItems)

Barotrauma/BarotraumaServer/ServerSource/Items/Item.cs

@@ -345,7 +345,7 @@ namespace Barotrauma
 
             IWriteMessage tempBuffer = new WriteOnlyMessage();
             body.ServerWrite(tempBuffer, c, extraData);
-            msg.Write((byte)tempBuffer.LengthBytes);
+            msg.WriteVariableUInt32((uint)tempBuffer.LengthBytes);
             msg.Write(tempBuffer.Buffer, 0, tempBuffer.LengthBytes);
             msg.WritePadBits();
         }

Barotrauma/BarotraumaServer/ServerSource/Networking/GameServer.cs

@@ -1783,6 +1783,17 @@ namespace Barotrauma.Networking
 
             if (campaign != null)
             {
+                if (campaign.Map == null)
+                {
+                    throw new Exception("Campaign map was null.");
+                }
+                if (campaign.Map.SelectedConnection == null)
+                {
+                    //this should not happen, there should always be some destination selected
+                    DebugConsole.ThrowError("No connection between locations was selected when starting the round. Choosing a random location...");
+                    campaign.Map.SelectRandomLocation(preferUndiscovered: true);
+                }
+
                 GameMain.GameSession.StartRound(campaign.Map.SelectedConnection.Level,
                     reloadSub: true,
                     loadSecondSub: teamCount > 1,
@@ -2007,6 +2018,8 @@ namespace Barotrauma.Networking
 
             serverSettings.WriteMonsterEnabled(msg);
 
+            GameMain.GameSession.Mission?.ServerWriteInitial(msg, client);
+
             serverPeer.Send(msg, client.Connection, DeliveryMethod.Reliable);
         }
 

Barotrauma/BarotraumaServer/ServerSource/Networking/NetEntityEvent/ServerEntityEventManager.cs

@@ -20,6 +20,11 @@ namespace Barotrauma.Networking
             get { return createTime; }
         }
 
+        public void ResetCreateTime()
+        {
+            createTime = Timing.TotalTime;
+        }
+
         public ServerEntityEvent(IServerSerializable serializableEntity, UInt16 id)
             : base(serializableEntity, id)
         {
@@ -223,6 +228,7 @@ namespace Barotrauma.Networking
                 {
                     lastWarningTime = Timing.TotalTime;
                     GameServer.Log("WARNING: ServerEntityEventManager is lagging behind! Last sent id: " + lastSentToAnyone.ToString() + ", latest create id: " + ID.ToString(), ServerLog.MessageType.ServerMessage);
+                    events.ForEach(e => e.ResetCreateTime());
                     //TODO: reset clients if this happens, maybe do it if a majority are behind rather than all of them?
                 }
                 

Barotrauma/BarotraumaServer/ServerSource/Networking/ServerSettings.cs

@@ -175,6 +175,7 @@ namespace Barotrauma.Networking
                     GameMain.NetworkMember?.KarmaManager?.SaveCustomPreset();
                     GameMain.NetworkMember?.KarmaManager?.Save();
                 }
+                SaveSettings();
                 GameMain.NetLobbyScreen.LastUpdateID++;
             }
         }