(3a5d98b) v0.9.6.0

2019-12-17 14:38:24 +01:00
parent 5c95c53118
commit a3569b8bf0
95 changed files with 1579 additions and 728 deletions
@@ -107,11 +107,14 @@ namespace Barotrauma
        {
            public readonly Entity Entity;

+            public readonly UInt16 OriginalID;
+
            public readonly bool Remove = false;

            public SpawnOrRemove(Entity entity, bool remove)
            {
                Entity = entity;
+                OriginalID = entity.ID;
                Remove = remove;
            }
        }
@@ -328,7 +328,16 @@ namespace Barotrauma.Networking
            }
        }

-        public string ServerName;
+        private string serverName;
+        public string ServerName
+        {
+            get { return serverName; }
+            set
+            {
+                serverName = value;
+                if (serverName.Length > NetConfig.ServerNameMaxLength) { ServerName = ServerName.Substring(0, NetConfig.ServerNameMaxLength); }
+            }
+        }

        private string serverMessageText;
        public string ServerMessageText