backups/4jcraft
2
0
Fork 0
mirror of https://github.com/4jcraft/4jcraft.git synced 2026-08-02 16:22:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove DWORD player indices from player state

Browse source
This commit is contained in:
notmatthewbeshay 2026-03-10 07:27:27 +11:00
parent 3f374cecad
commit b1de3b9065
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Minecraft.Client/Network/PlayerList.cpp
View file

@ -1,4 +1,5 @@
#include "../Platform/stdafx.h" #include "../Platform/stdafx.h"
#include <cstdint>
#include "PlayerList.h" #include "PlayerList.h"
#include "PlayerChunkMap.h" #include "PlayerChunkMap.h"
#include "../MinecraftServer.h" #include "../MinecraftServer.h"
@ -105,7 +106,7 @@ void PlayerList::placeNewPlayer(Connection *connection, std::shared_ptr<ServerPl
ServerLevel *level = server->getLevel(player->dimension); ServerLevel *level = server->getLevel(player->dimension);
DWORD playerIndex = 0; std::uint8_t playerIndex = 0;
{ {
bool usedIndexes[MINECRAFT_NET_MAX_PLAYERS]; bool usedIndexes[MINECRAFT_NET_MAX_PLAYERS];
ZeroMemory( &usedIndexes, MINECRAFT_NET_MAX_PLAYERS * sizeof(bool) ); ZeroMemory( &usedIndexes, MINECRAFT_NET_MAX_PLAYERS * sizeof(bool) );
@ -211,7 +212,7 @@ void PlayerList::placeNewPlayer(Connection *connection, std::shared_ptr<ServerPl
playerConnection->send( std::shared_ptr<LoginPacket>( new LoginPacket(L"", player->entityId, level->getLevelData()->getGenerator(), level->getSeed(), player->gameMode->getGameModeForPlayer()->getId(), playerConnection->send( std::shared_ptr<LoginPacket>( new LoginPacket(L"", player->entityId, level->getLevelData()->getGenerator(), level->getSeed(), player->gameMode->getGameModeForPlayer()->getId(),
(uint8_t) level->dimension->id, (uint8_t) level->getMaxBuildHeight(), (uint8_t) getMaxPlayers(), (uint8_t) level->dimension->id, (uint8_t) level->getMaxBuildHeight(), (uint8_t) getMaxPlayers(),
level->difficulty, TelemetryManager->GetMultiplayerInstanceID(), (BYTE)playerIndex, level->useNewSeaLevel(), player->getAllPlayerGamePrivileges(), level->difficulty, TelemetryManager->GetMultiplayerInstanceID(), playerIndex, level->useNewSeaLevel(), player->getAllPlayerGamePrivileges(),
level->getLevelData()->getXZSize(), level->getLevelData()->getHellScale() ) ) ); level->getLevelData()->getXZSize(), level->getLevelData()->getHellScale() ) ) );
playerConnection->send( std::shared_ptr<SetSpawnPositionPacket>( new SetSpawnPositionPacket(spawnPos->x, spawnPos->y, spawnPos->z) ) ); playerConnection->send( std::shared_ptr<SetSpawnPositionPacket>( new SetSpawnPositionPacket(spawnPos->x, spawnPos->y, spawnPos->z) ) );
playerConnection->send( std::shared_ptr<PlayerAbilitiesPacket>( new PlayerAbilitiesPacket(&player->abilities)) ); playerConnection->send( std::shared_ptr<PlayerAbilitiesPacket>( new PlayerAbilitiesPacket(&player->abilities)) );
@ -535,7 +536,7 @@ std::shared_ptr<ServerPlayer> PlayerList::respawn(std::shared_ptr<ServerPlayer>
serverPlayer->dimension = targetDimension; serverPlayer->dimension = targetDimension;
EDefaultSkins skin = serverPlayer->getPlayerDefaultSkin(); EDefaultSkins skin = serverPlayer->getPlayerDefaultSkin();
DWORD playerIndex = serverPlayer->getPlayerIndex(); std::uint8_t playerIndex = serverPlayer->getPlayerIndex();
PlayerUID playerXuid = serverPlayer->getXuid(); PlayerUID playerXuid = serverPlayer->getXuid();
PlayerUID playerOnlineXuid = serverPlayer->getOnlineXuid(); PlayerUID playerOnlineXuid = serverPlayer->getOnlineXuid();

6
Minecraft.World/Player/Player.h
View file

@ -414,8 +414,8 @@ public:
void setUUID(const std::wstring &UUID) { m_UUID = UUID; } void setUUID(const std::wstring &UUID) { m_UUID = UUID; }
std::wstring getUUID() { return m_UUID; } std::wstring getUUID() { return m_UUID; }
void setPlayerIndex(DWORD dwIndex) { m_playerIndex = dwIndex; } void setPlayerIndex(std::uint8_t index) { m_playerIndex = index; }
DWORD getPlayerIndex() { return m_playerIndex; } std::uint8_t getPlayerIndex() { return m_playerIndex; }
void setIsGuest(bool bVal) { m_bIsGuest = bVal; } void setIsGuest(bool bVal) { m_bIsGuest = bVal; }
bool isGuest() { return m_bIsGuest; } bool isGuest() { return m_bIsGuest; }
@ -440,7 +440,7 @@ private:
std::uint32_t m_dwSkinId,m_dwCapeId; std::uint32_t m_dwSkinId,m_dwCapeId;
// 4J Added - Used to show which colour the player is on the map/behind their name // 4J Added - Used to show which colour the player is on the map/behind their name
DWORD m_playerIndex; std::uint8_t m_playerIndex;
// 4J-PB - to track debug options from the server player // 4J-PB - to track debug options from the server player
unsigned int m_uiDebugOptions; unsigned int m_uiDebugOptions;