From 176bfc8524ff6da9ba9824428140c657a308fd35 Mon Sep 17 00:00:00 2001
From: Natedog2012 <jwalters_06@yahoo.com>
Date: Tue, 18 Jan 2022 16:43:58 -0600
Subject: [PATCH] [Bug Fix] Loading pets from database will make unique name to
 not overlap existing pets with same name in zone (#1933)

---
 zone/pets.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/zone/pets.cpp b/zone/pets.cpp
index d14989f73..3b83df1e8 100644
--- a/zone/pets.cpp
+++ b/zone/pets.cpp
@@ -273,6 +273,8 @@ void Mob::MakePoweredPet(uint16 spell_id, const char* pettype, int16 petpower,
 	if (petname != nullptr) {
 		// Name was provided, use it.
 		strn0cpy(npc_type->name, petname, 64);
+		EntityList::RemoveNumbers(npc_type->name);
+		entity_list.MakeNameUnique(npc_type->name);
 	} else if (record.petnaming == 0) {
 		strcpy(npc_type->name, this->GetCleanName());
 		npc_type->name[25] = '\0';