v1.0.13.1 (first post-1.0 patch)

Barotrauma/BarotraumaShared/SharedSource/Networking/Client.cs

@@ -87,6 +87,7 @@ namespace Barotrauma.Networking
                 if (character != null)
                 {
                     HasSpawned = true;
+                    UsingFreeCam = false;
 #if CLIENT
                     GameMain.GameSession?.CrewManager?.SetPlayerVoiceIconState(this, muted, mutedLocally);
 
@@ -100,6 +101,11 @@ namespace Barotrauma.Networking
             }
         }
 
+        /// <summary>
+        /// Is the client using the 'freecam' console command?
+        /// </summary>
+        public bool UsingFreeCam;
+
         public UInt16 CharacterID;
 
         private Vector2 spectatePos;

Barotrauma/BarotraumaShared/SharedSource/Networking/ClientPermissions.cs

@@ -28,28 +28,30 @@ namespace Barotrauma.Networking
         ManageMap = 0x8000,
         ManageHires = 0x10000,
         ManageBotTalents = 0x20000,
-        All = 0x3FFFF
+        SpamImmunity = 0x40000,
+        All = 0x7FFFF
     }
 
     class PermissionPreset
     {
         public static readonly List<PermissionPreset> List = new List<PermissionPreset>();
-        
-        public readonly LocalizedString Name;
+
+        public readonly Identifier Identifier;
+        public readonly LocalizedString DisplayName;
         public readonly LocalizedString Description;
         public readonly ClientPermissions Permissions;
         public readonly HashSet<DebugConsole.Command> PermittedCommands;
         
         public PermissionPreset(XElement element)
         {
-            string name = element.GetAttributeString("name", "");
-            Name = TextManager.Get("permissionpresetname." + name).Fallback(name);
-            Description = TextManager.Get("permissionpresetdescription." + name) .Fallback(element.GetAttributeString("description", ""));
+            Identifier = element.GetAttributeIdentifier("name", Identifier.Empty);
+            DisplayName = TextManager.Get("permissionpresetname." + Identifier).Fallback(Identifier.ToString());
+            Description = TextManager.Get("permissionpresetdescription." + Identifier) .Fallback(element.GetAttributeString("description", ""));
 
             string permissionsStr = element.GetAttributeString("permissions", "");
             if (!Enum.TryParse(permissionsStr, out Permissions))
             {
-                DebugConsole.ThrowError("Error in permission preset \"" + Name + "\" - " + permissionsStr + " is not a valid permission!");
+                DebugConsole.ThrowError("Error in permission preset \"" + DisplayName + "\" - " + permissionsStr + " is not a valid permission!");
             }
 
             PermittedCommands = new HashSet<DebugConsole.Command>();
@@ -64,7 +66,7 @@ namespace Barotrauma.Networking
                     if (command == null)
                     {
 #if SERVER
-                        DebugConsole.ThrowError("Error in permission preset \"" + Name + "\" - " + commandName + "\" is not a valid console command.");
+                        DebugConsole.ThrowError("Error in permission preset \"" + DisplayName + "\" - " + commandName + "\" is not a valid console command.");
 #endif
                         continue;
                     }

Barotrauma/BarotraumaShared/SharedSource/Networking/ServerLog.cs

@@ -39,6 +39,7 @@ namespace Barotrauma.Networking
             ServerMessage,
             ConsoleUsage,
             Money,
+            DoSProtection,
             Karma,
             Talent,
             Error,
@@ -55,6 +56,7 @@ namespace Barotrauma.Networking
             { MessageType.ServerMessage, new Color(157, 225, 160) },
             { MessageType.ConsoleUsage, new Color(0, 162, 232) },
             { MessageType.Money, Color.Green },
+            { MessageType.DoSProtection, Color.OrangeRed },
             { MessageType.Karma, new Color(75, 88, 255) },
             { MessageType.Talent, new Color(125, 125, 255) },
             { MessageType.Error, Color.Red }
@@ -71,6 +73,7 @@ namespace Barotrauma.Networking
             { MessageType.ServerMessage, "ServerMessage" },
             { MessageType.ConsoleUsage, "ConsoleUsage" },
             { MessageType.Money, "Money" },
+            { MessageType.DoSProtection, "DoSProtection" },
             { MessageType.Karma, "Karma" },
             { MessageType.Talent, "Talent" },
             { MessageType.Error, "Error" }

Barotrauma/BarotraumaShared/SharedSource/Networking/ServerSettings.cs

@@ -42,6 +42,11 @@ namespace Barotrauma.Networking
 
     partial class ServerSettings : ISerializableEntity
     {
+        public const int PacketLimitMin = 1200,
+                         PacketLimitWarning = 2400,
+                         PacketLimitDefault = 3000,
+                         PacketLimitMax = 10000;
+
         public const string SettingsFile = "serversettings.xml";
 
         [Flags]
@@ -688,6 +693,20 @@ namespace Barotrauma.Networking
             private set;
         }
 
+        [Serialize(true, IsPropertySaveable.Yes)]
+        public bool EnableDoSProtection
+        {
+            get;
+            private set;
+        }
+
+        [Serialize(PacketLimitDefault, IsPropertySaveable.Yes)]
+        public int MaxPacketAmount
+        {
+            get;
+            private set;
+        }
+
         [Serialize("", IsPropertySaveable.Yes)]
         public string SelectedSubmarine
         {