From d5ba822a79568f2093c98d7caacbd92d1de66336 Mon Sep 17 00:00:00 2001
From: Leon Friedrich <60421075+ElectroJr@users.noreply.github.com>
Date: Sun, 27 Aug 2023 17:24:25 +1200
Subject: [PATCH] Remove redundant prototype resolving (#4322)

---
 Robust.Client/GameController/GameController.cs        | 1 -
 Robust.Server/BaseServer.cs                           | 1 -
 Robust.UnitTesting/Shared/Prototypes/HotReloadTest.cs | 2 ++
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Robust.Client/GameController/GameController.cs b/Robust.Client/GameController/GameController.cs
index 10ff71071..420b0ee7e 100644
--- a/Robust.Client/GameController/GameController.cs
+++ b/Robust.Client/GameController/GameController.cs
@@ -167,7 +167,6 @@ namespace Robust.Client
             _reflectionManager.Initialize();
             _prototypeManager.Initialize();
             _prototypeManager.LoadDefaultPrototypes();
-            _prototypeManager.ResolveResults();
             _userInterfaceManager.Initialize();
             _eyeManager.Initialize();
             _entityManager.Initialize();
diff --git a/Robust.Server/BaseServer.cs b/Robust.Server/BaseServer.cs
index 070945569..bfa52bd2d 100644
--- a/Robust.Server/BaseServer.cs
+++ b/Robust.Server/BaseServer.cs
@@ -369,7 +369,6 @@ namespace Robust.Server
             // otherwise the prototypes will be cleared
             _prototype.Initialize();
             _prototype.LoadDefaultPrototypes();
-            _prototype.ResolveResults();
             _refMan.Initialize();
 
             IoCManager.Resolve<ToolshedManager>().Initialize();
diff --git a/Robust.UnitTesting/Shared/Prototypes/HotReloadTest.cs b/Robust.UnitTesting/Shared/Prototypes/HotReloadTest.cs
index 15b8e5da3..0316c415b 100644
--- a/Robust.UnitTesting/Shared/Prototypes/HotReloadTest.cs
+++ b/Robust.UnitTesting/Shared/Prototypes/HotReloadTest.cs
@@ -1,3 +1,4 @@
+#if TOOLS
 using System;
 using System.Collections.Generic;
 using NUnit.Framework;
@@ -114,3 +115,4 @@ namespace Robust.UnitTesting.Shared.Prototypes
     {
     }
 }
+#endif