diff options
| author | Shauren <shauren.trinity@gmail.com> | 2024-08-16 00:03:22 +0200 |
|---|---|---|
| committer | Shauren <shauren.trinity@gmail.com> | 2024-08-16 00:03:22 +0200 |
| commit | df1ec76d54db3a91759fc93f4d6b6828d4ec0f59 (patch) | |
| tree | 824cd4bc52735c0e23996d9852b9f608b0ab4cfc /src/server/game/Spells | |
| parent | 3429871a07c1c1ebe2bd94cb771ef187cb46fd46 (diff) | |
Core: Updated to 11.0.2
Diffstat (limited to 'src/server/game/Spells')
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 1 | ||||
| -rw-r--r-- | src/server/game/Spells/TraitMgr.cpp | 8 |
2 files changed, 1 insertions, 8 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index 0d7d98afc25..7e917275510 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -5094,7 +5094,6 @@ void AuraEffect::HandleForceReaction(AuraApplication const* aurApp, uint8 mode, ReputationRank factionRank = ReputationRank(GetAmount()); player->GetReputationMgr().ApplyForceReaction(factionId, factionRank, apply); - player->GetReputationMgr().SendForceReactions(); // stop fighting at apply (if forced rank friendly) or at remove (if real rank friendly) if ((apply && factionRank >= REP_FRIENDLY) || (!apply && player->GetReputationRank(factionId) >= REP_FRIENDLY)) diff --git a/src/server/game/Spells/TraitMgr.cpp b/src/server/game/Spells/TraitMgr.cpp index 64df1f2d0de..7733a0ac2dc 100644 --- a/src/server/game/Spells/TraitMgr.cpp +++ b/src/server/game/Spells/TraitMgr.cpp @@ -540,13 +540,7 @@ bool MeetsTraitCondition(WorldPackets::Traits::TraitConfig const& traitConfig, P if (!cachedCurrencies) FillSpentCurrenciesMap(traitConfig, cachedCurrencies.emplace()); - if (condition->TraitNodeGroupID) - { - auto itr = cachedCurrencies->try_emplace(condition->TraitCurrencyID, 0).first; - if (itr->second < condition->SpentAmountRequired) - return false; - } - else if (condition->TraitNodeID) + if (condition->TraitNodeGroupID || condition->TraitNodeID || condition->TraitNodeEntryID) { auto itr = cachedCurrencies->try_emplace(condition->TraitCurrencyID, 0).first; if (itr->second < condition->SpentAmountRequired) |