Merge branch 'master' of https://github.com/Regalis11/Barotrauma into develop

2023-05-10 11:55:46 -03:00
parent 768a1f309c 235d42b34f
commit 2c45c3d020
273 changed files with 5739 additions and 2421 deletions
@@ -43,6 +43,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]
@@ -692,6 +697,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
        {