From 3b42f295d6414efdf98e333b4b153ef665d32832 Mon Sep 17 00:00:00 2001
From: Derision <DerisionEQ@gmail.com>
Date: Fri, 12 Apr 2013 19:20:43 +0100
Subject: [PATCH] Moved entity_list.Clear() prior to destruction of Perl
 objects in zone shutdown

---
 changelog.txt |  2 ++
 zone/net.cpp  | 11 ++++++-----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index ab359a884..cb9c9a6af 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,7 @@
 EQEMu Changelog (Started on Sept 24, 2003 15:50)
 -------------------------------------------------------
+== 04/12/2013 ==
+Derision: Moved entity_list.Clear() prior to destruction of Perl objects in zone shutdown as I was seeing a segfault due to attempts to call EVENT_HATE_LIST as mobs were being destroyed.
 
 == 04/09/2013 ==
 demonstar55: Realized I was an idiot, changed salvage script to be better
diff --git a/zone/net.cpp b/zone/net.cpp
index 33a0997c4..ac3ab94f2 100644
--- a/zone/net.cpp
+++ b/zone/net.cpp
@@ -470,12 +470,13 @@ int main(int argc, char** argv) {
 		Sleep(ZoneTimerResolution);
 	}
 
-    safe_delete(parse);
-    safe_delete(pxs);
-    safe_delete(ps);
-    safe_delete(mmf);
-	
 	entity_list.Clear();
+
+	safe_delete(parse);
+	safe_delete(pxs);
+	safe_delete(ps);
+	safe_delete(mmf);
+	
 	if (zone != 0)
 		Zone::Shutdown(true);
 	//Fix for Linux world server problem.