mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[11295] Load achievment system state before laoding other character data.

Browse source 
This prevent lost detected achievement criteria update or have unexpected criteria update event
at character data loading like skills/spells/itemts/etc.

Achievment system state load by self not dependent from other character data (checked after
all data loading in CheckAllAchievementCriteria() call.
This commit is contained in:
VladimirMangos 2011-03-28 00:52:27 +04:00
parent cc24542aec
commit 2aef552668
3 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/game/AchievementMgr.cpp
View file

@ -535,6 +535,9 @@ void AchievementMgr::SaveToDB()
void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *criteriaResult) void AchievementMgr::LoadFromDB(QueryResult *achievementResult, QueryResult *criteriaResult)
{ {
// Note: this code called before any character data loading so don't must triggering any events req. inventory/etc
// all like cases must be happens in CheckAllAchievementCriteria called after character data load
if(achievementResult) if(achievementResult)
{ {
do do

5
src/game/Player.cpp
View file

@ -15321,6 +15321,10 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
SetFloatValue(UNIT_FIELD_HOVERHEIGHT, 1.0f); SetFloatValue(UNIT_FIELD_HOVERHEIGHT, 1.0f);
// just load creteria/achievment data, safe call before any load, and need, because some spell/item/quest loading
// can triggering achievment creteria update that will be lost if this call will later
m_achievementMgr.LoadFromDB(holder->GetResult(PLAYER_LOGIN_QUERY_LOADACHIEVEMENTS), holder->GetResult(PLAYER_LOGIN_QUERY_LOADCRITERIAPROGRESS));
uint32 money = fields[8].GetUInt32(); uint32 money = fields[8].GetUInt32();
if(money > MAX_MONEY_AMOUNT) if(money > MAX_MONEY_AMOUNT)
money = MAX_MONEY_AMOUNT; money = MAX_MONEY_AMOUNT;
@ -15856,7 +15860,6 @@ bool Player::LoadFromDB(ObjectGuid guid, SqlQueryHolder *holder )
_LoadDeclinedNames(holder->GetResult(PLAYER_LOGIN_QUERY_LOADDECLINEDNAMES)); _LoadDeclinedNames(holder->GetResult(PLAYER_LOGIN_QUERY_LOADDECLINEDNAMES));
m_achievementMgr.LoadFromDB(holder->GetResult(PLAYER_LOGIN_QUERY_LOADACHIEVEMENTS), holder->GetResult(PLAYER_LOGIN_QUERY_LOADCRITERIAPROGRESS));
m_achievementMgr.CheckAllAchievementCriteria(); m_achievementMgr.CheckAllAchievementCriteria();
_LoadEquipmentSets(holder->GetResult(PLAYER_LOGIN_QUERY_LOADEQUIPMENTSETS)); _LoadEquipmentSets(holder->GetResult(PLAYER_LOGIN_QUERY_LOADEQUIPMENTSETS));

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "11294" #define REVISION_NR "11295"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__