Let world dispatch expedition expire warnings

This depends on C++14 remaining enabled for chrono literals
This commit is contained in:
hg
2020-10-06 22:23:31 -04:00
parent da5d4b9830
commit ca113cdd85
5 changed files with 44 additions and 17 deletions
+3 -6
View File
@@ -1524,16 +1524,13 @@ bool Zone::Process() {
if (minutes_warning > 0)
{
// expedition expire warnings are handled by world
auto expedition = Expedition::FindCachedExpeditionByZoneInstance(GetZoneID(), GetInstanceID());
if (expedition)
{
expedition->SendWorldExpireWarning(minutes_warning);
}
else
if (!expedition)
{
entity_list.ExpeditionWarning(minutes_warning);
Instance_Warning_timer = new Timer(10000);
}
Instance_Warning_timer = new Timer(10000);
}
}
else if(Instance_Warning_timer->Check())