From 18e97142737c9f9a71f897f1cbb9af4a320a2d29 Mon Sep 17 00:00:00 2001
From: SecretsOTheP <espause0703@gmail.com>
Date: Sat, 23 Mar 2013 10:10:03 -0400
Subject: [PATCH] Another safeguard against a dangling pointer.

---
 zone/merc.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/zone/merc.cpp b/zone/merc.cpp
index d39b670c1..d176457fa 100644
--- a/zone/merc.cpp
+++ b/zone/merc.cpp
@@ -5775,6 +5775,7 @@ bool Merc::Dismiss(){
 
 void Merc::Zone() {
 	Save();
+	entity_list.RemoveMerc(this->GetID());
 	Depop();
 }