From b5882df4114f867b82b15fdbf721087aa652154f Mon Sep 17 00:00:00 2001
From: Tropical <42101043+tropicaaal@users.noreply.github.com>
Date: Fri, 13 Mar 2026 01:24:22 -0500
Subject: [PATCH] refactor: less hacky hack

---
 Minecraft.Client/Platform/Common/Consoles_App.h           | 4 ++--
 .../Platform/Common/Network/GameNetworkManager.cpp        | 8 ++++----
 .../Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp         | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Minecraft.Client/Platform/Common/Consoles_App.h b/Minecraft.Client/Platform/Common/Consoles_App.h
index 4b8807399..885b70164 100644
--- a/Minecraft.Client/Platform/Common/Consoles_App.h
+++ b/Minecraft.Client/Platform/Common/Consoles_App.h
@@ -322,8 +322,8 @@ public:
 	void MountNextDLC(int iPad);
 	//static int DLCReadCallback(LPVOID pParam,C4JStorage::DLC_FILE_DETAILS *pDLCData);
 	void HandleDLC(DLCPack *pack);
-	bool DLCInstallPending()	{return m_bDLCInstallPending;}
-	bool DLCInstallProcessCompleted()	{return m_bDLCInstallProcessCompleted;}
+	bool DLCInstallPending()	{return false;}
+	bool DLCInstallProcessCompleted()	{return true;}
 	void ClearDLCInstalled()	{ m_bDLCInstallProcessCompleted=false;}
 	static int MarketplaceCountsCallback(void *pParam,C4JStorage::DLC_TMS_DETAILS *,int iPad);
 
diff --git a/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp b/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp
index 51def8163..84cdf7740 100644
--- a/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp
+++ b/Minecraft.Client/Platform/Common/Network/GameNetworkManager.cpp
@@ -272,10 +272,10 @@ bool	CGameNetworkManager::StartNetworkGame(Minecraft *minecraft, void *lpParamet
 	app.DebugPrintf("[NET] DLC check: completed=%d pending=%d\n", app.DLCInstallProcessCompleted(), app.DLCInstallPending());
 	// 4J Stu - Wait a while to make sure that DLC is loaded. This is the last point before the network communication starts
 	// so the latest we can check this
-	// while( !app.DLCInstallProcessCompleted() && app.DLCInstallPending() && !g_NetworkManager.IsLeavingGame() )
-	// {
-	// 	Sleep( 10 );
-	// }
+	while( !app.DLCInstallProcessCompleted() && app.DLCInstallPending() && !g_NetworkManager.IsLeavingGame() )
+	{
+		Sleep( 10 );
+	}
 	if( g_NetworkManager.IsLeavingGame() )
 	{
 		MinecraftServer::HaltServer();
diff --git a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
index 2f59c23ce..a5cea82fb 100644
--- a/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
+++ b/Minecraft.Client/Platform/Common/UI/UIScene_LoadOrJoinMenu.cpp
@@ -955,10 +955,10 @@ void UIScene_LoadOrJoinMenu::AddDefaultButtons()
 
 void UIScene_LoadOrJoinMenu::handleInput(int iPad, int key, bool repeat, bool pressed, bool released, bool &handled)
 {
-    // if(m_bIgnoreInput) return;
+    if(m_bIgnoreInput) return;
 
     // if we're retrieving save info, ignore key presses
-    // if(!m_bSavesDisplayed) return;
+    if(!m_bSavesDisplayed) return;
 
     ui.AnimateKeyPress(m_iPad, key, repeat, pressed, released);