Merge branch 'KZGlobalTeam:dev' into fkz

FemboyKZ · Jan 27, 2025 · 50aa517 · 50aa517
2 parents 3d5609d + 5fd81a3
commit 50aa517
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/kz/mode/kz_mode_manager.cpp b/src/kz/mode/kz_mode_manager.cpp
@@ -243,6 +243,10 @@ void KZModeManager::UnregisterMode(const char *modeName)
 	for (u32 i = 0; i < MAXPLAYERS + 1; i++)
 	{
 		KZPlayer *player = g_pKZPlayerManager->ToPlayer(i);
+		if (!player->IsInGame())
+		{
+			continue;
+		}
 		if (strcmp(player->modeService->GetModeName(), modeName) == 0 || strcmp(player->modeService->GetModeShortName(), modeName) == 0)
 		{
 			this->SwitchToMode(player, "VNL");

diff --git a/src/utils/hooks.cpp b/src/utils/hooks.cpp
@@ -282,7 +282,10 @@ void hooks::Cleanup()
 
 	SH_REMOVE_HOOK_ID(createLoadingSpawnGroupHook);
 
-	GameEntitySystem()->RemoveListenerEntity(&entityListener);
+	if (GameEntitySystem())
+	{
+		GameEntitySystem()->RemoveListenerEntity(&entityListener);
+	}
 }
 
 // Entity hooks