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

Fix zone crash on spawn condition change

Browse Source 
The NPC pointer held by Spawn2 wasn't reset if the npc was depopped
without a respawn timer by #depop commands or depop(false) quest apis.
If the NPC was part of a spawn condition then the condition would try
to dereference that pointer (which gets deleted) on condition change.
This commit is contained in:
hg 2021-01-08 20:12:36 -05:00
parent 0f5a7e1317
commit 836210404c
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
zone/npc.cpp
View File

@ -968,9 +968,12 @@ void NPC::Depop(bool StartSpawnTimer) {
if(emoteid != 0) if(emoteid != 0)
this->DoNPCEmote(ONDESPAWN,emoteid); this->DoNPCEmote(ONDESPAWN,emoteid);
p_depop = true; p_depop = true;
if (StartSpawnTimer) { if (respawn2)
if (respawn2 != 0) { {
if (StartSpawnTimer) {
respawn2->DeathReset(); respawn2->DeathReset();
} else {
respawn2->Depop();
} }
} }
} }