From ef7c1d42b857b40bc07398dff1b9ef3bdbe1cf97 Mon Sep 17 00:00:00 2001
From: EctoplasmIsGood <109397347+EctoplasmIsGood@users.noreply.github.com>
Date: Sun, 27 Apr 2025 17:04:29 -0500
Subject: [PATCH] Beacons No Longer Glitch Off on Grid Split (#28518) (#2341)

https://github.com/Simple-Station/Einstein-Engines/pull/2337

Co-authored-by: Your Name <EctoplasmIsGood@users.noreply.github.com>
(cherry picked from commit f888234d0746715853477a0fdecee6c50a18e801)
---
 Content.Server/Pinpointer/NavMapSystem.cs | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Content.Server/Pinpointer/NavMapSystem.cs b/Content.Server/Pinpointer/NavMapSystem.cs
index 7ed13b7b94..47c3a072a6 100644
--- a/Content.Server/Pinpointer/NavMapSystem.cs
+++ b/Content.Server/Pinpointer/NavMapSystem.cs
@@ -237,6 +237,16 @@ public sealed partial class NavMapSystem : SharedNavMapSystem
         component.Chunks.Clear();
         component.Beacons.Clear();
 
+        // Refresh beacons
+        var query = EntityQueryEnumerator<NavMapBeaconComponent, TransformComponent>();
+        while (query.MoveNext(out var qUid, out var qNavComp, out var qTransComp))
+        {
+            if (qTransComp.ParentUid != uid)
+                continue;
+
+            UpdateNavMapBeaconData(qUid, qNavComp);
+        }
+
         // Loop over all tiles
         var tileRefs = _mapSystem.GetAllTiles(uid, mapGrid);