aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/CharacterHandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/server/game/Handlers/CharacterHandler.cpp')
-rw-r--r--src/server/game/Handlers/CharacterHandler.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
index ae75f958c8e..c80cc034336 100644
--- a/src/server/game/Handlers/CharacterHandler.cpp
+++ b/src/server/game/Handlers/CharacterHandler.cpp
@@ -365,8 +365,7 @@ public:
bool result = true;
CharacterDatabasePreparedStatement* stmt = CharacterDatabase.GetPreparedStatement(statements[isDeletedCharacters ? 1 : 0][withDeclinedNames ? 1 : 0]);
- stmt->setUInt8(0, PET_SAVE_AS_CURRENT);
- stmt->setUInt32(1, accountId);
+ stmt->setUInt32(0, accountId);
result &= SetPreparedQuery(CHARACTERS, stmt);
stmt = CharacterDatabase.GetPreparedStatement(statements[isDeletedCharacters ? 1 : 0][2]);
@@ -1297,7 +1296,7 @@ void WorldSession::HandlePlayerLogin(LoginQueryHolder* holder)
}
// Load pet if any (if player not alive and in taxi flight or another then pet will remember as temporary unsummoned)
- pCurrChar->LoadPet();
+ pCurrChar->ResummonPetTemporaryUnSummonedIfAny();
// Set FFA PvP for non GM in non-rest mode
if (sWorld->IsFFAPvPRealm() && !pCurrChar->IsGameMaster() && !pCurrChar->HasPlayerFlag(PLAYER_FLAGS_RESTING))