mirror of
https://github.com/EQEmu/Server.git
synced 2026-05-06 04:42:28 +00:00
Fix crashes
This commit is contained in:
parent
90e88c7c70
commit
ef1565725a
@ -1024,7 +1024,8 @@ int PerlembParser::SendCommands(
|
|||||||
"merc",
|
"merc",
|
||||||
"npc",
|
"npc",
|
||||||
"questitem",
|
"questitem",
|
||||||
"spell"
|
"spell",
|
||||||
|
"zone"
|
||||||
};
|
};
|
||||||
|
|
||||||
for (const auto& suffix : suffixes) {
|
for (const auto& suffix : suffixes) {
|
||||||
@ -1103,7 +1104,8 @@ int PerlembParser::SendCommands(
|
|||||||
"merc",
|
"merc",
|
||||||
"npc",
|
"npc",
|
||||||
"questitem",
|
"questitem",
|
||||||
"spell"
|
"spell",
|
||||||
|
"zone"
|
||||||
};
|
};
|
||||||
|
|
||||||
for (const auto& suffix : suffixes) {
|
for (const auto& suffix : suffixes) {
|
||||||
|
|||||||
@ -147,10 +147,6 @@ void QuestManager::EndQuest() {
|
|||||||
run.owner->Depop();
|
run.owner->Depop();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (run.zone && run.zone == zone) {
|
|
||||||
zone->StopAllTimers();
|
|
||||||
}
|
|
||||||
|
|
||||||
m_running_quests.pop();
|
m_running_quests.pop();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -3511,12 +3511,12 @@ void Zone::StopAllTimers()
|
|||||||
|
|
||||||
const bool has_stop_event = parse->ZoneHasQuestSub(EVENT_TIMER_STOP);
|
const bool has_stop_event = parse->ZoneHasQuestSub(EVENT_TIMER_STOP);
|
||||||
|
|
||||||
for (auto e = zone_timers.begin(); e != zone_timers.end(); e++) {
|
for (auto e = zone_timers.begin(); e != zone_timers.end();) {
|
||||||
if (has_stop_event) {
|
if (has_stop_event) {
|
||||||
parse->EventZone(EVENT_TIMER_STOP, this, e->name);
|
parse->EventZone(EVENT_TIMER_STOP, this, e->name);
|
||||||
}
|
}
|
||||||
|
|
||||||
zone_timers.erase(e);
|
e = zone_timers.erase(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user