aboutsummaryrefslogtreecommitdiff
path: root/src/game/SpellMgr.cpp
diff options
context:
space:
mode:
authormegamage <none@none>2009-01-12 11:02:18 -0600
committermegamage <none@none>2009-01-12 11:02:18 -0600
commit90f30abd86b77c304f71b81476a9b86e948b190f (patch)
treeae6d2c1374976204ca82451e67254c2c5edabce8 /src/game/SpellMgr.cpp
parent6daa23e39c28e13f366ce4e8a765d565a26bcca5 (diff)
parent61b2ce7856924bcaa4fda4fe124cd2a019493dd3 (diff)
*Update to Trinity 843.
--HG-- branch : trunk
Diffstat (limited to 'src/game/SpellMgr.cpp')
-rw-r--r--src/game/SpellMgr.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp
index 6585de79355..dd80acc2dc6 100644
--- a/src/game/SpellMgr.cpp
+++ b/src/game/SpellMgr.cpp
@@ -1284,6 +1284,7 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2, bool
if(!spellInfo_1->SpellFamilyName)
{
if(!spellInfo_1->SpellIconID
+ || spellInfo_1->SpellIconID == 1
|| spellInfo_1->SpellIconID != spellInfo_2->SpellIconID)
return false;
}