HostHub doesnt exist until the round starts now??

marchellc · Nov 26, 2024 · 089e097 · 089e097
1 parent eb5ccec
commit 089e097
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 17 deletions.
diff --git a/LabExtended/Core/Hooking/HookManager.cs b/LabExtended/Core/Hooking/HookManager.cs
@@ -83,11 +83,6 @@ public static class HookManager
                 ev => InternalEvents.InternalHandlePlayerAuth((PlayerPreauthEvent)ev)
             },
 
-            [typeof(MapGeneratedEvent)] = new List<Action<object>>()
-            {
-                _ => InternalEvents.InternalHandleMapGenerated()
-            },
-
             [typeof(PlayerDyingEvent)] = new List<Action<object>>()
             {
                 ev => CustomItem.InternalHandleDying((PlayerDyingEvent)ev),

diff --git a/LabExtended/Events/InternalEvents.cs b/LabExtended/Events/InternalEvents.cs
@@ -29,6 +29,9 @@ internal static class InternalEvents
     {
         internal static void InternalHandleRoundWaiting()
         {
+            ExMap.GenerateMap();
+            ExMap.OnRoundWait();
+
             ExPlayer._preauthData.Clear();
 
             if (ExPlayer._hostPlayer != null)
@@ -37,12 +40,7 @@ internal static void InternalHandleRoundWaiting()
                 ExPlayer._hostPlayer = null;
             }
 
-            DamageInfo._wrappers.Clear();        
-
-            if (ReferenceHub.TryGetHostHub(out var hostHub))
-                ExPlayer._hostPlayer = new ExPlayer(hostHub);
-            else
-                ApiLog.Warn("Player API", $"Failed to fetch the host player.");
+            DamageInfo._wrappers.Clear();    
 
             ExRound.RoundNumber++;
 
@@ -51,7 +49,6 @@ internal static void InternalHandleRoundWaiting()
             ExRound.StartedAt = DateTime.MinValue;
             ExRound.State = RoundState.WaitingForPlayers;
 
-            ExMap.OnRoundWait();
             Prefabs.ReloadPrefabs();
         }
 
@@ -213,10 +210,5 @@ internal static void InternalHandleRoleChange(PlayerSpawningArgs args)
 
             ListPool<VoiceProfile>.Shared.Return(profilesToRemove);
         }
-
-        internal static void InternalHandleMapGenerated()
-        {
-            ExMap.GenerateMap();
-        }
     }
 }