diff options
| -rw-r--r-- | src/game/SpellAuras.cpp | 4 | ||||
| -rw-r--r-- | src/game/Unit.cpp | 8 | ||||
| -rw-r--r-- | 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 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: { diff --git a/win/VC90/game.vcproj b/win/VC90/game.vcproj index dfa15785972..f67bb2f5155 100644 --- a/win/VC90/game.vcproj +++ b/win/VC90/game.vcproj @@ -992,18 +992,6 @@ </File> </Filter> <Filter - Name="AuctionHouseBot" - > - <File - RelativePath="..\..\src\game\AuctionHouseBot.cpp" - > - </File> - <File - RelativePath="..\..\src\game\AuctionHouseBot.h" - > - </File> - </Filter> - <Filter Name="Object" > <File @@ -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" |