From d51c9a2028429daf30ab57059486b0f79228ad25 Mon Sep 17 00:00:00 2001
From: Joonas Rikkonen <poe.regalis@gmail.com>
Date: Tue, 26 Mar 2019 14:07:51 +0200
Subject: [PATCH] (31ba1cb37) Fixed batteries being able to draw power through
 relay components that are connected directly to a power source, even if the
 relay isn't on. Closes #1069

---
 .../Source/Items/Components/Power/PowerContainer.cs           | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs b/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs
index b8c51184d..0aacaceb9 100644
--- a/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs
+++ b/Barotrauma/BarotraumaShared/Source/Items/Components/Power/PowerContainer.cs
@@ -140,6 +140,8 @@ namespace Barotrauma.Items.Components
                 if (c.Name == "power_in") continue;
                 foreach (Connection c2 in c.Recipients)
                 {
+                    if (c2.Item.Condition <= 0.0f) { continue; }
+
                     PowerTransfer pt = c2.Item.GetComponent<PowerTransfer>();
                     if (pt == null)
                     {
@@ -151,7 +153,7 @@ namespace Barotrauma.Items.Components
                         }
                         continue;
                     }
-                    if (!pt.IsActive) { continue; }
+                    if (!pt.IsActive || !pt.CanTransfer) { continue; }
 
                     gridLoad += pt.PowerLoad;
                     gridPower -= pt.CurrPowerConsumption;