pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 09:31:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/EQEmu/Server

Browse Source
This commit is contained in:
Uleat 2017-03-18 16:12:04 -04:00
commit 803da509ce
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
zone/entity.cpp
View File

@ -2421,7 +2421,6 @@ void EntityList::Clear()
entity_list.RemoveAllDoors(); entity_list.RemoveAllDoors();
entity_list.RemoveAllObjects(); entity_list.RemoveAllObjects();
entity_list.RemoveAllRaids(); entity_list.RemoveAllRaids();
entity_list.RemoveAllEncounters();
entity_list.RemoveAllLocalities(); entity_list.RemoveAllLocalities();
} }

3
zone/lua_parser.cpp
View File

@ -800,6 +800,9 @@ void LuaParser::ReloadQuests() {
encounter.second->Depop(); encounter.second->Depop();
} }
lua_encounters.clear(); 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) { if(L) {
lua_close(L); lua_close(L);