*Add better proc check for Glyph of death's Embrace - by Astellar

--HG--
branch : trunk

2 files changed, 12 insertions, 0 deletions

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 1481c5205d3..32b12cf76e2 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -2268,6 +2268,10 @@ void AuraEffect::TriggerSpell()
 
                         trigger_spell_id = 64418 + auraId - 53302;
 
+                        // If aura is active - no need to continue
+                        if (target->HasAura(trigger_spell_id))
+                            return;
+
                         break;
 //                    //Frost Trap Aura
 //                    case 13810:
diff --git a/src/game/Unit.cpp b/src/game/Unit.cpp
index bb5f65bc27d..d1e1ba821e2 100644
--- a/src/game/Unit.cpp
+++ b/src/game/Unit.cpp
@@ -7834,6 +7834,14 @@ bool Unit::HandleProcTriggerSpell(Unit *pVictim, uint32 damage, AuraEffect* trig
                 return false;
             break;
         }
+        // Glyph of Death's Embrace
+        case 58679:
+        {
+            // Proc only from healing part of Death Coil. Check is essential as all Death Coil spells have 0x2000 mask in SpellFamilyFlags
+            if (!procSpell || !(procSpell->SpellFamilyName == SPELLFAMILY_DEATHKNIGHT && procSpell->SpellFamilyFlags[0] == 0x80002000))
+                return false;
+            break;
+        }
         // Glyph of Death Grip
         case 58628:
         {