NaN/cafeberry
0
0
Fork 0
forked from cafeberry/cafeberry
Code Pull Requests Activity

Merge remote-tracking branch 'origin/main' into networking

Browse Source
This commit is contained in:
str1k3r
2026-09-06 09:33:19 -04:00
parent 5065c28b5c 7b4821d329
commit 83e11bdf9b
1476 changed files with 260663 additions and 269030 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Minecraft.Client/Common/Network/GameNetworkManager.cpp
+7 -3
View File
@@ -37,6 +37,10 @@
#include "..\..\Xbox\Network\NetworkPlayerXbox.h"
#endif
#ifdef _WINDOWS64
#include "..\..\Windows64\Windows64_Minecraft.h"
#endif
#ifdef _DURANGO
#include "..\Minecraft.World\DurangoStats.h"
#endif
@@ -932,11 +936,11 @@ int CGameNetworkManager::RunNetworkGameThreadProc( void* lpParameter )
if( !success)
{
TexturePack *tPack = Minecraft::GetInstance()->skins->getSelected();
while ( tPack->isLoadingData() || (Minecraft::GetInstance()->skins->needsUIUpdate() || ui.IsReloadingSkin()) )
while ( tPack->isLoadingData() || (Minecraft::GetInstance()->skins->needsUIUpdate() || ui.IsReloadingSkins()) )
{
Sleep(0);
}
ui.CleanUpSkinReload();
ui.CleanUpSkinsReload();
if(app.GetDisconnectReason() == DisconnectPacket::eDisconnect_None)
{
app.SetDisconnectReason( DisconnectPacket::eDisconnect_ConnectionCreationFailed );
@@ -969,7 +973,7 @@ int CGameNetworkManager::ServerThreadProc( void* lpParameter )
// 4J Stu - If we are loading a DLC save that's separate from the texture pack, load
if( param->levelGen != NULL && (param->texturePackId == 0 || param->levelGen->getRequiredTexturePackId() != param->texturePackId) )
{
while((Minecraft::GetInstance()->skins->needsUIUpdate() || ui.IsReloadingSkin()))
while((Minecraft::GetInstance()->skins->needsUIUpdate() || ui.IsReloadingSkins()))
{
Sleep(0);
}
Minecraft.Client/Common/Network/Sony/PlatformNetworkManagerSony.cpp
+1 -3
View File
@@ -54,9 +54,7 @@ void CPlatformNetworkManagerSony::HandleStateChange(SQRNetworkManager::eSQRNetwo
else if( newState == SQRNetworkManager::SNM_STATE_JOINING )
{
// 4J Stu - We may be accepting an invite from the DLC menu, so hide the icon
#ifdef __ORBIS__
sceNpCommerceHidePsStoreIcon();
#elif defined(__PSVITA__) && !defined(DISABLE_PSN)
#if defined __PSVITA__ || defined __ORBIS__
app.GetCommerce()->HidePsStoreIcon();
#endif
m_bLeavingGame = false;
Minecraft.Client/Common/Network/Sony/SonyCommerce.h
+1 -2
View File
@@ -170,8 +170,7 @@ public:
virtual void CheckForTrialUpgradeKey() = 0;
virtual bool LicenseChecked() = 0;
// str1k3r: Currently does not work on Orbis.
#if defined __PSVITA__ // || defined __ORBIS__
#if defined __PSVITA__ || defined __ORBIS__
virtual void ShowPsStoreIcon() = 0;
virtual void HidePsStoreIcon() = 0;
#endif