diff options
| -rwxr-xr-x | src/server/game/Globals/ObjectMgr.h | 2 | ||||
| -rwxr-xr-x | src/server/game/Server/Protocol/Handlers/QueryHandler.cpp | 2 | ||||
| -rwxr-xr-x | src/server/game/Server/WorldSession.cpp | 8 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/server/game/Globals/ObjectMgr.h b/src/server/game/Globals/ObjectMgr.h index 19eb575ac94..78a912e00bf 100755 --- a/src/server/game/Globals/ObjectMgr.h +++ b/src/server/game/Globals/ObjectMgr.h @@ -867,7 +867,7 @@ class ObjectMgr void LoadCreatures(); void LoadLinkedRespawn(); bool SetCreatureLinkedRespawn(uint32 guid, uint32 linkedGuid); - void LoadCreatureRespawnTimes(); + void LoadLinkedRespawnTimes(); void LoadCreatureAddons(); void LoadCreatureModelInfo(); void LoadEquipmentTemplates(); diff --git a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp index 4ac24c843df..e79098fb8a4 100755 --- a/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp +++ b/src/server/game/Server/Protocol/Handlers/QueryHandler.cpp @@ -58,7 +58,7 @@ void WorldSession::SendNameQueryOpcode(Player *p) void WorldSession::SendNameQueryOpcodeFromDB(uint64 guid) { - ACE_Future<QueryResult> lFutureResult = + QueryResultFuture lFutureResult = CharacterDatabase.AsyncPQuery( !sWorld->getBoolConfig(CONFIG_DECLINED_NAMES_USED) ? // ------- Query Without Declined Names -------- diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index f76f67b7c08..7b4db102fd5 100755 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -1003,8 +1003,12 @@ void WorldSession::ProcessQueryCallbacks() if (m_nameQueryCallbacks.next_readable(lResult, &timeout) != 1) break; - lResult.get(result); - SendNameQueryOpcodeFromDBCallBack(result); + if (lResult.ready()) + { + lResult.get(result); + SendNameQueryOpcodeFromDBCallBack(result); + lResult.cancel(); + } } //! HandleCharEnumOpcode |