[svn] Fix a bug that elixir buff cannot stack.

Fix quest 9685. Patch provided by ogeraisi.

--HG--
branch : trunk
This commit is contained in:
megamage
2008-10-22 20:59:36 -05:00
parent 9584faf0c9
commit 87681af453
2 changed files with 2 additions and 2 deletions
@@ -82,7 +82,7 @@ struct TRINITY_DLL_DECL npc_blood_knight_stillbladeAI : public ScriptedAI
m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1,0); m_creature->SetUInt32Value(UNIT_FIELD_BYTES_1,0);
m_creature->SetUInt32Value(UNIT_DYNAMIC_FLAGS, 0); m_creature->SetUInt32Value(UNIT_DYNAMIC_FLAGS, 0);
//m_creature->RemoveAllAuras(); //m_creature->RemoveAllAuras();
DoSay(SAY_HEAL,LANG_COMMON,NULL); DoSay(SAY_HEAL,LANG_THALASSIAN,NULL);
spellHit = true; spellHit = true;
} }
} }
+1 -1
View File
@@ -1038,7 +1038,7 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
if(spellInfo_1->SpellFamilyName && spellInfo_1->SpellFamilyName == spellInfo_2->SpellFamilyName) //resurrection sickness if(spellInfo_1->SpellFamilyName && spellInfo_1->SpellFamilyName == spellInfo_2->SpellFamilyName) //resurrection sickness
{ {
if(spellInfo_1->SpellFamilyFlags == spellInfo_2->SpellFamilyFlags) if(spellInfo_1->SpellFamilyFlags && spellInfo_1->SpellFamilyFlags == spellInfo_2->SpellFamilyFlags)
return true; return true;
if(spellInfo_1->SpellFamilyName == SPELLFAMILY_SHAMAN) if(spellInfo_1->SpellFamilyName == SPELLFAMILY_SHAMAN)
if(IsElementalShield(spellInfo_1) && IsElementalShield(spellInfo_2)) if(IsElementalShield(spellInfo_1) && IsElementalShield(spellInfo_2))