(98ad00fa2) v0.9.1.0

Barotrauma/BarotraumaShared/Source/Networking/NetConfig.cs

@@ -10,6 +10,8 @@ namespace Barotrauma.Networking
 
         public const int MaxPlayers = 16;
 
+        public const int ServerNameMaxLength = 60;
+
         public static string MasterServerUrl = GameMain.Config.MasterServerUrl;
 
         //if a Character is further than this from the sub and the players, the server will disable it

Barotrauma/BarotraumaShared/Source/Networking/NetEntityEvent/NetEntityEvent.cs

@@ -21,16 +21,28 @@ namespace Barotrauma.Networking
         public readonly Entity Entity;
         public readonly UInt16 ID;
 
+        public UInt16 EntityID
+        {
+            get;
+            private set;
+        }
+
         //arbitrary extra data that will be passed to the Write method of the serializable entity
         //(the index of an itemcomponent for example)
         protected object[] Data;
 
         public bool Sent;
 
-        protected NetEntityEvent(INetSerializable entity, UInt16 id)
+        protected NetEntityEvent(INetSerializable serializableEntity, UInt16 id)
         {
             this.ID = id;
-            this.Entity = entity as Entity;
+            this.Entity = serializableEntity as Entity;
+            RefreshEntityID();
+        }
+
+        public void RefreshEntityID()
+        {
+            this.EntityID = this.Entity is Entity entity ? entity.ID : Entity.NullEntityID;
         }
 
         public void SetData(object[] data)

Barotrauma/BarotraumaShared/Source/Networking/NetEntityEvent/NetEntityEventManager.cs

@@ -65,7 +65,7 @@ namespace Barotrauma.Networking
                     break;
                 }
 
-                tempBuffer.Write((UInt16)e.Entity.ID);
+                tempBuffer.Write(e.EntityID);
                 tempBuffer.Write((byte)tempEventBuffer.LengthBytes);
                 tempBuffer.Write(tempEventBuffer);
                 tempBuffer.WritePadBits();

Barotrauma/BarotraumaShared/Source/Networking/NetworkMember.cs

@@ -241,6 +241,32 @@ namespace Barotrauma.Networking
         public virtual void Update(float deltaTime) { }
 
         public virtual void Disconnect() { }
-    }
 
+        /// <summary>
+        /// Check if the two version are compatible (= if they can play together in multiplayer). 
+        /// Returns null if compatibility could not be determined (invalid/unknown version number).
+        /// </summary>
+        public static bool? IsCompatible(string myVersion, string remoteVersion)
+        {
+            if (string.IsNullOrEmpty(myVersion) || string.IsNullOrEmpty(remoteVersion)) { return null; }
+
+            if (!Version.TryParse(myVersion, out Version myVersionNumber)) { return null; }
+            if (!Version.TryParse(remoteVersion, out Version remoteVersionNumber)) { return null; }
+
+            return IsCompatible(myVersionNumber, remoteVersionNumber);
+        }
+
+        /// <summary>
+        /// Check if the two version are compatible (= if they can play together in multiplayer).
+        /// </summary>
+        public static bool IsCompatible(Version myVersion, Version remoteVersion)
+        {
+            //major.minor.build.revision
+            //revision number is ignored, other values have to match
+            return
+                myVersion.Major == remoteVersion.Major &&
+                myVersion.Minor == remoteVersion.Minor &&
+                myVersion.Build == remoteVersion.Build;
+        }
+    }
 }

Barotrauma/BarotraumaShared/Source/Networking/ServerSettings.cs

@@ -31,6 +31,8 @@ namespace Barotrauma.Networking
     
     partial class ServerSettings : ISerializableEntity
     {
+        public const string SettingsFile = "serversettings.xml";
+
         [Flags]
         public enum NetFlags : byte
         {
@@ -539,7 +541,14 @@ namespace Barotrauma.Networking
             get;
             set;
         }
-
+        
+        [Serialize(true, true)]
+        public bool AllowRewiring
+        {
+            get;
+            set;
+        }
+        
         private YesNoMaybe traitorsEnabled;
         public YesNoMaybe TraitorsEnabled
         {

Barotrauma/BarotraumaShared/Source/Networking/SteamManager.cs

@@ -21,7 +21,11 @@ namespace Barotrauma.Steam
             { "monster", 8 },
             { "art", 8 },
             { "mission", 8 },
-            { "environment", 5 }
+            { "event set", 8 },
+            { "total conversion", 5 },
+            { "environment", 5 },
+            { "item assembly", 5 },
+            { "language", 5 }
         };
 
         private List<string> popularTags = new List<string>();