diff options
| author | megamage <none@none> | 2009-03-08 11:36:10 -0600 |
|---|---|---|
| committer | megamage <none@none> | 2009-03-08 11:36:10 -0600 |
| commit | 985b7656bb8f7de1cb192410f2ee0495dd43ae91 (patch) | |
| tree | ac10c887e7e80fe17956ee2ca0742c40f3d24389 /src/game/ObjectMgr.cpp | |
| parent | 88c050182cd2628984a0282f66256913cecd188b (diff) | |
| parent | 0f8dee432c4eb78b466744b9e3e13266c6be19d7 (diff) | |
*Merge.
--HG--
branch : trunk
rename : sql/updates/XXX_characters_auctionhouse.sql => sql/updates/1164_characters.sql
Diffstat (limited to 'src/game/ObjectMgr.cpp')
| -rw-r--r-- | src/game/ObjectMgr.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index 91ead9fc09d..a3802a5eab8 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -6625,6 +6625,7 @@ void ObjectMgr::LoadSpellDisabledEntrys() { m_DisabledPlayerSpells.clear(); // need for reload case m_DisabledCreatureSpells.clear(); + m_DisabledPetSpells.clear(); QueryResult *result = WorldDatabase.Query("SELECT entry, disable_mask FROM spell_disabled"); uint32 total_count = 0; @@ -6657,6 +6658,8 @@ void ObjectMgr::LoadSpellDisabledEntrys() m_DisabledPlayerSpells.insert(spellid); if(disable_mask & SPELL_DISABLE_CREATURE) m_DisabledCreatureSpells.insert(spellid); + if(disable_mask & SPELL_DISABLE_PET) + m_DisabledPetSpells.insert(spellid); ++total_count; } while ( result->NextRow() ); |