From 0f4f36c8935d82cfad04a87a8343f33e2937f66e Mon Sep 17 00:00:00 2001
From: QAston <none@none>
Date: Tue, 10 Mar 2009 21:07:21 +0100
Subject: *Fix Living Bomb.

--HG--
branch : trunk
---
 src/game/SpellAuras.cpp | 2 +-
 src/game/SpellMgr.cpp   | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index e05711a2381..fb0a943bc3d 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -2056,7 +2056,7 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
             // Living Bomb
             if (m_spellProto->SpellFamilyFlags[1] & 0x20000)
             {
-                if(!m_target || !caster || m_removeMode == AURA_REMOVE_BY_DISPEL || m_removeMode == AURA_REMOVE_BY_DEFAULT)
+                if(!m_target || !caster || !(m_removeMode == AURA_REMOVE_BY_DISPEL || m_removeMode == AURA_REMOVE_BY_DEFAULT))
                     return;
                 caster->CastSpell(m_target, GetModifier()->m_amount, true, NULL, NULL, GetCasterGUID());
                 return;
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index f14103a761b..fb482f9daab 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -475,6 +475,7 @@ bool IsSingleFromSpellSpecificPerTarget(uint32 spellSpec1,uint32 spellSpec2)
         case SPELL_DRINK:
         case SPELL_FOOD:
         case SPELL_CHARM:
+        case SPELL_SCROLL:
             return spellSpec1==spellSpec2;
         case SPELL_BATTLE_ELIXIR:
             return spellSpec2==SPELL_BATTLE_ELIXIR
-- 
cgit v1.2.3