devbeni/K-C-Multiplayer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Improve job type initialization and handle game state during loading

Browse Source
This commit is contained in:
devbeni
2025-12-14 23:45:12 +01:00
parent 0d7d989f76
commit 8f13282e04
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Main.cs
View File

@@ -1660,9 +1660,10 @@ namespace KCM
__instance.JobCustomMaxEnabledFlag = new bool[World.inst.NumLandMasses][]; __instance.JobCustomMaxEnabledFlag = new bool[World.inst.NumLandMasses][];
for (int lm = 0; lm < World.inst.NumLandMasses; lm++) for (int lm = 0; lm < World.inst.NumLandMasses; lm++)
{ {
__instance.JobFilledAvailable[lm] = new int[38]; int numJobTypes = p.JobFilledAvailable.data[lm].GetLength(0);
__instance.JobCustomMaxEnabledFlag[lm] = new bool[38]; __instance.JobFilledAvailable[lm] = new int[numJobTypes];
for (int n = 0; n < 38; n++) __instance.JobCustomMaxEnabledFlag[lm] = new bool[numJobTypes];
for (int n = 0; n < numJobTypes; n++)
{ {
__instance.JobFilledAvailable[lm][n] = p.JobFilledAvailable.data[lm][n, 1]; __instance.JobFilledAvailable[lm][n] = p.JobFilledAvailable.data[lm][n, 1];
} }

12
Packets/Lobby/StartGame.cs
View File

@@ -57,7 +57,17 @@ namespace KCM.Packets.Lobby
public override void HandlePacketClient() public override void HandlePacketClient()
{ {
Start(); if (!LobbyManager.loadingSave)
{
Start();
}
else
{
// If loading a save, just ensure the game is in the correct UI state for loading.
// The actual game start will happen after save data is unpacked in SaveTransferPacket.HandlePacketClient().
// This prevents MainMenuMode.StartGame() from being called prematurely and causing NullReferenceExceptions.
GameState.inst.SetNewMode(GameState.inst.playingMode);
}
} }
public override void HandlePacketServer() public override void HandlePacketServer()