diff options
Diffstat (limited to 'src/server/scripts')
| -rw-r--r-- | src/server/scripts/Commands/cs_lookup.cpp | 9 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_azerite.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_generic.cpp | 2 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_warlock.cpp | 2 |
4 files changed, 5 insertions, 10 deletions
diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp index cfd9b4fd99a..a53049d8a5b 100644 --- a/src/server/scripts/Commands/cs_lookup.cpp +++ b/src/server/scripts/Commands/cs_lookup.cpp @@ -684,8 +684,7 @@ public: if (handler->GetSession()) { int32 maxLevel = 0; - if (Optional<ContentTuningLevels> questLevels = sDB2Manager.GetContentTuningData(questTemplatePair.second.GetContentTuningId(), - handler->GetSession()->GetPlayer()->m_playerData->CtrOptions->ContentTuningConditionMask)) + if (Optional<ContentTuningLevels> questLevels = sDB2Manager.GetContentTuningData(questTemplatePair.second.GetContentTuningId())) maxLevel = questLevels->MaxLevel; int32 scalingFactionGroup = 0; @@ -744,8 +743,7 @@ public: if (handler->GetSession()) { int32 maxLevel = 0; - if (Optional<ContentTuningLevels> questLevels = sDB2Manager.GetContentTuningData(questTemplatePair.second.GetContentTuningId(), - handler->GetSession()->GetPlayer()->m_playerData->CtrOptions->ContentTuningConditionMask)) + if (Optional<ContentTuningLevels> questLevels = sDB2Manager.GetContentTuningData(questTemplatePair.second.GetContentTuningId())) maxLevel = questLevels->MaxLevel; int32 scalingFactionGroup = 0; @@ -814,8 +812,7 @@ public: if (handler->GetSession()) { int32 maxLevel = 0; - if (Optional<ContentTuningLevels> questLevels = sDB2Manager.GetContentTuningData(quest->GetContentTuningId(), - handler->GetSession()->GetPlayer()->m_playerData->CtrOptions->ContentTuningConditionMask)) + if (Optional<ContentTuningLevels> questLevels = sDB2Manager.GetContentTuningData(quest->GetContentTuningId())) maxLevel = questLevels->MaxLevel; int32 scalingFactionGroup = 0; diff --git a/src/server/scripts/Spells/spell_azerite.cpp b/src/server/scripts/Spells/spell_azerite.cpp index 760bcaa515a..794e588da9f 100644 --- a/src/server/scripts/Spells/spell_azerite.cpp +++ b/src/server/scripts/Spells/spell_azerite.cpp @@ -581,8 +581,6 @@ class spell_item_heart_of_azeroth : public AuraScript { if (Player* target = GetTarget()->ToPlayer()) { - target->ApplyAllAzeriteEmpoweredItemMods(equipped); - WorldPackets::Azerite::PlayerAzeriteItemEquippedStatusChanged statusChanged; statusChanged.IsHeartEquipped = equipped; target->SendDirectMessage(statusChanged.Write()); diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp index da6a028a78f..58a5770b025 100644 --- a/src/server/scripts/Spells/spell_generic.cpp +++ b/src/server/scripts/Spells/spell_generic.cpp @@ -5003,7 +5003,7 @@ class spell_gen_skinning : public SpellScript if (!contentTuning) return; - uint32 skinningSkill = player->GetProfessionSkillForExp(SKILL_SKINNING, contentTuning->ExpansionID); + uint32 skinningSkill = player->GetProfessionSkillForExp(SKILL_SKINNING, 0); if (!skinningSkill) return; diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index 59df174b3a0..3c57ad48ed9 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -159,7 +159,7 @@ class spell_warl_chaos_bolt : public SpellScript void HandleDummy(SpellEffIndex /*effIndex*/) { - SetHitDamage(GetHitDamage() + CalculatePct(GetHitDamage(), GetCaster()->ToPlayer()->m_activePlayerData->SpellCritPercentage)); + SetHitDamage(GetHitDamage() + CalculatePct(GetHitDamage(), GetCaster()->ToPlayer()->m_activePlayerData->SpellCritPercentage[0])); } void CalcCritChance(Unit const* /*victim*/, float& critChance) |