*Merge.

--HG--
branch : trunk

1 files changed, 36 insertions, 0 deletions

diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index d369426e1cb..a7fdab050e0 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -6731,6 +6731,42 @@ bool Unit::HandleDummyAuraProc(Unit *pVictim, uint32 damage, AuraEffect* trigger
                 CastCustomSpell(this,45470,&heal,NULL,NULL,true);
                 return true;
             }
+            // Sudden Doom
+            if (dummySpell->SpellIconID == 1939 && GetTypeId() == TYPEID_PLAYER)
+            {
+                SpellChainNode const* chain = NULL;
+                // get highest rank of the Death Coil spell
+                const PlayerSpellMap& sp_list = ((Player*)this)->GetSpellMap();
+                for (PlayerSpellMap::const_iterator itr = sp_list.begin(); itr != sp_list.end(); ++itr)
+                {
+                    // check if shown in spell book
+                    if(!itr->second->active || itr->second->disabled || itr->second->state == PLAYERSPELL_REMOVED)
+                        continue;
+
+                    SpellEntry const *spellProto = sSpellStore.LookupEntry(itr->first);
+                    if (!spellProto)
+                        continue;
+
+                    if (spellProto->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT
+                        && spellProto->SpellFamilyFlags[0] & 0x2000)
+                    {
+                        SpellChainNode const* newChain = spellmgr.GetSpellChainNode(itr->first);
+
+                        // No chain entry or entry lower than found entry
+                        if (!chain || !newChain || (chain->rank < newChain->rank))
+                        {
+                            triggered_spell_id = itr->first;
+                            chain = newChain;
+                        }
+                        else
+                            continue;
+                        // Found spell is last in chain - do not need to look more
+                        // Optimisation for most common case
+                        if (chain && chain->last == itr->first)
+                            break;
+                    }
+                }
+            }
             break;
         }
         case SPELLFAMILY_POTION: