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

Fix issue with mobs no depopping (due to spawn_events) while zone is idle.

Browse Source
This commit is contained in:
Paul Coene 2015-11-20 12:03:43 -05:00
parent ec36a3787d
commit f3120f26ee
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
zone/entity.cpp
View File

@ -468,17 +468,27 @@ void EntityList::CorpseProcess()
void EntityList::MobProcess() void EntityList::MobProcess()
{ {
#ifdef IDLE_WHEN_EMPTY bool mob_dead;
if (numclients < 1)
return;
#endif
auto it = mob_list.begin(); auto it = mob_list.begin();
while (it != mob_list.end()) { while (it != mob_list.end()) {
uint16 id = it->first; uint16 id = it->first;
Mob *mob = it->second; Mob *mob = it->second;
size_t sz = mob_list.size(); size_t sz = mob_list.size();
bool p_val = mob->Process();
#ifdef IDLE_WHEN_EMPTY
// spawn_events can cause spawns and deaths while zone empty.
// At the very least, process that.
if (numclients < 1) {
mob_dead = mob->CastToNPC()->GetDepop();
}
else {
mob_dead = !mob->Process();
}
#else
mob_dead = !mob->Process();
#endif
size_t a_sz = mob_list.size(); size_t a_sz = mob_list.size();
if(a_sz > sz) { if(a_sz > sz) {
@ -491,7 +501,7 @@ void EntityList::MobProcess()
++it; ++it;
} }
if(!p_val) { if(mob_dead) {
if(mob->IsNPC()) { if(mob->IsNPC()) {
entity_list.RemoveNPC(id); entity_list.RemoveNPC(id);
} }