From 477b629fafc756f68e514b4d1efac472dc52ebdb Mon Sep 17 00:00:00 2001 From: Marcono1234 Date: Tue, 25 Jan 2022 00:14:21 +0100 Subject: [PATCH 1/2] Fix UserManager not logging chosen name properly --- dGame/UserManager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dGame/UserManager.cpp b/dGame/UserManager.cpp index 1535364c..770dfdf2 100644 --- a/dGame/UserManager.cpp +++ b/dGame/UserManager.cpp @@ -270,7 +270,7 @@ void UserManager::CreateCharacter(const SystemAddress& sysAddr, Packet* packet) return; } - Game::logger->Log("UserManager", "AccountID: %i is creating a character with name: %s\n", u->GetAccountID(), name.c_str()); + Game::logger->Log("UserManager", "AccountID: %i is creating a character with name: %s\n", u->GetAccountID(), name != "" ? name.c_str() : predefinedName.c_str()); //Now that the name is ok, we can get an objectID from Master: ObjectIDManager::Instance()->RequestPersistentID([=](uint32_t objectID) { From 0d0949f5f08233681f329112ca9e32c334c00727 Mon Sep 17 00:00:00 2001 From: Marcono1234 Date: Thu, 3 Feb 2022 23:03:54 +0100 Subject: [PATCH 2/2] Adjust chosen character name logging --- dGame/UserManager.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dGame/UserManager.cpp b/dGame/UserManager.cpp index 770dfdf2..e8352fd2 100644 --- a/dGame/UserManager.cpp +++ b/dGame/UserManager.cpp @@ -244,7 +244,6 @@ void UserManager::CreateCharacter(const SystemAddress& sysAddr, Packet* packet) uint32_t middleNameIndex = PacketUtils::ReadPacketU32(78, packet); uint32_t lastNameIndex = PacketUtils::ReadPacketU32(82, packet); std::string predefinedName = GetPredefinedName(firstNameIndex, middleNameIndex, lastNameIndex); - Game::logger->Log("UserManager", "Got predefined name: %s\n", predefinedName.c_str()); uint32_t shirtColor = PacketUtils::ReadPacketU32(95, packet); uint32_t shirtStyle = PacketUtils::ReadPacketU32(99, packet); @@ -261,16 +260,23 @@ void UserManager::CreateCharacter(const SystemAddress& sysAddr, Packet* packet) LOT pantsLOT = FindCharPantsID(pantsColor); if (name != "" && !UserManager::IsNameAvailable(name)) { + Game::logger->Log("UserManager", "AccountID: %i chose unavailable name: %s\n", u->GetAccountID(), name.c_str()); WorldPackets::SendCharacterCreationResponse(sysAddr, CREATION_RESPONSE_CUSTOM_NAME_IN_USE); return; } if (!IsNameAvailable(predefinedName)) { + Game::logger->Log("UserManager", "AccountID: %i chose unavailable predefined name: %s\n", u->GetAccountID(), predefinedName.c_str()); WorldPackets::SendCharacterCreationResponse(sysAddr, CREATION_RESPONSE_PREDEFINED_NAME_IN_USE); return; } - Game::logger->Log("UserManager", "AccountID: %i is creating a character with name: %s\n", u->GetAccountID(), name != "" ? name.c_str() : predefinedName.c_str()); + if (name == "") { + Game::logger->Log("UserManager", "AccountID: %i is creating a character with predefined name: %s\n", u->GetAccountID(), predefinedName.c_str()); + } + else { + Game::logger->Log("UserManager", "AccountID: %i is creating a character with name: %s (temporary: %s)\n", u->GetAccountID(), name.c_str(), predefinedName.c_str()); + } //Now that the name is ok, we can get an objectID from Master: ObjectIDManager::Instance()->RequestPersistentID([=](uint32_t objectID) {