cafeberry/cafeberry
6
4 Fork 7
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Win64 joining Xbox 360 works again

Browse Source
This commit is contained in:
qloak committed 2026-08-07 04:15:12 -07:00
1 parent 7135da3f37
commit 1f5d7817fc
9 files changed
+6 -92
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

Minecraft.Client/Common/Network/GameNetworkManager.cpp
+6 -1
View File
@@ -898,6 +898,12 @@ bool CGameNetworkManager::IsNetworkThreadRunning()
int CGameNetworkManager::RunNetworkGameThreadProc( void* lpParameter )
{
if( g_NetworkManager.m_bNetworkThreadRunning )
{
return -1;
}
g_NetworkManager.m_bNetworkThreadRunning = true;
// Share AABB & Vec3 pools with default (main thread) - should be ok as long as we don't tick the main thread whilst this thread is running
AABB::UseDefaultThreadStorage();
Vec3::UseDefaultThreadStorage();
@@ -905,7 +911,6 @@ int CGameNetworkManager::RunNetworkGameThreadProc( void* lpParameter )
Tile::CreateNewThreadStorage();
IntCache::CreateNewThreadStorage();
g_NetworkManager.m_bNetworkThreadRunning = true;
bool success = g_NetworkManager._RunNetworkGame(lpParameter);
g_NetworkManager.m_bNetworkThreadRunning = false;
if( !success)
Minecraft.Client/Common/Network/PlatformNetworkManagerStub.cpp
-2
View File
@@ -419,8 +419,6 @@ int CPlatformNetworkManagerStub::JoinGame(FriendSessionInfo *searchResult, int l
NotifyPlayerJoined(&IQNet::m_player[0]);
NotifyPlayerJoined(&IQNet::m_player[localSmallId]);
m_pGameNetworkManager->StateChange_AnyToStarting();
return CGameNetworkManager::JOINGAME_SUCCESS;
}