(ae643deeb) Added alive checks to a couple of diving gear status effects (don't consume tanks when dead)

2019-04-01 22:47:22 +03:00
parent ec7e23061b
commit 2eaf22683d
129 changed files with 2451 additions and 1336 deletions
@@ -58,15 +58,8 @@ namespace Barotrauma.Networking
                    eventCount++;
                    continue;
                }
-                //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
+
+                if (msg.LengthBytes + tempBuffer.LengthBytes + tempEventBuffer.LengthBytes > MaxEventBufferLength)
                {
                    //no more room in this packet
                    break;