Merge remote-tracking branch 'origin/main' into dec-2014

# Conflicts:
#	Minecraft.Client/Common/Consoles_App.cpp
This commit is contained in:
Loki Rautio
2026-03-01 12:07:38 -06:00

View File

@@ -3387,7 +3387,7 @@ void CMinecraftApp::HandleXuiActions(void)
bool gameStarted = false; bool gameStarted = false;
for(int j = 0; j < pMinecraft->levels.length; j++) for(int j = 0; j < pMinecraft->levels.length; j++)
{ {
if (pMinecraft->levels.data[j] != NULL) if (pMinecraft->levels.data[i] != NULL)
{ {
gameStarted = true; gameStarted = true;
break; break;
@@ -10124,4 +10124,4 @@ bool CMinecraftApp::HasReachedMainMenu()
{ {
return m_hasReachedMainMenu; return m_hasReachedMainMenu;
} }
#endif #endif