From 34bbca5cc258d74a2be60af60a9e573da06c097e Mon Sep 17 00:00:00 2001
From: Tad Hardesty <tad@platymuus.com>
Date: Fri, 7 Feb 2020 08:55:27 -0800
Subject: [PATCH] Fix powernets detecting APCs on other maps (#604)

---
 .../GameObjects/Components/Power/PowerProviderComponent.cs    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs b/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs
index 81acd15457..165203b181 100644
--- a/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs
+++ b/Content.Server/GameObjects/Components/Power/PowerProviderComponent.cs
@@ -10,6 +10,7 @@ using Robust.Shared.IoC;
 using Robust.Shared.Log;
 using Robust.Shared.Serialization;
 using Robust.Shared.ViewVariables;
+using Robust.Shared.Map;
 
 namespace Content.Server.GameObjects.Components.Power
 {
@@ -284,7 +285,8 @@ namespace Content.Server.GameObjects.Components.Power
             if (this == device)
                 return false;
 
-            return (device.Owner.Transform.WorldPosition - Owner.Transform.WorldPosition).Length <= _range;
+            return device.Owner.Transform.MapID == Owner.Transform.MapID &&
+                (device.Owner.Transform.WorldPosition - Owner.Transform.WorldPosition).Length <= _range;
         }
     }
 }