Address review feedback on protocol types

This commit is contained in:
notmatthewbeshay
2026-03-13 19:47:32 +11:00
parent bcc765f3e7
commit 883e98bde0
11 changed files with 73 additions and 86 deletions

View File

@@ -107,20 +107,17 @@ void LoginPacket::read(DataInputStream *dis) //throws IOException
seed = dis->readLong();
gameType = dis->readInt();
dimension = (int)dis->readByte();
mapHeight = static_cast<std::uint8_t>(dis->readByte());
maxPlayers = static_cast<std::uint8_t>(dis->readByte());
mapHeight = dis->readByte();
maxPlayers = dis->readByte();
m_offlineXuid = dis->readPlayerUID();
m_onlineXuid = dis->readPlayerUID();
m_friendsOnlyUGC = dis->readBoolean();
int ugcPlayersVersion = dis->readInt();
std::memcpy(&m_ugcPlayersVersion, &ugcPlayersVersion, sizeof(m_ugcPlayersVersion));
m_ugcPlayersVersion = static_cast<std::uint32_t>(dis->readInt());
difficulty = (int)dis->readByte();
m_multiplayerInstanceId = dis->readInt();
m_playerIndex = static_cast<std::uint8_t>(dis->readByte());
int skinId = dis->readInt();
std::memcpy(&m_playerSkinId, &skinId, sizeof(m_playerSkinId));
int capeId = dis->readInt();
std::memcpy(&m_playerCapeId, &capeId, sizeof(m_playerCapeId));
m_playerIndex = dis->readByte();
m_playerSkinId = static_cast<std::uint32_t>(dis->readInt());
m_playerCapeId = static_cast<std::uint32_t>(dis->readInt());
m_isGuest = dis->readBoolean();
m_newSeaLevel = dis->readBoolean();
m_uiGamePrivileges = dis->readInt();
@@ -152,18 +149,12 @@ void LoginPacket::write(DataOutputStream *dos) //throws IOException
dos->writePlayerUID(m_offlineXuid);
dos->writePlayerUID(m_onlineXuid);
dos->writeBoolean(m_friendsOnlyUGC);
int ugcPlayersVersion = 0;
std::memcpy(&ugcPlayersVersion, &m_ugcPlayersVersion, sizeof(m_ugcPlayersVersion));
dos->writeInt(ugcPlayersVersion);
dos->writeInt(static_cast<int>(m_ugcPlayersVersion));
dos->writeByte((std::uint8_t)difficulty);
dos->writeInt(m_multiplayerInstanceId);
dos->writeByte((std::uint8_t)m_playerIndex);
int skinId = 0;
std::memcpy(&skinId, &m_playerSkinId, sizeof(m_playerSkinId));
dos->writeInt(skinId);
int capeId = 0;
std::memcpy(&capeId, &m_playerCapeId, sizeof(m_playerCapeId));
dos->writeInt(capeId);
dos->writeInt(static_cast<int>(m_playerSkinId));
dos->writeInt(static_cast<int>(m_playerCapeId));
dos->writeBoolean(m_isGuest);
dos->writeBoolean(m_newSeaLevel);
dos->writeInt(m_uiGamePrivileges);