diff options
| author | Michael <michaelneubert1988@gmail.com> | 2014-06-05 19:42:48 +0200 |
|---|---|---|
| committer | Michael <michaelneubert1988@gmail.com> | 2014-06-05 19:42:48 +0200 |
| commit | 83c2e79d52a57ec670b439ed6f822dd18e0ac55e (patch) | |
| tree | 774cb4f6a175e60ca979772559efa60411e9eff4 /src/server/game/Spells/SpellMgr.cpp | |
| parent | 289a5c4318c5509eafeb36389a81bddc2ed349ca (diff) | |
| parent | 36102bea64d536b6ac04ac728c64321cfc5e55f2 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/scripts/Spells/spell_paladin.cpp
Diffstat (limited to 'src/server/game/Spells/SpellMgr.cpp')
| -rw-r--r-- | src/server/game/Spells/SpellMgr.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/server/game/Spells/SpellMgr.cpp b/src/server/game/Spells/SpellMgr.cpp index 33a2bd2d41a..218f7b5a37d 100644 --- a/src/server/game/Spells/SpellMgr.cpp +++ b/src/server/game/Spells/SpellMgr.cpp @@ -3244,6 +3244,9 @@ void SpellMgr::LoadSpellInfoCorrections() case 63675: // Improved Devouring Plague spellInfo->AttributesEx3 |= SPELL_ATTR3_NO_DONE_BONUS; break; + case 12721: // Deep Wounds shouldnt ignore resillience or damage taken auras because its damage is not based off a spell. + spellInfo->AttributesEx4 = 0; + break; case 8145: // Tremor Totem (instant pulse) case 6474: // Earthbind Totem (instant pulse) spellInfo->AttributesEx5 |= SPELL_ATTR5_START_PERIODIC_AT_APPLY; |