diff options
| author | Shauren <shauren.trinity@gmail.com> | 2019-07-27 11:45:56 +0200 |
|---|---|---|
| committer | Giacomo Pozzoni <giacomopoz@gmail.com> | 2020-03-31 13:42:01 +0000 |
| commit | f7a67099d45cae68964975ac7b60892fdc468d39 (patch) | |
| tree | 7fa676ba03d18fb97149fe11dd50183c597fd1ff /src/server/game/Server | |
| parent | 635b8d52d58f7d502fc249c11c1044923e80935f (diff) | |
Core/DBLayer: Prevent mixing databases with query holders
(cherry picked from commit 13440434c34da28a5106af8419aabc8e5783faf0)
# Conflicts:
# src/server/game/Server/WorldSession.cpp
# src/server/game/Server/WorldSession.h
Diffstat (limited to 'src/server/game/Server')
| -rw-r--r-- | src/server/game/Server/WorldSession.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Server/WorldSession.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Server/WorldSession.cpp b/src/server/game/Server/WorldSession.cpp index 625e2d0ea76..213e23bbd33 100644 --- a/src/server/game/Server/WorldSession.cpp +++ b/src/server/game/Server/WorldSession.cpp @@ -1193,7 +1193,7 @@ void WorldSession::ProcessQueryCallbacks() _queryProcessor.ProcessReadyQueries(); if (_realmAccountLoginCallback.valid() && _realmAccountLoginCallback.wait_for(std::chrono::seconds(0)) == std::future_status::ready) - InitializeSessionCallback(_realmAccountLoginCallback.get()); + InitializeSessionCallback(static_cast<CharacterDatabaseQueryHolder*>(_realmAccountLoginCallback.get())); //! HandlePlayerLoginOpcode if (_charLoginCallback.valid() && _charLoginCallback.wait_for(std::chrono::seconds(0)) == std::future_status::ready) @@ -1236,7 +1236,7 @@ QueryCallback WorldSession::LoadPermissionsAsync() return _RBACData->LoadFromDBAsync(); } -class AccountInfoQueryHolderPerRealm : public SQLQueryHolder +class AccountInfoQueryHolderPerRealm : public CharacterDatabaseQueryHolder { public: enum @@ -1278,7 +1278,7 @@ void WorldSession::InitializeSession() _realmAccountLoginCallback = CharacterDatabase.DelayQueryHolder(realmHolder); } -void WorldSession::InitializeSessionCallback(SQLQueryHolder* realmHolder) +void WorldSession::InitializeSessionCallback(CharacterDatabaseQueryHolder* realmHolder) { LoadAccountData(realmHolder->GetPreparedResult(AccountInfoQueryHolderPerRealm::GLOBAL_ACCOUNT_DATA), GLOBAL_CACHE_MASK); LoadTutorialsData(realmHolder->GetPreparedResult(AccountInfoQueryHolderPerRealm::TUTORIALS)); diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h index aa8641a02d5..5e60925a8e0 100644 --- a/src/server/game/Server/WorldSession.h +++ b/src/server/game/Server/WorldSession.h @@ -370,7 +370,7 @@ class TC_GAME_API WorldSession void SendClientCacheVersion(uint32 version); void InitializeSession(); - void InitializeSessionCallback(SQLQueryHolder* realmHolder); + void InitializeSessionCallback(CharacterDatabaseQueryHolder* realmHolder); rbac::RBACData* GetRBACData(); bool HasPermission(uint32 permissionId); |