From 02c060be05b27dcd2d5d662027bae7fd91c3abfc Mon Sep 17 00:00:00 2001
From: megamage <none@none>
Date: Sat, 17 Jan 2009 17:54:11 -0600
Subject: *Update to Mangos 7100.

--HG--
branch : trunk
---
 src/game/SpellMgr.cpp | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'src/game/SpellMgr.cpp')

diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 79942a2d38e..2b5787bad90 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -1273,6 +1273,11 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool
     if(spellInfo_1->SpellFamilyName != spellInfo_2->SpellFamilyName)
         return false;
 
+    // TODO: Is this needed?
+    // Allow stack passive and not passive spells
+    if ((spellInfo_1->Attributes & SPELL_ATTR_PASSIVE)!=(spellInfo_2->Attributes & SPELL_ATTR_PASSIVE))
+        return false;
+
     // generic spells
     if(!spellInfo_1->SpellFamilyName)
     {
-- 
cgit v1.2.3