From 763b79bbf916d804abad47219454841c4aa86836 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Fri, 3 Jun 2022 22:42:59 +1200
Subject: [PATCH] Remove (some?) pop-up error spam. (#8538)

---
 Content.Client/Popups/PopupSystem.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Content.Client/Popups/PopupSystem.cs b/Content.Client/Popups/PopupSystem.cs
index 4cd2a1453d..a6edf36764 100644
--- a/Content.Client/Popups/PopupSystem.cs
+++ b/Content.Client/Popups/PopupSystem.cs
@@ -259,7 +259,8 @@ namespace Content.Client.Popups
 
                 if (Entity == null)
                     screenCoords = _eyeManager.CoordinatesToScreen(InitialPos);
-                else if (_entityManager.TryGetComponent(Entity.Value, out TransformComponent xform))
+                else if (_entityManager.TryGetComponent(Entity.Value, out TransformComponent xform)
+                    && xform.MapID == _eyeManager.CurrentMap)
                     screenCoords = _eyeManager.CoordinatesToScreen(xform.Coordinates);
                 else
                 {