Fix nullref on dedi

project-fika · Dec 7, 2024 · 01c56d0 · 01c56d0
1 parent 688c85a
commit 01c56d0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Fika.Core/Coop/GameMode/CoopGame.cs b/Fika.Core/Coop/GameMode/CoopGame.cs
@@ -1061,7 +1061,7 @@ public async Task InitPlayer(BotControllerSettings botsSettings, string backendU
 			}
 			if (transitActive)
 			{
-				Singleton<GameWorld>.Instance.TransitController = isServer ? new FikaHostTransitController(instance.transitSettings, Location_0.transitParameters,
+				gameWorld.TransitController = isServer ? new FikaHostTransitController(instance.transitSettings, Location_0.transitParameters,
 					Profile_0, localRaidSettings_0) : new FikaClientTransitController(instance.transitSettings, Location_0.transitParameters,
 					Profile_0, localRaidSettings_0);
 			}
@@ -1089,6 +1089,11 @@ public async Task InitPlayer(BotControllerSettings botsSettings, string backendU
 				PlayerCameraController.Create(gparam_0.Player);
 				CameraClass.Instance.SetOcclusionCullingEnabled(Location_0.OcculsionCullingEnabled);
 				CameraClass.Instance.IsActive = false;
+
+				if (FikaBackendUtils.IsDedicated && gameWorld.TransitController is FikaHostTransitController hostController)
+				{
+					hostController.SetupDedicatedPlayerTransitStash(player);
+				}
 			}
 
 			await WaitForPlayersToConnect();

diff --git a/Fika.Core/Coop/HostClasses/FikaHostTransitController.cs b/Fika.Core/Coop/HostClasses/FikaHostTransitController.cs
@@ -30,13 +30,12 @@ public FikaHostTransitController(BackendConfigSettingsClass.GClass1529 settings,
 			playersInTransitZone = [];
 			dediTransit = false;
 			transittedPlayers = [];
+		}
 
-			if (FikaBackendUtils.IsDedicated)
-			{
-				CoopPlayer dediPlayer = (CoopPlayer)GamePlayerOwner.MyPlayer;
-				TransferItemsController.InitPlayerStash(dediPlayer);
-				dediPlayer.UpdateBtrTraderServiceData().HandleExceptions();
-			}
+		public void SetupDedicatedPlayerTransitStash(LocalPlayer player)
+		{
+			TransferItemsController.InitPlayerStash(player);
+			player.UpdateBtrTraderServiceData().HandleExceptions();
 		}
 
 		private readonly LocalRaidSettings localRaidSettings;