From 181e16db5399fd443a0d61939854de994629a528 Mon Sep 17 00:00:00 2001
From: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
Date: Tue, 27 Dec 2022 12:30:31 +1100
Subject: [PATCH] Reduce NPC static collision avoidance range (#13197)

---
 Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs | 2 +-
 Content.Server/NPC/Systems/NPCSteeringSystem.cs         | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
index 93302861da..f9fb07d4c2 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.Context.cs
@@ -320,7 +320,7 @@ public sealed partial class NPCSteeringSystem
         EntityQuery<PhysicsComponent> bodyQuery,
         EntityQuery<TransformComponent> xformQuery)
     {
-        var detectionRadius = agentRadius + moveSpeed;
+        var detectionRadius = MathF.Max(1.5f, agentRadius + moveSpeed / 4f);
 
         foreach (var ent in _lookup.GetEntitiesInRange(uid, detectionRadius, LookupFlags.Static))
         {
diff --git a/Content.Server/NPC/Systems/NPCSteeringSystem.cs b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
index 0dc82f8d83..f9bb6a7c13 100644
--- a/Content.Server/NPC/Systems/NPCSteeringSystem.cs
+++ b/Content.Server/NPC/Systems/NPCSteeringSystem.cs
@@ -204,7 +204,7 @@ namespace Content.Server.NPC.Systems
             var modifierQuery = GetEntityQuery<MovementSpeedModifierComponent>();
             var xformQuery = GetEntityQuery<TransformComponent>();
 
-            var npcs = EntityQuery<NPCSteeringComponent, ActiveNPCComponent, InputMoverComponent, TransformComponent>()
+            var npcs = EntityQuery<ActiveNPCComponent, NPCSteeringComponent, InputMoverComponent, TransformComponent>()
                 .ToArray();
             var options = new ParallelOptions
             {
@@ -213,7 +213,7 @@ namespace Content.Server.NPC.Systems
 
             Parallel.For(0, npcs.Length, options, i =>
             {
-                var (steering, _, mover, xform) = npcs[i];
+                var (_, steering, mover, xform) = npcs[i];
 
                 Steer(steering, mover, xform, modifierQuery, bodyQuery, xformQuery, frameTime);
             });
@@ -223,7 +223,7 @@ namespace Content.Server.NPC.Systems
             {
                 var data = new List<NPCSteeringDebugData>(npcs.Length);
 
-                foreach (var (steering, _, mover, _) in npcs)
+                foreach (var (_, steering, mover, _) in npcs)
                 {
                     data.Add(new NPCSteeringDebugData(
                         mover.Owner,