From fd8c90dcbb9e8a222efa18ad883ffeddf8926871 Mon Sep 17 00:00:00 2001
From: Paul <ritter.paul1@googlemail.com>
Date: Tue, 16 Mar 2021 12:05:40 +0100
Subject: [PATCH] reverting cringe (moved controller metrics cvar get to
 server)

---
 .../GameObjects/EntitySystems/PhysicsSystem.cs         | 10 ++++++++++
 .../GameObjects/Systems/SharedPhysicsSystem.cs         |  9 +--------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Robust.Server/GameObjects/EntitySystems/PhysicsSystem.cs b/Robust.Server/GameObjects/EntitySystems/PhysicsSystem.cs
index dd36e867fa..33ca7281c7 100644
--- a/Robust.Server/GameObjects/EntitySystems/PhysicsSystem.cs
+++ b/Robust.Server/GameObjects/EntitySystems/PhysicsSystem.cs
@@ -1,4 +1,6 @@
 using JetBrains.Annotations;
+using Robust.Shared;
+using Robust.Shared.Configuration;
 using Robust.Shared.GameObjects;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
@@ -10,11 +12,19 @@ namespace Robust.Server.GameObjects
     public class PhysicsSystem : SharedPhysicsSystem
     {
         [Dependency] private readonly IMapManager _mapManager = default!;
+        [Dependency] private readonly IConfigurationManager _configurationManager = default!;
 
         public override void Initialize()
         {
             base.Initialize();
             _mapManager.OnGridCreated += HandleGridCreated;
+            LoadMetricCVar();
+            _configurationManager.OnValueChanged(CVars.MetricsEnabled, _ => LoadMetricCVar());
+        }
+
+        private void LoadMetricCVar()
+        {
+            MetricsEnabled = _configurationManager.GetCVar(CVars.MetricsEnabled);
         }
 
         public override void Shutdown()
diff --git a/Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs b/Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs
index 141942705e..e596bdd379 100644
--- a/Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs
+++ b/Robust.Shared/GameObjects/Systems/SharedPhysicsSystem.cs
@@ -4,6 +4,7 @@ using System.Linq;
 using Prometheus;
 using Robust.Shared.Configuration;
 using Robust.Shared.Containers;
+using Robust.Shared.ContentPack;
 using Robust.Shared.IoC;
 using Robust.Shared.Map;
 using Robust.Shared.Physics;
@@ -72,7 +73,6 @@ namespace Robust.Shared.GameObjects
             });
 
         [Dependency] private readonly IMapManager _mapManager = default!;
-        [Dependency] private readonly IConfigurationManager _configurationManager = default!;
 
         public IReadOnlyDictionary<MapId, PhysicsMap> Maps => _maps;
         private Dictionary<MapId, PhysicsMap> _maps = new();
@@ -106,15 +106,8 @@ namespace Robust.Shared.GameObjects
             SubscribeLocalEvent<EntRemovedFromContainerMessage>(HandleContainerRemoved);
             BuildControllers();
             Logger.DebugS("physics", $"Found {_controllers.Count} physics controllers.");
-            
-            LoadMetricCVar();
-            _configurationManager.OnValueChanged(CVars.MetricsEnabled, _ => LoadMetricCVar());
         }
 
-        private void LoadMetricCVar()
-        {
-            MetricsEnabled = _configurationManager.GetCVar(CVars.MetricsEnabled);
-        }
 
         private void BuildControllers()
         {