diff --git a/src/game/Player.cpp b/src/game/Player.cpp index e86da1093..025134351 100644 --- a/src/game/Player.cpp +++ b/src/game/Player.cpp @@ -14503,6 +14503,9 @@ bool Player::LoadFromDB( uint32 guid, SqlQueryHolder *holder ) SetUInt32Value(PLAYER_TRACK_CREATURES, 0 ); SetUInt32Value(PLAYER_TRACK_RESOURCES, 0 ); + // cleanup aura list explicitly before skill load wher some spells can be applied + RemoveAllAuras(); + _LoadSkills(holder->GetResult(PLAYER_LOGIN_QUERY_LOADSKILLS)); // make sure the unit is considered out of combat for proper loading @@ -14761,7 +14764,7 @@ void Player::_LoadActions(QueryResult *result) void Player::_LoadAuras(QueryResult *result, uint32 timediff) { - RemoveAllAuras(); + //RemoveAllAuras(); -- some spells casted before aura load, for example in LoadSkills, aura list explcitly cleaned early //QueryResult *result = CharacterDatabase.PQuery("SELECT caster_guid,spell,effect_index,stackcount,amount,maxduration,remaintime,remaincharges FROM character_aura WHERE guid = '%u'",GetGUIDLow()); diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h index b96e17228..f6437d9e7 100644 --- a/src/shared/revision_nr.h +++ b/src/shared/revision_nr.h @@ -1,4 +1,4 @@ #ifndef __REVISION_NR_H__ #define __REVISION_NR_H__ - #define REVISION_NR "8886" + #define REVISION_NR "8887" #endif // __REVISION_NR_H__