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

Merge pull request #1178 from hgtw/fix/spawn-condition-crash

Browse Source 
[Bugfix] Fix zone crash on spawn condition change
This commit is contained in:
Chris Miles 2021-01-21 18:22:27 -06:00 committed by GitHub
commit f1920f2132
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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();
} }
} }
} }