Changeset 101 for trunk

Show
Ignore:
Timestamp:
11/19/08 13:35:37 (17 years ago)
Author:
yumileroy
Message:

[svn] Fix a bug that elixir buff cannot stack.
Fix quest 9685. Patch provided by ogeraisi.

Original author: megamage
Date: 2008-10-22 20:59:36-05:00

Location:
trunk/src
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • trunk/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp

    r90 r101  
    8383            m_creature->SetUInt32Value(UNIT_DYNAMIC_FLAGS, 0); 
    8484            //m_creature->RemoveAllAuras(); 
    85             DoSay(SAY_HEAL,LANG_COMMON,NULL); 
     85            DoSay(SAY_HEAL,LANG_THALASSIAN,NULL); 
    8686            spellHit = true; 
    8787        } 

  • trunk/src/game/SpellMgr.cpp

    r98 r101  
    10391039    if(spellInfo_1->SpellFamilyName && spellInfo_1->SpellFamilyName == spellInfo_2->SpellFamilyName) //resurrection sickness 
    10401040    { 
    1041         if(spellInfo_1->SpellFamilyFlags == spellInfo_2->SpellFamilyFlags) 
     1041        if(spellInfo_1->SpellFamilyFlags && spellInfo_1->SpellFamilyFlags == spellInfo_2->SpellFamilyFlags) 
    10421042            return true; 
    10431043        if(spellInfo_1->SpellFamilyName == SPELLFAMILY_SHAMAN)