mirror of
https://github.com/EQEmu/Server.git
synced 2025-12-13 14:41:28 +00:00
Merge pull request #1178 from hgtw/fix/spawn-condition-crash
[Bugfix] Fix zone crash on spawn condition change
This commit is contained in:
commit
f1920f2132
@ -968,9 +968,12 @@ void NPC::Depop(bool StartSpawnTimer) {
|
||||
if(emoteid != 0)
|
||||
this->DoNPCEmote(ONDESPAWN,emoteid);
|
||||
p_depop = true;
|
||||
if (StartSpawnTimer) {
|
||||
if (respawn2 != 0) {
|
||||
if (respawn2)
|
||||
{
|
||||
if (StartSpawnTimer) {
|
||||
respawn2->DeathReset();
|
||||
} else {
|
||||
respawn2->Depop();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user