Merge branch 'smartcmd:main' into main

1 files changed, 7 insertions, 5 deletions

diff --git a/Minecraft.World/PreLoginPacket.cpp b/Minecraft.World/PreLoginPacket.cpp
index 4b474214..ddcfe197 100644
--- a/Minecraft.World/PreLoginPacket.cpp
+++ b/Minecraft.World/PreLoginPacket.cpp
@@ -9,7 +9,7 @@
 PreLoginPacket::PreLoginPacket() 
 {
 	loginKey = L"";
-	m_playerXuids = NULL;
+	m_playerXuids = nullptr;
 	m_dwPlayerCount = 0;
 	m_friendsOnlyBits = 0;
 	m_ugcPlayersVersion = 0;
@@ -23,7 +23,7 @@ PreLoginPacket::PreLoginPacket()
 PreLoginPacket::PreLoginPacket(wstring userName) 
 {
 	this->loginKey = userName;
-	m_playerXuids = NULL;
+	m_playerXuids = nullptr;
 	m_dwPlayerCount = 0;
 	m_friendsOnlyBits = 0;
 	m_ugcPlayersVersion = 0;
@@ -50,7 +50,7 @@ PreLoginPacket::PreLoginPacket(wstring userName, PlayerUID *playerXuids, DWORD p
 
 PreLoginPacket::~PreLoginPacket()
 {
-	if( m_playerXuids != NULL ) delete [] m_playerXuids;
+	if( m_playerXuids != nullptr ) delete [] m_playerXuids;
 }
 
 void PreLoginPacket::read(DataInputStream *dis) //throws IOException 
@@ -62,6 +62,7 @@ void PreLoginPacket::read(DataInputStream *dis) //throws IOException
 	m_friendsOnlyBits = dis->readByte();
 	m_ugcPlayersVersion = dis->readInt();
 	m_dwPlayerCount = dis->readByte();
+	if( m_dwPlayerCount > MINECRAFT_NET_MAX_PLAYERS ) m_dwPlayerCount = MINECRAFT_NET_MAX_PLAYERS;
 	if( m_dwPlayerCount > 0 )
 	{
 		m_playerXuids = new PlayerUID[m_dwPlayerCount];
@@ -74,6 +75,7 @@ void PreLoginPacket::read(DataInputStream *dis) //throws IOException
 	{
 		m_szUniqueSaveName[i]=dis->readByte();
 	}
+	// m_szUniqueSaveName[m_iSaveNameLen - 1] = 0; // LCEMP does this but I have no idea why, TODO: why?
 	m_serverSettings = dis->readInt();
 	m_hostIndex = dis->readByte();
 	
@@ -92,7 +94,7 @@ void PreLoginPacket::write(DataOutputStream *dos) //throws IOException
 	
 	dos->writeByte(m_friendsOnlyBits);
 	dos->writeInt(m_ugcPlayersVersion);
-	dos->writeByte((byte)m_dwPlayerCount);
+	dos->writeByte(static_cast<byte>(m_dwPlayerCount));
 	for(DWORD i = 0; i < m_dwPlayerCount; ++i)
 	{
 		dos->writePlayerUID( m_playerXuids[i] );
@@ -115,5 +117,5 @@ void PreLoginPacket::handle(PacketListener *listener)
 
 int PreLoginPacket::getEstimatedSize() 
 {
-	return 4 + 4 + (int)loginKey.length() + 4 +14 + 4 + 1 + 4;
+	return 4 + 4 + static_cast<int>(loginKey.length()) + 4 +14 + 4 + 1 + 4;
 }