From ac6e13d0e34cfc273e2d3cb16b00ffe50886d472 Mon Sep 17 00:00:00 2001
From: balrok <balrok@getmangos.com>
Date: Tue, 20 Oct 2009 22:35:07 +0200
Subject: [PATCH] [8691] fix battleground spiritguides

they are now alive and so some spellchecks got invalid
---
 src/game/Spell.cpp       | 2 +-
 src/game/SpellAuras.cpp  | 3 ---
 src/shared/revision_nr.h | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index b9d653f6d..979fb6f4e 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -3930,7 +3930,7 @@ SpellCastResult Spell::CheckCast(bool strict)
         if(m_spellInfo->TargetAuraStateNot && target->HasAuraState(AuraState(m_spellInfo->TargetAuraStateNot)))
             return SPELL_FAILED_TARGET_AURASTATE;
 
-        if (IsDeathOnlySpell(m_spellInfo) && target->isAlive())
+        if (!m_IsTriggeredSpell && IsDeathOnlySpell(m_spellInfo) && target->isAlive())
             return SPELL_FAILED_TARGET_NOT_DEAD;
 
         // Target aura req check if need
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 4faf8b9e0..c301b9f81 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -6265,9 +6265,6 @@ void Aura::HandleSchoolAbsorb(bool apply, bool Real)
 
 void Aura::PeriodicTick()
 {
-    if (!m_target->isAlive() != IsDeathOnlySpell(GetSpellProto()))
-        return;
-
     switch(m_modifier.m_auraname)
     {
         case SPELL_AURA_PERIODIC_DAMAGE:
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 7c2aa67bf..76aecc253 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 "8690"
+ #define REVISION_NR "8691"
 #endif // __REVISION_NR_H__