Merge branch 'master' of https://github.com/Regalis11/Barotrauma.git

2022-02-24 14:30:39 -03:00
parent db7a6a0bea 102e089aa6
commit 6340304ae4
364 changed files with 10838 additions and 3966 deletions
@@ -8,7 +8,7 @@ namespace Barotrauma.Items.Components
        {
            int signalIndex = msg.ReadRangedInteger(0, Signals.Length - 1);
            if (!item.CanClientAccess(c)) { return; }
-            if (!SendSignal(signalIndex)) { return; }
+            if (!SendSignal(signalIndex, c.Character)) { return; }
            GameServer.Log($"{GameServer.CharacterLogName(c.Character)} sent a signal \"{Signals[signalIndex]}\" from {item.Name}", ServerLog.MessageType.ItemInteraction);
            item.CreateServerEvent(this, new object[] { signalIndex });
        }
@@ -0,0 +1,12 @@
+using Barotrauma.Networking;
+
+namespace Barotrauma.Items.Components
+{
+    partial class WifiComponent
+    {
+        public void ServerWrite(IWriteMessage msg, Client c, object[] extraData = null)
+        {
+            msg.WriteRangedInteger(Channel, MinChannel, MaxChannel);
+        }
+    }
+}