diff options
author | Shauren <shauren.trinity@gmail.com> | 2023-08-26 16:35:13 +0200 |
---|---|---|
committer | Shauren <shauren.trinity@gmail.com> | 2023-08-26 18:28:13 +0200 |
commit | c9751eb7375b1caaef37ac5fccd1b82fad1177fa (patch) | |
tree | 1604ecfd841bf4d4925a1e22413b70deec87eead /src | |
parent | 7b9493eec7c937642243c5ab0367f5ac8643879e (diff) |
Added changes missing from previous commit
Diffstat (limited to 'src')
-rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 | ||||
-rw-r--r-- | src/server/scripts/Spells/spell_paladin.cpp | 2 | ||||
-rw-r--r-- | src/server/scripts/Spells/spell_priest.cpp | 4 |
3 files changed, 2 insertions, 8 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 713d33eb30d..d6c3a0e3d51 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -947,13 +947,11 @@ bool Unit::HasBreakableByDamageCrowdControlAura(Unit* excludeCasterChannel) cons // absorb all damage by default uint32 currentAbsorb = damageInfo.GetDamage(); - uint32 tempAbsorb = uint32(currentAbsorb); - // This aura type is used both by Spirit of Redemption (death not really prevented, must grant all credit immediately) and Cheat Death (death prevented) // repurpose PreventDefaultAction for this bool deathFullyPrevented = false; - absorbAurEff->GetBase()->CallScriptEffectAbsorbHandlers(absorbAurEff, aurApp, damageInfo, tempAbsorb, deathFullyPrevented); + absorbAurEff->GetBase()->CallScriptEffectAbsorbHandlers(absorbAurEff, aurApp, damageInfo, currentAbsorb, deathFullyPrevented); // absorb must be smaller than the damage itself currentAbsorb = std::min(currentAbsorb, damageInfo.GetDamage()); diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp index 842454065b5..e6079efb253 100644 --- a/src/server/scripts/Spells/spell_paladin.cpp +++ b/src/server/scripts/Spells/spell_paladin.cpp @@ -152,8 +152,6 @@ class spell_pal_ardent_defender : public AuraScript { // we are currently below desired health // absorb everything and heal up - absorbAmount = dmgInfo.GetDamage(); - GetTarget()->CastSpell(GetTarget(), SPELL_PALADIN_ARDENT_DEFENDER_HEAL, CastSpellExtraArgs(aurEff) .AddSpellMod(SPELLVALUE_BASE_POINT0, int32(targetHealth - GetTarget()->GetHealth()))); diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp index 3e0d5b8a580..b960ea34070 100644 --- a/src/server/scripts/Spells/spell_priest.cpp +++ b/src/server/scripts/Spells/spell_priest.cpp @@ -2170,13 +2170,11 @@ class spell_pri_spirit_of_redemption : public AuraScript return ValidateSpellInfo({ SPELL_PRIEST_SPIRIT_OF_REDEMPTION }); } - void HandleAbsorb(AuraEffect* aurEff, DamageInfo& dmgInfo, uint32& absorbAmount) + void HandleAbsorb(AuraEffect const* aurEff, DamageInfo const& /*dmgInfo*/, uint32 const& /*absorbAmount*/) const { Unit* target = GetTarget(); target->CastSpell(target, SPELL_PRIEST_SPIRIT_OF_REDEMPTION, aurEff); target->SetFullHealth(); - - absorbAmount = dmgInfo.GetDamage(); } void Register() override |