From b1de3b90656d92ce63de976d685c04d5e4cc18d2 Mon Sep 17 00:00:00 2001
From: notmatthewbeshay <92357869+NotMachow@users.noreply.github.com>
Date: Tue, 10 Mar 2026 07:27:27 +1100
Subject: [PATCH] Remove DWORD player indices from player state

---
 Minecraft.Client/Network/PlayerList.cpp | 7 ++++---
 Minecraft.World/Player/Player.h         | 6 +++---
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Minecraft.Client/Network/PlayerList.cpp b/Minecraft.Client/Network/PlayerList.cpp
index 7299f00a3..c26079a16 100644
--- a/Minecraft.Client/Network/PlayerList.cpp
+++ b/Minecraft.Client/Network/PlayerList.cpp
@@ -1,4 +1,5 @@
 #include "../Platform/stdafx.h"
+#include <cstdint>
 #include "PlayerList.h"
 #include "PlayerChunkMap.h"
 #include "../MinecraftServer.h"
@@ -105,7 +106,7 @@ void PlayerList::placeNewPlayer(Connection *connection, std::shared_ptr<ServerPl
 
         ServerLevel *level = server->getLevel(player->dimension);
 
-		DWORD playerIndex = 0;
+		std::uint8_t playerIndex = 0;
 		{
 			bool usedIndexes[MINECRAFT_NET_MAX_PLAYERS];
 			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(),
 																		(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() ) ) );
         playerConnection->send( std::shared_ptr<SetSpawnPositionPacket>( new SetSpawnPositionPacket(spawnPos->x, spawnPos->y, spawnPos->z) ) );
 		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;
 
 	EDefaultSkins skin = serverPlayer->getPlayerDefaultSkin();
-	DWORD playerIndex = serverPlayer->getPlayerIndex();
+	std::uint8_t playerIndex = serverPlayer->getPlayerIndex();
 
 	PlayerUID playerXuid = serverPlayer->getXuid();
 	PlayerUID playerOnlineXuid = serverPlayer->getOnlineXuid();
diff --git a/Minecraft.World/Player/Player.h b/Minecraft.World/Player/Player.h
index 408b33f6a..dfd125601 100644
--- a/Minecraft.World/Player/Player.h
+++ b/Minecraft.World/Player/Player.h
@@ -414,8 +414,8 @@ public:
 	void setUUID(const std::wstring &UUID)															{ m_UUID = UUID; }
 	std::wstring getUUID()																			{ return m_UUID; }
 
-	void setPlayerIndex(DWORD dwIndex)														{ m_playerIndex = dwIndex; }
-	DWORD getPlayerIndex()																	{ return m_playerIndex; }
+	void setPlayerIndex(std::uint8_t index)													{ m_playerIndex = index; }
+	std::uint8_t getPlayerIndex()															{ return m_playerIndex; }
 
 	void setIsGuest(bool bVal)																{ m_bIsGuest = bVal; }
 	bool isGuest()																			{ return m_bIsGuest; }
@@ -440,7 +440,7 @@ private:
 	std::uint32_t m_dwSkinId,m_dwCapeId;
 
 	// 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
 	unsigned int m_uiDebugOptions;