From 624881bef5c90a91e4c59e5bf404d8775c2ca55d Mon Sep 17 00:00:00 2001 From: Shauren Date: Tue, 2 Mar 2021 21:32:48 +0100 Subject: Core/Spells: Refactor Player::ApplySpellMod to take SpellInfo argument instead of just spell id --- src/server/scripts/Spells/spell_warlock.cpp | 2 +- src/server/scripts/World/duel_reset.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp index c8ef3fdf238..4f401a5823b 100644 --- a/src/server/scripts/Spells/spell_warlock.cpp +++ b/src/server/scripts/Spells/spell_warlock.cpp @@ -373,7 +373,7 @@ class spell_warl_health_funnel : public SpellScriptLoader uint32 damage = caster->CountPctFromMaxHealth(aurEff->GetBaseAmount()); if (Player* modOwner = caster->GetSpellModOwner()) - modOwner->ApplySpellMod(GetId(), SPELLMOD_COST, damage); + modOwner->ApplySpellMod(GetSpellInfo(), SPELLMOD_COST, damage); SpellNonMeleeDamage damageInfo(caster, caster, GetSpellInfo(), GetAura()->GetSpellVisual(), GetSpellInfo()->SchoolMask, GetAura()->GetCastGUID()); damageInfo.periodicLog = true; diff --git a/src/server/scripts/World/duel_reset.cpp b/src/server/scripts/World/duel_reset.cpp index 58946c4475d..5ddd5f7a081 100644 --- a/src/server/scripts/World/duel_reset.cpp +++ b/src/server/scripts/World/duel_reset.cpp @@ -98,13 +98,13 @@ class DuelResetScript : public PlayerScript int32 totalCooldown = spellInfo->RecoveryTime; int32 categoryCooldown = spellInfo->CategoryRecoveryTime; - player->ApplySpellMod(spellInfo->Id, SPELLMOD_COOLDOWN, totalCooldown, nullptr); + player->ApplySpellMod(spellInfo, SPELLMOD_COOLDOWN, totalCooldown, nullptr); if (int32 cooldownMod = player->GetTotalAuraModifier(SPELL_AURA_MOD_COOLDOWN)) totalCooldown += cooldownMod * IN_MILLISECONDS; if (!spellInfo->HasAttribute(SPELL_ATTR6_IGNORE_CATEGORY_COOLDOWN_MODS)) - player->ApplySpellMod(spellInfo->Id, SPELLMOD_COOLDOWN, categoryCooldown, nullptr); + player->ApplySpellMod(spellInfo, SPELLMOD_COOLDOWN, categoryCooldown, nullptr); return remainingCooldown > 0 && !itr->second.OnHold -- cgit v1.2.3