From 5ef99978c03eb5cc7d40c1f1a1cc4e5c78f8ea27 Mon Sep 17 00:00:00 2001 From: Shauren Date: Mon, 29 Sep 2025 22:01:40 +0200 Subject: Core/Misc: Reduce differences between branches --- src/server/game/Handlers/CharacterHandler.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/server/game/Handlers/CharacterHandler.cpp') diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp index 0dc557b8844..cca9216a4af 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -1149,9 +1149,8 @@ void WorldSession::HandleCharRenameCallBack(std::shared_ptr Field* fields = result->Fetch(); - ObjectGuid::LowType guidLow = fields[0].GetUInt32(); - std::string oldName = fields[1].GetString(); - uint16 atLoginFlags = fields[2].GetUInt16(); + std::string oldName = fields[0].GetString(); + uint16 atLoginFlags = fields[1].GetUInt16(); if (!(atLoginFlags & AT_LOGIN_RENAME)) { @@ -1168,14 +1167,14 @@ void WorldSession::HandleCharRenameCallBack(std::shared_ptr stmt->setString(0, renameInfo->Name); stmt->setUInt16(1, atLoginFlags); - stmt->setUInt32(2, guidLow); + stmt->setUInt32(2, renameInfo->Guid.GetCounter()); CharacterDatabase.Execute(stmt); // Removed declined name from db stmt = CharacterDatabase.GetPreparedStatement(CHAR_DEL_DECLINED_NAME); - stmt->setUInt32(0, guidLow); + stmt->setUInt32(0, renameInfo->Guid.GetCounter()); CharacterDatabase.Execute(stmt); -- cgit v1.2.3