Merge remote-tracking branch 'barotrauma/master' into new-netcode

# Conflicts: # Subsurface/Properties/AssemblyInfo.cs # Subsurface/Source/Characters/AI/EnemyAIController.cs # Subsurface/Source/Characters/AICharacter.cs # Subsurface/Source/Characters/Character.cs # Subsurface/Source/Items/Components/Signal/Connection.cs # Subsurface/Source/Items/Item.cs # Subsurface/Source/Map/Structure.cs # Subsurface/Source/Networking/GameClient.cs # Subsurface/Source/Networking/GameServer.cs # Subsurface/Source/Screens/NetLobbyScreen.cs
2016-11-05 18:18:20 -03:00
parent 35dafc4792 a32198ff80
commit f0acf69065
57 changed files with 454 additions and 362 deletions
@@ -108,9 +108,7 @@ namespace Barotrauma.Items.Components
            connectedList.Add(this);

            ApplyStatusEffects(ActionType.OnActive, deltaTime, null);
-
-            List<Connection> alreadyChecked = new List<Connection>();
-
+            
            List<Connection> connections = item.Connections;
            if (connections == null) return;

@@ -151,8 +149,6 @@ namespace Barotrauma.Items.Components
                        {
                            fullPower += powerContainer.CurrPowerOutput;
                        }
-
-                        alreadyChecked.Add(recipient);
                    }
                    else
                    {