diff options
| -rw-r--r-- | src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp | 2 | ||||
| -rw-r--r-- | src/game/SpellMgr.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp index 99d7146aacf..077c078b64a 100644 --- a/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp +++ b/src/bindings/scripts/scripts/zone/silvermoon/silvermoon_city.cpp @@ -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_DYNAMIC_FLAGS, 0); //m_creature->RemoveAllAuras(); - DoSay(SAY_HEAL,LANG_COMMON,NULL); + DoSay(SAY_HEAL,LANG_THALASSIAN,NULL); spellHit = true; } } diff --git a/src/game/SpellMgr.cpp b/src/game/SpellMgr.cpp index c56c1b7ac28..f8f1cc5edb9 100644 --- a/src/game/SpellMgr.cpp +++ b/src/game/SpellMgr.cpp @@ -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->SpellFamilyFlags == spellInfo_2->SpellFamilyFlags) + if(spellInfo_1->SpellFamilyFlags && spellInfo_1->SpellFamilyFlags == spellInfo_2->SpellFamilyFlags) return true; if(spellInfo_1->SpellFamilyName == SPELLFAMILY_SHAMAN) if(IsElementalShield(spellInfo_1) && IsElementalShield(spellInfo_2)) |