Unstable 0.17.1.0

2022-03-17 01:25:04 +09:00
parent 3974067915
commit 6d410cc1b7
302 changed files with 5878 additions and 3317 deletions
@@ -6,6 +6,16 @@ namespace Barotrauma.Items.Components
 {
    internal partial class Growable
    {
+        private readonly struct EventData : IEventData
+        {
+            public readonly int Offset;
+            
+            public EventData(int offset)
+            {
+                Offset = offset;
+            }
+        }
+        
        private const int serverHealthUpdateDelay = 10;
        private int serverHealthUpdateTimer;

@@ -25,11 +35,12 @@ namespace Barotrauma.Items.Components
            }
        }

-        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
        {
            msg.WriteRangedSingle(Health, 0f, (float) MaxHealth, 8);
-            if (extraData != null && extraData.Length >= 3 && extraData[2] is int offset)
+            if (TryExtractEventData(extraData, out EventData eventData))
            {
+                int offset = eventData.Offset;
                int amountToSend = Math.Min(Vines.Count - offset, VineChunkSize);
                msg.WriteRangedInteger(offset, -1, MaximumVines);
                msg.WriteRangedInteger(amountToSend, 0, VineChunkSize);