aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/TraitHandler.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2025-10-10 16:21:55 +0200
committerShauren <shauren.trinity@gmail.com>2025-10-10 16:21:55 +0200
commit53068a94e88991ae7196fb247df4b7ca2e47e554 (patch)
tree42afe6e6160b0317f72ddec25562988145d7a5ff /src/server/game/Handlers/TraitHandler.cpp
parenta7d825c6deb2711392956abac2d494a8731f58c3 (diff)
Core: Updated to 11.2.5.63704
Diffstat (limited to 'src/server/game/Handlers/TraitHandler.cpp')
-rw-r--r--src/server/game/Handlers/TraitHandler.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/server/game/Handlers/TraitHandler.cpp b/src/server/game/Handlers/TraitHandler.cpp
index 086e25bc0b4..f26d04c75b6 100644
--- a/src/server/game/Handlers/TraitHandler.cpp
+++ b/src/server/game/Handlers/TraitHandler.cpp
@@ -156,19 +156,19 @@ void WorldSession::HandleClassTalentsRequestNewConfig(WorldPackets::Traits::Clas
{
return static_cast<TraitConfigType>(*traitConfig.Type) == TraitConfigType::Combat
&& (static_cast<TraitCombatConfigFlags>(*traitConfig.CombatConfigFlags) & TraitCombatConfigFlags::ActiveForSpec) == TraitCombatConfigFlags::None;
- });
+ }, [](auto const& pair) -> UF::TraitConfig const& { return pair.second.value; });
if (configCount >= TraitMgr::MAX_COMBAT_TRAIT_CONFIGS)
return;
auto findFreeLocalIdentifier = [&]()
{
int32 index = 1;
- while (_player->m_activePlayerData->TraitConfigs.FindIndexIf([&](UF::TraitConfig const& traitConfig)
+ while (_player->m_activePlayerData->TraitConfigs.FindIf([&](UF::TraitConfig const& traitConfig)
{
return static_cast<TraitConfigType>(*traitConfig.Type) == TraitConfigType::Combat
&& traitConfig.ChrSpecializationID == int32(_player->GetPrimarySpecialization())
&& traitConfig.LocalIdentifier == index;
- }) >= 0)
+ }).first)
++index;
return index;
@@ -228,12 +228,12 @@ void WorldSession::HandleClassTalentsSetStarterBuildActive(WorldPackets::Traits:
auto findFreeLocalIdentifier = [&]()
{
int32 index = 1;
- while (_player->m_activePlayerData->TraitConfigs.FindIndexIf([&](UF::TraitConfig const& traitConfig)
+ while (_player->m_activePlayerData->TraitConfigs.FindIf([&](UF::TraitConfig const& traitConfig)
{
return static_cast<TraitConfigType>(*traitConfig.Type) == TraitConfigType::Combat
&& traitConfig.ChrSpecializationID == int32(_player->GetPrimarySpecialization())
&& traitConfig.LocalIdentifier == index;
- }) >= 0)
+ }).first)
++index;
return index;