pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-13 18:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Pets] Fix renamed pets loading as blank names (#4751)

Browse Source
This commit is contained in:
nytmyr 2025-03-05 13:31:16 -06:00 committed by GitHub
parent 09e079a45e
commit 8cd7148b29
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zone/pets.cpp
View File

@ -165,12 +165,15 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower,
// 4 - Keep DB name // 4 - Keep DB name
// 5 - `s ward // 5 - `s ward
if (IsClient() && !petname) { const auto vanity_name = (IsClient() && !petname) ? CharacterPetNameRepository::FindOne(database, CastToClient()->CharacterID()) : CharacterPetNameRepository::CharacterPetName{};
const auto vanity_name = CharacterPetNameRepository::FindOne(database, CastToClient()->CharacterID());
if (!vanity_name.name.empty()) { if (
IsClient() &&
!petname &&
!vanity_name.name.empty()
) {
petname = vanity_name.name.c_str(); petname = vanity_name.name.c_str();
} }
}
if (petname != nullptr) { if (petname != nullptr) {
// Name was provided, use it. // Name was provided, use it.