From 340c1782df9224b08a8ebe9817120b3c1beb42f3 Mon Sep 17 00:00:00 2001
From: Kara <lunarautomaton6@gmail.com>
Date: Mon, 18 Dec 2023 18:23:25 -0700
Subject: [PATCH] Broadcast MoveEvent -> C# event (#22689)

---
 Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs | 2 +-
 Content.Server/NPC/Pathfinding/PathfindingSystem.cs      | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
index c430c71958..b3db87e896 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.Grid.cs
@@ -50,7 +50,7 @@ public sealed partial class PathfindingSystem
         SubscribeLocalEvent<CollisionLayerChangeEvent>(OnCollisionLayerChange);
         SubscribeLocalEvent<PhysicsBodyTypeChangedEvent>(OnBodyTypeChange);
         SubscribeLocalEvent<TileChangedEvent>(OnTileChange);
-        SubscribeLocalEvent<MoveEvent>(OnMoveEvent);
+        _transform.OnGlobalMoveEvent += OnMoveEvent;
     }
 
     private void OnTileChange(ref TileChangedEvent ev)
diff --git a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
index 1b1f6f5476..1830b35bb6 100644
--- a/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
+++ b/Content.Server/NPC/Pathfinding/PathfindingSystem.cs
@@ -46,6 +46,7 @@ namespace Content.Server.NPC.Pathfinding
         [Dependency] private readonly FixtureSystem _fixtures = default!;
         [Dependency] private readonly NPCSystem _npc = default!;
         [Dependency] private readonly SharedPhysicsSystem _physics = default!;
+        [Dependency] private readonly SharedTransformSystem _transform = default!;
 
         private readonly Dictionary<ICommonSession, PathfindingDebugMode> _subscribedSessions = new();
 
@@ -75,6 +76,7 @@ namespace Content.Server.NPC.Pathfinding
             base.Shutdown();
             _subscribedSessions.Clear();
             _playerManager.PlayerStatusChanged -= OnPlayerChange;
+            _transform.OnGlobalMoveEvent -= OnMoveEvent;
         }
 
         public override void Update(float frameTime)
-- 
2.51.2