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
@@ -7,7 +7,7 @@ namespace Barotrauma.Items.Components
 {
    partial class ConnectionPanel : ItemComponent, IServerSerializable, IClientSerializable
    {
-        public void ServerRead(ClientNetObject type, IReadMessage msg, Client c)
+        public void ServerEventRead(IReadMessage msg, Client c)
        {
            List<Wire>[] wires = new List<Wire>[Connections.Count];

@@ -84,7 +84,7 @@ namespace Barotrauma.Items.Components
                        if (!selectedWire.Item.Removed) { selectedWire.CreateNetworkEvent(); }
                    }, 1.0f);
                }
-                GameMain.Server?.CreateEntityEvent(item, new object[] { NetEntityEvent.Type.ApplyStatusEffect, ActionType.OnFailure, this, c.Character.ID });
+                GameMain.Server?.CreateEntityEvent(item, new Item.ApplyStatusEffectEventData(ActionType.OnFailure, this, c.Character));
                return;
            }

@@ -210,10 +210,10 @@ 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.Write(user == null ? (ushort)0 : user.ID);
-            ClientWrite(msg, extraData);
+            ClientEventWrite(msg, extraData);
        }
    }
 }