From 20ff3250133a281014fe7c13a9af6fe32441aa65 Mon Sep 17 00:00:00 2001
From: Mitch Freeman <65987027+neckkola@users.noreply.github.com>
Date: Mon, 6 Jan 2025 01:44:51 -0400
Subject: [PATCH] [Fix] Repair a LoadNPCEmote MemoryLeak (#4586)

---
 zone/zone.cpp | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/zone/zone.cpp b/zone/zone.cpp
index 0280ee8f5..f02be2e2b 100644
--- a/zone/zone.cpp
+++ b/zone/zone.cpp
@@ -1100,7 +1100,12 @@ Zone::~Zone() {
 	if (worldserver.Connected()) {
 		worldserver.SetZoneData(0);
 	}
+
+	for (auto &e: npc_emote_list) {
+		safe_delete(e);
+	}
 	npc_emote_list.clear();
+
 	zone_point_list.Clear();
 	entity_list.Clear();
 	parse->ReloadQuests();
@@ -1257,7 +1262,6 @@ void Zone::ReloadStaticData() {
 
 	LoadVeteranRewards();
 	LoadAlternateCurrencies();
-	npc_emote_list.clear();
 	LoadNPCEmotes(&npc_emote_list);
 
 	//load the zone config file.
@@ -2575,6 +2579,10 @@ void Zone::DoAdventureActions()
 
 void Zone::LoadNPCEmotes(std::vector<NPC_Emote_Struct*>* v)
 {
+	for (auto &e: *v) {
+		safe_delete(e);
+	}
+
 	v->clear();
 
 	const auto& l = NpcEmotesRepository::All(content_db);