Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fallback singleplayer save loading

Browse Source
This commit is contained in:
Loki Rautio
2026-03-05 10:06:23 -06:00
parent 0bb7c2e16d
commit 29b0ae7de1
1 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Minecraft.Client/PlayerList.cpp
View File

@@ -81,13 +81,33 @@ void PlayerList::placeNewPlayer(Connection *connection, shared_ptr<ServerPlayer>
{ {
CompoundTag *playerTag = load(player); CompoundTag *playerTag = load(player);
INetworkPlayer *networkPlayer = connection->getSocket()->getPlayer();
#ifdef _WINDOWS64 // Attempt fallback save load
if (playerTag == NULL)
{
// The check below should prevent this from happening on a dedicated server (IsHost)
if (networkPlayer != NULL && networkPlayer->IsHost() || networkPlayer == NULL)
{
NetworkPlayerXbox *npx = (NetworkPlayerXbox *)networkPlayer;
IQNetPlayer *qp = npx->GetQNetPlayer();
// Hardcoded as this is a long term legacy failsafe load!
playerTag = playerIo->loadPlayerDataTag((PlayerUID)(0xe000d45248242f2e + qp->m_smallId));
if (playerTag != NULL)
{
player->load(playerTag);
}
}
}
#endif
bool newPlayer = playerTag == NULL; bool newPlayer = playerTag == NULL;
player->setLevel(server->getLevel(player->dimension)); player->setLevel(server->getLevel(player->dimension));
player->gameMode->setLevel((ServerLevel *)player->level); player->gameMode->setLevel((ServerLevel *)player->level);
// Make sure these privileges are always turned off for the host player // Make sure these privileges are always turned off for the host player
INetworkPlayer *networkPlayer = connection->getSocket()->getPlayer();
if(networkPlayer != NULL && networkPlayer->IsHost()) if(networkPlayer != NULL && networkPlayer->IsHost())
{ {
player->enableAllPlayerPrivileges(true); player->enableAllPlayerPrivileges(true);