From b904cb8e0e1ce615f0a1891ed8c61e6c9814d8da Mon Sep 17 00:00:00 2001 From: Joonas Rikkonen Date: Wed, 28 Jun 2017 18:38:24 +0300 Subject: [PATCH] Fixed crashing if a message has no room for any entityevents (TODO: make sure item position updates don't take up all the space in the messages and prevent entityevents from being sent) --- .../Networking/NetEntityEvent/NetEntityEventManager.cs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Barotrauma/Source/Networking/NetEntityEvent/NetEntityEventManager.cs b/Barotrauma/Source/Networking/NetEntityEvent/NetEntityEventManager.cs index 186bbc7d4..93d25b13a 100644 --- a/Barotrauma/Source/Networking/NetEntityEvent/NetEntityEventManager.cs +++ b/Barotrauma/Source/Networking/NetEntityEvent/NetEntityEventManager.cs @@ -65,9 +65,12 @@ namespace Barotrauma.Networking eventCount++; } - msg.Write(eventsToSync[0].ID); - msg.Write((byte)eventCount); - msg.Write(tempBuffer); + if (eventCount > 0) + { + msg.Write(eventsToSync[0].ID); + msg.Write((byte)eventCount); + msg.Write(tempBuffer); + } } protected virtual void WriteEvent(NetBuffer buffer, NetEntityEvent entityEvent, Client recipient = null)