(325184804) Fix distance based attacks not registering if they hit a submarine.

Barotrauma/BarotraumaShared/Source/Networking/FileTransfer/FileTransfer.cs

@@ -7,7 +7,7 @@
 
     enum FileTransferMessageType
     {
-        Unknown, Initiate, Data, TransferOnSameMachine, Cancel
+        Unknown, Initiate, Data, Cancel
     }
 
     enum FileTransferType

Barotrauma/BarotraumaShared/Source/Networking/NetConfig.cs

@@ -32,14 +32,11 @@ namespace Barotrauma.Networking
         public const float HighPrioCharacterPositionUpdateInterval = 0.0f;
         public const float LowPrioCharacterPositionUpdateInterval = 1.0f;
 
-        public const float DeleteDisconnectedTime = 20.0f;
-
-        public const float ItemConditionUpdateInterval = 0.15f;
-        public const float LevelObjectUpdateInterval = 0.5f;
-        public const float HullUpdateInterval = 0.5f;
-        public const float HullUpdateDistance = 20000.0f;
-
-        public const int MaxEventPacketsPerUpdate = 4;
+        //how much the physics body of an item has to move until the server 
+        //send a position update to clients (in sim units)
+        public const float ItemPosUpdateDistance = 2.0f;
+        
+        public const float DeleteDisconnectedTime = 10.0f;
 
         /// <summary>
         /// Interpolates the positional error of a physics body towards zero.

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

@@ -58,8 +58,15 @@ namespace Barotrauma.Networking
                     eventCount++;
                     continue;
                 }
-
-                if (msg.LengthBytes + tempBuffer.LengthBytes + tempEventBuffer.LengthBytes > MaxEventBufferLength)
+                //the ID has been taken by another entity (the original entity has been removed) -> write an empty event
+                /*else if (Entity.FindEntityByID(e.Entity.ID) != e.Entity || e.Entity.IdFreed)
+                {
+                    //technically the clients don't have any use for these, but removing events and shifting the IDs of all 
+                    //consecutive ones is so error-prone that I think this is a safer option
+                    tempBuffer.Write(Entity.NullEntityID);
+                    tempBuffer.WritePadBits();
+                }*/
+                else
                 {
                     //no more room in this packet
                     break;