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/EventMap: Unify semantics of DelayEvents

Browse Source 
DelayEvents(Milliseconds delay) had different semantics than
DelayEvents(Milliseconds delay, uint32 group).
The first method delayed the events only in the case the internal timer
already ticked at least for the amount of delay. In contrast the latter method
delayed events regardless of the internal timer value.

Use the latter semantics for DelayEvents(Milliseconds delay) as well which makes
the outcome more predictable. Adapt tests accordingly.

(cherry picked from commit 4470b91223)
This commit is contained in:
Carbenium
2020-07-25 17:59:34 +02:00
committed by Shauren
parent 5512eb2f8f
commit a5d85deced
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/Utilities/EventMap.cpp
View File

@@ -94,7 +94,16 @@ uint32 EventMap::ExecuteEvent()
void EventMap::DelayEvents(Milliseconds delay)
{
_time = delay < _time - _time.min() ? _time - delay : TimePoint::min();
if (Empty())
return;
EventStore delayed = std::move(_eventMap);
for (EventStore::iterator itr = delayed.begin(); itr != delayed.end();)
{
EventStore::node_type node = delayed.extract(itr++);
node.key() = node.key() + delay;
_eventMap.insert(_eventMap.end(), std::move(node));
}
}
void EventMap::DelayEvents(Milliseconds delay, uint32 group)