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

Core/Spells: Refactor Player::ApplySpellMod to take SpellInfo argument instead of just spell id

Browse Source
This commit is contained in:
Shauren
2021-03-02 21:32:48 +01:00
parent 49532eda5f
commit 624881bef5
12 changed files with 68 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/scripts/Spells/spell_warlock.cpp
View File

@@ -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;

4
src/server/scripts/World/duel_reset.cpp
View File

@@ -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