Fix RoomSpawnpoint

EXILED/Exiled.API/Features/Spawn/RoomSpawnPoint.cs

@@ -48,6 +48,9 @@ public override Vector3 Position
             {
                 Room roomInstance = Features.Room.Get(Room) ?? throw new InvalidOperationException("The room instance could not be found.");
 
+                if (roomInstance.Type == RoomType.Surface)
+                    return Offset != Vector3.zero ? Offset : roomInstance.Position;
+
                 return Offset != Vector3.zero ? roomInstance.transform.TransformPoint(Offset) : roomInstance.Position;
             }
             set => throw new InvalidOperationException("The position of this type of SpawnPoint cannot be changed.");

EXILED/Exiled.CustomItems/CustomItems.cs

@@ -35,7 +35,7 @@ public override void OnEnabled()
             roundHandler = new MapHandler();
             playerHandler = new PlayerHandler();
 
-            Exiled.Events.Handlers.Map.Generated += roundHandler.OnMapGenerated;
+            Exiled.Events.Handlers.Server.WaitingForPlayers += roundHandler.OnWaitingForPlayers;
 
             Exiled.Events.Handlers.Player.ChangingItem += playerHandler.OnChangingItem;
 
@@ -50,7 +50,7 @@ public override void OnEnabled()
         /// <inheritdoc />
         public override void OnDisabled()
         {
-            Exiled.Events.Handlers.Map.Generated -= roundHandler!.OnMapGenerated;
+            Exiled.Events.Handlers.Server.WaitingForPlayers -= roundHandler!.OnWaitingForPlayers;
 
             Exiled.Events.Handlers.Player.ChangingItem -= playerHandler!.OnChangingItem;
 

EXILED/Exiled.CustomItems/Events/MapHandler.cs

@@ -15,14 +15,11 @@ namespace Exiled.CustomItems.Events
     /// </summary>
     internal sealed class MapHandler
     {
-        /// <inheritdoc cref="Exiled.Events.Handlers.Map.Generated"/>
-        public void OnMapGenerated()
+        /// <inheritdoc cref="Exiled.Events.Handlers.Server.WaitingForPlayers"/>
+        public void OnWaitingForPlayers()
         {
-            Timing.CallDelayed(0.5f, () => // Delay its necessary for the spawnpoints of lockers and rooms to be generated.
-            {
-                foreach (CustomItem customItem in CustomItem.Registered)
-                    customItem?.SpawnAll();
-            });
+            foreach (CustomItem customItem in CustomItem.Registered)
+                customItem?.SpawnAll();
         }
     }
 }