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/Entities | |
| 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/Entities')
| -rw-r--r-- | src/server/game/Entities/Player/Player.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Entities/Player/Player.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp index 85443e6efaa..48ce208ddea 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp @@ -17121,7 +17121,7 @@ bool Player::IsLoading() const return GetSession()->PlayerLoading(); } -bool Player::LoadFromDB(ObjectGuid guid, SQLQueryHolder *holder) +bool Player::LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder* holder) { // 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 //QueryResult* result = CharacterDatabase.PQuery("SELECT guid, account, name, race, class, gender, level, xp, money, skin, face, hairStyle, hairColor, facialStyle, bankSlots, restState, playerFlags, " diff --git a/src/server/game/Entities/Player/Player.h b/src/server/game/Entities/Player/Player.h index d9f0bcc5f2b..684657327fd 100644 --- a/src/server/game/Entities/Player/Player.h +++ b/src/server/game/Entities/Player/Player.h @@ -1315,7 +1315,7 @@ class TC_GAME_API Player : public Unit, public GridObject<Player> /*** LOAD SYSTEM ***/ /*********************************************************/ - bool LoadFromDB(ObjectGuid guid, SQLQueryHolder *holder); + bool LoadFromDB(ObjectGuid guid, CharacterDatabaseQueryHolder* holder); bool IsLoading() const override; void Initialize(ObjectGuid::LowType guid); |