Core/Players: Fixed deleting characters, remove CharacterNameData only after the character is deleted, not before

Shauren · Shauren · commit 2e1b1b8ceb08 · 2013-04-29T15:29:51.000+02:00
diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp
@@ -5013,10 +5013,13 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC
         }
         default:
             sLog->outError(LOG_FILTER_PLAYER, "Player::DeleteFromDB: Unsupported delete method: %u.", charDelete_method);
+            return;
     }
 
     if (updateRealmChars)
         sWorld->UpdateRealmCharCount(accountId);
+
+    sWorld->DeleteCharacterNameData(GUID_LOPART(guid));
 }
 
 /**
diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp
@@ -738,7 +738,6 @@ void WorldSession::HandleCharDeleteOpcode(WorldPacket& recvData)
     std::string IP_str = GetRemoteAddress();
     sLog->outInfo(LOG_FILTER_CHARACTER, "Account: %d, IP: %s deleted character: %s, GUID: %u, Level: %u", accountId, IP_str.c_str(), name.c_str(), GUID_LOPART(guid), level);
     sScriptMgr->OnPlayerDelete(guid);
-    sWorld->DeleteCharacterNameData(GUID_LOPART(guid));
 
     if (sLog->ShouldLog(LOG_FILTER_PLAYER_DUMP, LOG_LEVEL_INFO)) // optimize GetPlayerDump call
     {

Original file line number	Diff line number	Diff line change
`@@ -5013,10 +5013,13 @@ void Player::DeleteFromDB(uint64 playerguid, uint32 accountId, bool updateRealmC`
`5013`	`5013`	`}`
`5014`	`5014`	`default:`
`5015`	`5015`	`sLog->outError(LOG_FILTER_PLAYER, "Player::DeleteFromDB: Unsupported delete method: %u.", charDelete_method);`
	`5016`	`+ return;`
`5016`	`5017`	`}`
`5017`	`5018`
`5018`	`5019`	`if (updateRealmChars)`
`5019`	`5020`	`sWorld->UpdateRealmCharCount(accountId);`
	`5021`	`+`
	`5022`	`+ sWorld->DeleteCharacterNameData(GUID_LOPART(guid));`
`5020`	`5023`	`}`
`5021`	`5024`
`5022`	`5025`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -738,7 +738,6 @@ void WorldSession::HandleCharDeleteOpcode(WorldPacket& recvData)`
`738`	`738`	`std::string IP_str = GetRemoteAddress();`
`739`	`739`	`sLog->outInfo(LOG_FILTER_CHARACTER, "Account: %d, IP: %s deleted character: %s, GUID: %u, Level: %u", accountId, IP_str.c_str(), name.c_str(), GUID_LOPART(guid), level);`
`740`	`740`	`sScriptMgr->OnPlayerDelete(guid);`
`741`		`- sWorld->DeleteCharacterNameData(GUID_LOPART(guid));`
`742`	`741`
`743`	`742`	`if (sLog->ShouldLog(LOG_FILTER_PLAYER_DUMP, LOG_LEVEL_INFO)) // optimize GetPlayerDump call`
`744`	`743`	`{`