From 82d98f9fb7674f0b2f98170e74ecbd66cbd1e287 Mon Sep 17 00:00:00 2001 From: Andrew <47818697+Nyeriah@users.noreply.github.com> Date: Fri, 22 Aug 2025 22:25:15 -0300 Subject: [PATCH] =?UTF-8?q?chore(Core/Player):=20Change=20player=20setting?= =?UTF-8?q?=20index=20type=20from=20uint8=20to=20ui=E2=80=A6=20(#22716)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/Entities/Player/Player.h | 4 ++-- src/server/game/Entities/Player/PlayerSettings.cpp | 6 +++--- src/server/game/Entities/Player/PlayerSettings.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index 16a97177e..ae6b6767c 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -2641,8 +2641,8 @@ public: std::string GetPlayerName(); // Settings - [[nodiscard]] PlayerSetting GetPlayerSetting(std::string const& source, uint8 index); - void UpdatePlayerSetting(std::string const& source, uint8 index, uint32 value); + [[nodiscard]] PlayerSetting GetPlayerSetting(std::string const& source, uint32 index); + void UpdatePlayerSetting(std::string const& source, uint32 index, uint32 value); void SendSystemMessage(std::string_view msg, bool escapeCharacters = false); diff --git a/src/server/game/Entities/Player/PlayerSettings.cpp b/src/server/game/Entities/Player/PlayerSettings.cpp index 89b719d71..1fd4aae3a 100644 --- a/src/server/game/Entities/Player/PlayerSettings.cpp +++ b/src/server/game/Entities/Player/PlayerSettings.cpp @@ -80,7 +80,7 @@ namespace PlayerSettingsStore return result; } - void UpdateSetting(uint32 playerLowGuid, std::string const& source, uint8 index, uint32 value) + void UpdateSetting(uint32 playerLowGuid, std::string const& source, uint32 index, uint32 value) { if (!sWorld->getBoolConfig(CONFIG_PLAYER_SETTINGS_ENABLED)) return; @@ -129,7 +129,7 @@ void Player::_LoadCharacterSettings(PreparedQueryResult result) } while (result->NextRow()); } -PlayerSetting Player::GetPlayerSetting(std::string const& source, uint8 index) +PlayerSetting Player::GetPlayerSetting(std::string const& source, uint32 index) { auto it = m_charSettingsMap.find(source); if (it == m_charSettingsMap.end() || static_cast(index) >= it->second.size()) @@ -156,7 +156,7 @@ void Player::_SavePlayerSettings(CharacterDatabaseTransaction trans) } } -void Player::UpdatePlayerSetting(std::string const& source, uint8 index, uint32 value) +void Player::UpdatePlayerSetting(std::string const& source, uint32 index, uint32 value) { auto it = m_charSettingsMap.find(source); size_t const requiredSize = static_cast(index) + 1; diff --git a/src/server/game/Entities/Player/PlayerSettings.h b/src/server/game/Entities/Player/PlayerSettings.h index 612225114..4e0c96135 100644 --- a/src/server/game/Entities/Player/PlayerSettings.h +++ b/src/server/game/Entities/Player/PlayerSettings.h @@ -57,7 +57,7 @@ namespace PlayerSettingsStore { // Update a single setting value for any player by GUID (works for online or offline players). // This reads the existing "source" row from character_settings, adjusts the index, and REPLACE's it back. - void UpdateSetting(uint32 playerLowGuid, std::string const& source, uint8 index, uint32 value); + void UpdateSetting(uint32 playerLowGuid, std::string const& source, uint32 index, uint32 value); // Common helpers for parsing and serializing settings data PlayerSettingVector ParseSettingsData(std::string const& data);