From 8cd7148b29959d482783f4909efa3d80f6760fda Mon Sep 17 00:00:00 2001
From: nytmyr <53322305+nytmyr@users.noreply.github.com>
Date: Wed, 5 Mar 2025 13:31:16 -0600
Subject: [PATCH] [Pets] Fix renamed pets loading as blank names (#4751)

---
 zone/pets.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/zone/pets.cpp b/zone/pets.cpp
index da84ca4e1..37028e60a 100644
--- a/zone/pets.cpp
+++ b/zone/pets.cpp
@@ -165,11 +165,14 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower,
 	// 4 - Keep DB name
 	// 5 - `s ward
 
-	if (IsClient() && !petname) {
-		const auto vanity_name = CharacterPetNameRepository::FindOne(database, CastToClient()->CharacterID());
-		if (!vanity_name.name.empty()) {
-			petname = vanity_name.name.c_str();
-		}
+	const auto vanity_name = (IsClient() && !petname) ? CharacterPetNameRepository::FindOne(database, CastToClient()->CharacterID()) : CharacterPetNameRepository::CharacterPetName{};
+
+	if (
+		IsClient() &&
+		!petname &&
+		!vanity_name.name.empty()
+	) {
+		petname = vanity_name.name.c_str();
 	}
 
 	if (petname != nullptr) {