From f64e1644b10ee96e4b5c9b17acbb20a065b4d1ec Mon Sep 17 00:00:00 2001
From: "Michael Cook (mackal)" <mcook@mackal.net>
Date: Sat, 18 Mar 2017 14:11:30 -0400
Subject: [PATCH] Take 2 at fixing encounters

---
 zone/entity.cpp     | 1 -
 zone/lua_parser.cpp | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/zone/entity.cpp b/zone/entity.cpp
index 18d55d695..5f20dffc7 100644
--- a/zone/entity.cpp
+++ b/zone/entity.cpp
@@ -2421,7 +2421,6 @@ void EntityList::Clear()
 	entity_list.RemoveAllDoors();
 	entity_list.RemoveAllObjects();
 	entity_list.RemoveAllRaids();
-	entity_list.RemoveAllEncounters();
 	entity_list.RemoveAllLocalities();
 }
 
diff --git a/zone/lua_parser.cpp b/zone/lua_parser.cpp
index d28c592a4..bf384c703 100644
--- a/zone/lua_parser.cpp
+++ b/zone/lua_parser.cpp
@@ -800,6 +800,9 @@ void LuaParser::ReloadQuests() {
 		encounter.second->Depop();
 	}
 	lua_encounters.clear();
+	// so the Depop function above depends on the Process being called again so ...
+	// And there is situations where it wouldn't be :P
+	entity_list.EncounterProcess();
 
 	if(L) {
 		lua_close(L);