From 79e0468af668529b440f18c893825613b4375831 Mon Sep 17 00:00:00 2001
From: QAston <none@none>
Date: Tue, 14 Jul 2009 13:35:29 +0200
Subject: [PATCH] *Add better proc check for Glyph of death's Embrace - by
 Astellar

--HG--
branch : trunk
---
 src/game/SpellAuras.cpp |  4 ++++
 src/game/Unit.cpp       |  8 ++++++++
 win/VC90/game.vcproj    | 24 ++++++++++++------------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 1481c5205d..32b12cf76e 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 bb5f65bc27..d1e1ba821e 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:
         {
diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj
index dfa1578597..f67bb2f515 100644
--- a/win/VC90/game.vcproj
+++ b/win/VC90/game.vcproj
@@ -991,18 +991,6 @@
 				>
 			</File>
 		</Filter>
-		<Filter
-			Name="AuctionHouseBot"
-			>
-			<File
-				RelativePath="..\..\src\game\AuctionHouseBot.cpp"
-				>
-			</File>
-			<File
-				RelativePath="..\..\src\game\AuctionHouseBot.h"
-				>
-			</File>
-		</Filter>
 		<Filter
 			Name="Object"
 			>
@@ -1338,6 +1326,18 @@
 				RelativePath="..\..\src\game\ZoneScript.h"
 				>
 			</File>
+			<Filter
+				Name="AuctionHouseBot"
+				>
+				<File
+					RelativePath="..\..\src\game\AuctionHouseBot.cpp"
+					>
+				</File>
+				<File
+					RelativePath="..\..\src\game\AuctionHouseBot.h"
+					>
+				</File>
+			</Filter>
 		</Filter>
 		<Filter
 			Name="Server"