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

2022-04-28 12:36:24 -03:00
parent cb50c69fc6 15d18e6ff6
commit 4277dd447c
91 changed files with 1140 additions and 491 deletions
@@ -1,17 +0,0 @@
-using Barotrauma.Networking;
-
-namespace Barotrauma.Items.Components
-{
-    partial class OutpostTerminal : ItemComponent, IClientSerializable, IServerSerializable    
-    {
-        public void ServerEventRead(IReadMessage msg, Client c)
-        {
-            
-        }
-
-        public void ServerEventWrite(IWriteMessage msg, Client c, NetEntityEvent.IData extraData = null)
-        {
-
-        }
-    }
-}
@@ -188,11 +188,10 @@ namespace Barotrauma.Items.Components
                    //already connected, no need to do anything
                    if (Connections[i].Wires.Contains(newWire)) { continue; }

-                    Connections[i].TryAddLink(newWire);
                    newWire.Connect(Connections[i], true, true);
+                    Connections[i].TryAddLink(newWire);

                    var otherConnection = newWire.OtherConnection(Connections[i]);
-
                    if (otherConnection == null)
                    {
                        GameServer.Log(GameServer.CharacterLogName(c.Character) + " connected a wire to " +