aboutsummaryrefslogtreecommitdiff
path: root/src/server/scripts
diff options
context:
space:
mode:
authorMaxtorCoder <warsongkiller.s8@gmail.com>2024-03-13 21:16:18 +0100
committerGitHub <noreply@github.com>2024-03-13 21:16:18 +0100
commitcfc9cc9ec285e7934f3160047ff87be3c649594f (patch)
treebe680d4f88fac55274862251c349c644a5d90930 /src/server/scripts
parent46d929cb82b631648ef4a84e75ca7bc174a03fdd (diff)
Core/PacketIO: Update to 4.4.0.53627 (#29805)
* Core/PacketIO: Update to 4.4.0.53627 * Core/IO: Remove duplicate declaration of PetSpellDataID * Core/IO: Assign STATUS_UNHANDLED to some azerite packets
Diffstat (limited to 'src/server/scripts')
-rw-r--r--src/server/scripts/Commands/cs_lookup.cpp9
-rw-r--r--src/server/scripts/Spells/spell_warlock.cpp3
2 files changed, 5 insertions, 7 deletions
diff --git a/src/server/scripts/Commands/cs_lookup.cpp b/src/server/scripts/Commands/cs_lookup.cpp
index cfd9b4fd99a..354820cb2ec 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(), 0))
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(), 0))
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(), 0))
maxLevel = questLevels->MaxLevel;
int32 scalingFactionGroup = 0;
diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
index 2b131d686f2..a13eaa70265 100644
--- a/src/server/scripts/Spells/spell_warlock.cpp
+++ b/src/server/scripts/Spells/spell_warlock.cpp
@@ -158,9 +158,10 @@ class spell_warl_chaos_bolt : public SpellScript
return GetCaster()->GetTypeId() == TYPEID_PLAYER;
}
+ // @TODO: Fix for 4.4.0
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)