LegacyConsole/MinecraftCommunityEdition-client
3
0
Fork 0
mirror of https://github.com/Minecraft-Community-Edition/client.git synced 2026-06-02 22:54:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Whisper Yelled At me 😢

Browse Source
This commit is contained in:
coah
2026-03-04 04:37:07 -06:00
parent 7f59a61704
commit edfc280090
35 changed files with 506 additions and 461 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Minecraft.Client/Windows64/Network/GameNetworkManager.cpp
View File

@@ -161,12 +161,17 @@ bool CGameNetworkManager::_RunNetworkGame(LPVOID lpParameter)
success = s_pPlatformNetworkManager->_RunNetworkGame();
if(!success)
{
{
app.SetAction(ProfileManager.GetPrimaryPad(),eAppAction_ExitWorld,(void *)TRUE);
return true;
}
}
else
{
// Client needs QNET_STATE_GAME_PLAY so that IsInGameplay() returns true
s_pPlatformNetworkManager->SetGamePlayState();
}
if( g_NetworkManager.IsLeavingGame() ) return false;
app.SetGameStarted(true);
@@ -1391,7 +1396,10 @@ void CGameNetworkManager::CreateSocket( INetworkPlayer *pNetworkPlayer, bool loc
Minecraft *pMinecraft = Minecraft::GetInstance();
Socket *socket = NULL;
shared_ptr<MultiplayerLocalPlayer> mpPlayer = pMinecraft->localplayers[pNetworkPlayer->GetUserIndex()];
shared_ptr<MultiplayerLocalPlayer> mpPlayer = nullptr;
int userIdx = pNetworkPlayer->GetUserIndex();
if (userIdx >= 0 && userIdx < XUSER_MAX_COUNT)
mpPlayer = pMinecraft->localplayers[userIdx];
if( localPlayer && mpPlayer != NULL && mpPlayer->connection != NULL)
{
// If we already have a MultiplayerLocalPlayer here then we are doing a session type change

1
Minecraft.Client/Windows64/Network/PlatformNetworkManagerInterface.h
View File

@@ -71,6 +71,7 @@ public:
virtual void HostGame(int localUsersMask, bool bOnlineGame, bool bIsPrivate, unsigned char publicSlots = MINECRAFT_NET_MAX_PLAYERS, unsigned char privateSlots = 0) = 0;
virtual int JoinGame(FriendSessionInfo *searchResult, int dwLocalUsersMask, int dwPrimaryUserIndex ) = 0;
virtual void CancelJoinGame() {};
virtual void SetGamePlayState() {};
virtual bool SetLocalGame(bool isLocal) = 0;
virtual bool IsLocalGame() = 0;
virtual void SetPrivateGame(bool isPrivate) = 0;

6
Minecraft.Client/Windows64/Network/PlatformNetworkManagerStub.cpp
View File

@@ -313,6 +313,12 @@ void CPlatformNetworkManagerStub::HandleSignInChange()
return;
}
void CPlatformNetworkManagerStub::SetGamePlayState()
{
extern QNET_STATE _iQNetStubState;
_iQNetStubState = QNET_STATE_GAME_PLAY;
}
bool CPlatformNetworkManagerStub::_RunNetworkGame()
{
return true;

1
Minecraft.Client/Windows64/Network/PlatformNetworkManagerStub.h
View File

@@ -55,6 +55,7 @@ public:
virtual void HandleSignInChange();
virtual bool _RunNetworkGame();
virtual void SetGamePlayState();
private:
bool isSystemPrimaryPlayer(IQNetPlayer *pQNetPlayer);