diff options
| author | Aqua Deus <95978183+aquadeus@users.noreply.github.com> | 2022-02-16 00:00:55 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-16 00:00:55 +0100 |
| commit | f12f3a972ff12168f07cee655077cc819b6dcaa2 (patch) | |
| tree | 26652852fad422c117c4affdf6f248ee148deda4 | |
| parent | c378572717c443758e4a7d71e98057bf01697f36 (diff) | |
Core/Auras: Implement SPELL_AURA_MOD_ENVIRONMENTAL_DAMAGE_TAKEN (#27781)
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraDefines.h | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 2 |
3 files changed, 4 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index ea0eeaf2e32..da41e6bfa72 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -645,6 +645,8 @@ uint32 Player::EnvironmentalDamage(EnviromentalDamage type, uint32 damage) if (IsImmuneToEnvironmentalDamage()) return 0; + damage *= GetTotalAuraMultiplier(SPELL_AURA_MOD_ENVIRONMENTAL_DAMAGE_TAKEN); + // Absorb, resist some environmental damage type uint32 absorb = 0; uint32 resist = 0; diff --git a/src/server/game/Spells/Auras/SpellAuraDefines.h b/src/server/game/Spells/Auras/SpellAuraDefines.h index 6ec0e1fb3f0..70174e773ab 100644 --- a/src/server/game/Spells/Auras/SpellAuraDefines.h +++ b/src/server/game/Spells/Auras/SpellAuraDefines.h @@ -527,7 +527,7 @@ enum AuraType : uint32 SPELL_AURA_433 = 433, SPELL_AURA_434 = 434, SPELL_AURA_435 = 435, - SPELL_AURA_MOD_ENVIRONMENTAL_DAMAGE_TAKEN = 436, // NYI + SPELL_AURA_MOD_ENVIRONMENTAL_DAMAGE_TAKEN = 436, SPELL_AURA_MOD_MINIMUM_SPEED_RATE = 437, SPELL_AURA_PRELOAD_PHASE = 438, // NYI SPELL_AURA_439 = 439, diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index ad9da3f82df..468c97ac299 100644 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -502,7 +502,7 @@ NonDefaultConstructible<pAuraEffectHandler> AuraEffectHandler[TOTAL_AURAS]= &AuraEffect::HandleNULL, //433 &AuraEffect::HandleNULL, //434 &AuraEffect::HandleNULL, //435 - &AuraEffect::HandleNULL, //436 SPELL_AURA_MOD_ENVIRONMENTAL_DAMAGE_TAKEN + &AuraEffect::HandleNoImmediateEffect, //436 SPELL_AURA_MOD_ENVIRONMENTAL_DAMAGE_TAKEN implemented in Player::EnvironmentalDamage &AuraEffect::HandleAuraModMinimumSpeedRate, //437 SPELL_AURA_MOD_MINIMUM_SPEED_RATE &AuraEffect::HandleNULL, //438 SPELL_AURA_PRELOAD_PHASE &AuraEffect::HandleNULL, //439 |