Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Players: Fixed trait config validation

Browse Source 
Closes #28601
This commit is contained in:
Shauren
2022-12-30 22:54:13 +01:00
parent 9a96d32350
commit bb9907f019
3 changed files with 38 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sql/base/characters_database.sql
View File

@@ -3690,7 +3690,8 @@ INSERT INTO `updates` VALUES
('2022_11_20_00_characters.sql','4EB8BB24CAF16B0962DF3EF92C77BE05E234CFA6','ARCHIVED','2022-11-20 11:05:20',0),
('2022_12_16_00_characters.sql','36D6220143109ECD37219CC4A84773B31EAE9E50','ARCHIVED','2022-12-16 22:52:19',0),
('2022_12_17_00_characters.sql','3E005BD6B9C60653749B0B3C19CBC497092B9CCB','ARCHIVED','2022-12-17 18:26:43',0),
('2022_12_20_00_characters.sql','75A37A085AF1B953926E4352E439C7916B290924','ARCHIVED','2022-12-20 03:10:07',0);
('2022_12_20_00_characters.sql','75A37A085AF1B953926E4352E439C7916B290924','ARCHIVED','2022-12-20 03:10:07',0),
('2022_12_30_00_characters.sql','5F90C2BFFBB8F6CE0A3327A2CAABCD5CA3C2BA60','RELEASED','2022-12-30 22:50:16',0);
/*!40000 ALTER TABLE `updates` ENABLE KEYS */;
UNLOCK TABLES;

3
sql/updates/characters/master/2022_12_30_00_characters.sql Normal file
View File

@@ -0,0 +1,3 @@
-- delete corrupted trait configs
DELETE FROM `character_trait_entry`;
DELETE FROM `character_trait_config`;

48
src/server/game/Spells/TraitMgr.cpp
View File

@@ -454,8 +454,15 @@ bool MeetsTraitCondition(WorldPackets::Traits::TraitConfig const& traitConfig, P
if (condition->AchievementID && !player->HasAchieved(condition->AchievementID))
return false;
if (condition->SpecSetID && !sDB2Manager.IsSpecSetMember(condition->SpecSetID, player->GetPrimarySpecialization()))
return false;
if (condition->SpecSetID)
{
uint32 chrSpecializationId = player->GetPrimarySpecialization();
if (traitConfig.Type == TraitConfigType::Combat)
chrSpecializationId = traitConfig.ChrSpecializationID;
if (!sDB2Manager.IsSpecSetMember(condition->SpecSetID, chrSpecializationId))
return false;
}
if (condition->TraitCurrencyID && condition->SpentAmountRequired)
{
@@ -587,6 +594,23 @@ TalentLearnResult ValidateConfig(WorldPackets::Traits::TraitConfig const& traitC
Optional<std::map<int32, int32>> spentCurrencies;
FillSpentCurrenciesMap(traitConfig, spentCurrencies.emplace());
auto meetsConditions = [&](std::vector<TraitCondEntry const*> const& conditions)
{
bool hasConditions = false;
for (TraitCondEntry const* condition : conditions)
{
if (condition->GetCondType() == TraitConditionType::Available || condition->GetCondType() == TraitConditionType::Visible)
{
if (MeetsTraitCondition(traitConfig, player, condition, spentCurrencies))
return true;
hasConditions = true;
}
}
return !hasConditions;
};
for (WorldPackets::Traits::TraitEntry const& traitEntry : traitConfig.Entries)
{
if (!IsValidEntry(traitEntry))
@@ -598,21 +622,15 @@ TalentLearnResult ValidateConfig(WorldPackets::Traits::TraitConfig const& traitC
return TALENT_FAILED_UNKNOWN;
for (NodeEntry const& entry : node->Entries)
for (TraitCondEntry const* condition : entry.Conditions)
if ((condition->GetCondType() == TraitConditionType::Available || condition->GetCondType() == TraitConditionType::Visible)
&& !MeetsTraitCondition(traitConfig, player, condition, spentCurrencies))
return TALENT_FAILED_UNKNOWN;
for (TraitCondEntry const* condition : node->Conditions)
if ((condition->GetCondType() == TraitConditionType::Available || condition->GetCondType() == TraitConditionType::Visible)
&& !MeetsTraitCondition(traitConfig, player, condition, spentCurrencies))
if (!meetsConditions(entry.Conditions))
return TALENT_FAILED_UNKNOWN;
if (!meetsConditions(node->Conditions))
return TALENT_FAILED_UNKNOWN;
for (NodeGroup const* group : node->Groups)
for (TraitCondEntry const* condition : group->Conditions)
if ((condition->GetCondType() == TraitConditionType::Available || condition->GetCondType() == TraitConditionType::Visible)
&& !MeetsTraitCondition(traitConfig, player, condition, spentCurrencies))
return TALENT_FAILED_UNKNOWN;
if (!meetsConditions(group->Conditions))
return TALENT_FAILED_UNKNOWN;
if (!node->ParentNodes.empty())
{
@@ -721,7 +739,7 @@ void InitializeStarterBuildTraitConfig(WorldPackets::Traits::TraitConfig& traitC
newEntry.Rank = addedRanks;
if (!HasEnoughCurrency(newEntry, currencies))
break;
continue;
if (entryInConfig)
entryInConfig->Rank += addedRanks;