diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp index 7be7ebcb9..522f2aa56 100644 --- a/src/game/SpellAuras.cpp +++ b/src/game/SpellAuras.cpp @@ -6186,18 +6186,14 @@ void Aura::HandleSpellSpecificBoosts(bool apply) } case SPELLFAMILY_DEATHKNIGHT: { - if (GetSpellSpecific(m_spellProto->Id) != SPELL_PRESENCE) - return; - - // Frost Presence health - if (GetId() == 48263) - spellId1 = 61261; - // Unholy Presence move speed - else if (GetId() == 48265) - spellId1 = 49772; - else - return; - + // second part of spell apply + switch (GetId()) + { + case 49039: spellId1 = 50397; break; // Lichborne + case 48263: spellId1 = 61261; break; // Frost Presence + case 48265: spellId1 = 49772; break; // Unholy Presence move speed + default: return; + } break; } default: diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index 54652d42f..d414966fa 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -1730,6 +1730,10 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons case SPELLFAMILY_DEATHKNIGHT: if (spellInfo_2->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT) { + // Lichborne and Lichborne (triggered) + if( spellInfo_1->SpellIconID == 61 && spellInfo_2->SpellIconID == 61 ) + return false; + // Frost Presence and Frost Presence (triggered) if( spellInfo_1->SpellIconID == 2632 && spellInfo_2->SpellIconID == 2632 ) return false; diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index 6fb964925..c3c670bf8 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "9238" + #define REVISION_NR "9239" #endif // __REVISION_NR_H__