Merge remote branch 'origin/master' into 330

This commit is contained in:
tomrus88 2009-10-28 04:58:48 +03:00
commit f2d0f6f868
256 changed files with 52987 additions and 617 deletions

View file

@ -14784,9 +14784,7 @@ void Player::_LoadActions(QueryResult *result)
void Player::_LoadAuras(QueryResult *result, uint32 timediff)
{
m_Auras.clear();
for (int i = 0; i < TOTAL_AURAS; ++i)
m_modAuras[i].clear();
RemoveAllAuras();
//QueryResult *result = CharacterDatabase.PQuery("SELECT caster_guid,spell,effect_index,stackcount,amount,maxduration,remaintime,remaincharges FROM character_aura WHERE guid = '%u'",GetGUIDLow());