Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/EventProcessor: Check whether an event was aborted before aborting it.

Browse Source 
* Fixes an assertion introduced in commit 1ad73212dc.
* Use itr = std::unordered_map<...>::erase for updating the iterator.

(cherry picked from commit d9755c637c)
This commit is contained in:
Naios
2016-07-03 20:52:50 +02:00
parent 80fe552894
commit a2ac2b3cc7
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/Utilities/EventProcessor.cpp
View File

@@ -82,24 +82,31 @@ void EventProcessor::Update(uint32 p_time)
void EventProcessor::KillAllEvents(bool force)
{
// first, abort all existing events
for (EventList::iterator i = m_events.begin(); i != m_events.end();)
for (auto itr = m_events.begin(); itr != m_events.end();)
{
EventList::iterator i_old = i;
++i;
i_old->second->SetAborted();
i_old->second->Abort(m_time);
if (force || i_old->second->IsDeletable())
// Abort events which weren't aborted already
if (!itr->second->IsAborted())
{
delete i_old->second;
if (!force) // need per-element cleanup
m_events.erase (i_old);
itr->second->SetAborted();
itr->second->Abort(m_time);
}
// Skip non-deletable events when we are
// not forcing the event cancellation.
if (!force && !itr->second->IsDeletable())
{
++itr;
continue;
}
delete itr->second;
if (force)
++itr; // Clear the whole container when forcing
else
itr = m_events.erase(itr);
}
// fast clear event list (in force case)
if (force)
m_events.clear();
}