LegacyConsole/LCE-Revelations
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/LCE-Revelations.git synced 2026-06-05 14:07:05 +00:00
Code Issues Packages Projects Releases 3 Wiki Activity

fix: move security gate close after login sequence to prevent high-latency crashes

Browse Source 
The security gate was closed before LoginPacket was sent in placeNewPlayer,
causing all login setup packets to be buffered behind the cipher handshake.
Under high-latency connections, the flushed data arrived before the player
object was initialized, causing a null pointer crash. The gate now closes
after the login sequence and MC|CKey are sent.
This commit is contained in:
itsRevela
2026-03-31 17:27:24 -05:00
parent d5fafb74e8
commit aecef7f10d
2 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
Minecraft.Client/PlayerList.cpp
View File

@@ -273,22 +273,6 @@ bool PlayerList::placeNewPlayer(Connection *connection, shared_ptr<ServerPlayer>
app.DebugPrintf("RECONNECT: placeNewPlayer smallId=%d entityId=%d dim=%d\n",
newSmallId, player->entityId, level->dimension->id);
#if defined(_WINDOWS64) && defined(MINECRAFT_SERVER_BUILD)
// Close the security gate before sending any game data. All packets will be
// buffered until the cipher handshake completes, preventing unsecured clients
// from receiving XUIDs or game state during the grace period.
if (g_Win64DedicatedServer &&
ServerRuntime::Security::GetSettings().enableStreamCipher &&
ServerRuntime::Security::GetSettings().requireSecureClient)
{
INetworkPlayer *gateNp = connection->getSocket() ? connection->getSocket()->getPlayer() : nullptr;
if (gateNp != nullptr && !gateNp->IsLocal())
{
playerConnection->m_securityGateOpen = false;
}
}
#endif
playerConnection->send(std::make_shared<LoginPacket>(L"", player->entityId, level->getLevelData()->getGenerator(),
level->getSeed(),
player->gameMode->getGameModeForPlayer()->getId(),
@@ -389,6 +373,16 @@ bool PlayerList::placeNewPlayer(Connection *connection, shared_ptr<ServerPlayer>
ServerRuntime::Security::GetHandshakeEnforcer().OnCipherKeySent(smallId, s_playerListTickCount);
}
}
// Close the security gate AFTER sending the essential login sequence
// and MC|CKey. The login setup packets (LoginPacket, spawn position,
// abilities, chunks, teleport) must arrive in plaintext before the
// cipher handshake completes. Only subsequent tick data is buffered
// until the handshake finishes and openSecurityGate() flushes.
if (ServerRuntime::Security::GetSettings().requireSecureClient)
{
playerConnection->m_securityGateOpen = false;
}
}
}
#endif