pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-03-06 14:32:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

We want GetEncounterName here instead

Browse Source
This commit is contained in:
Michael Cook (mackal) 2021-02-24 02:52:15 -05:00
parent 43fade82e5
commit 3e7d4d1d6b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
zone/entity.cpp
View File

@ -603,7 +603,7 @@ void EntityList::EncounterProcess()
while (it != encounter_list.end()) { while (it != encounter_list.end()) {
if (!it->second->Process()) { if (!it->second->Process()) {
// if Process is returning false here, we probably just got called from ReloadQuests .. oh well // if Process is returning false here, we probably just got called from ReloadQuests .. oh well
parse->RemoveEncounter(it->second->GetName()); parse->RemoveEncounter(it->second->GetEncounterName());
safe_delete(it->second); safe_delete(it->second);
free_ids.push(it->first); free_ids.push(it->first);
it = encounter_list.erase(it); it = encounter_list.erase(it);
@ -2567,7 +2567,7 @@ void EntityList::RemoveAllEncounters()
{ {
auto it = encounter_list.begin(); auto it = encounter_list.begin();
while (it != encounter_list.end()) { while (it != encounter_list.end()) {
parse->RemoveEncounter(it->second->GetName()); parse->RemoveEncounter(it->second->GetEncounterName());
safe_delete(it->second); safe_delete(it->second);
free_ids.push(it->first); free_ids.push(it->first);
it = encounter_list.erase(it); it = encounter_list.erase(it);