*Merge.

--HG-- branch : trunk
2009-04-19 12:14:08 -05:00
parent e6868e73f1 b608823041
commit eb88142736
5 changed files with 146 additions and 197 deletions
@@ -1089,7 +1089,6 @@ void Pet::_SaveSpells()
 void Pet::_LoadAuras(uint32 timediff)
 {
    sLog.outDebug("Loading auras for pet %u",GetGUIDLow());
-    m_Auras.clear();
    for (int i = 0; i < TOTAL_AURAS; i++)
        m_modAuras[i].clear();

@@ -14633,7 +14633,6 @@ void Player::_LoadActions(QueryResult *result)
 void Player::_LoadAuras(QueryResult *result, uint32 timediff)
 {
    sLog.outDebug("Loading auras for player %u",GetGUIDLow());
-    m_Auras.clear();
    for (int i = 0; i < TOTAL_AURAS; i++)
        m_modAuras[i].clear();