Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/Misc: apply missile canceling codestyle changes based on master branch feedback

Browse Source
This commit is contained in:
Ovahlord
2020-08-06 13:38:28 +02:00
parent ac6604fba7
commit d45d4ed0de
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/Utilities/EventProcessor.h
View File

@@ -70,8 +70,6 @@ class TC_COMMON_API BasicEvent
uint64 m_execTime; // planned time of next execution, filled by event handler
};
typedef std::multimap<uint64, BasicEvent*> EventList;
template<typename T>
class LambdaBasicEvent : public BasicEvent
{
@@ -111,11 +109,11 @@ class TC_COMMON_API EventProcessor
is_lambda_event<T> AddEventAtOffset(T&& event, Milliseconds offset, Milliseconds offset2) { AddEventAtOffset(new LambdaBasicEvent<T>(std::move(event)), offset, offset2); }
void ModifyEventTime(BasicEvent* event, uint64 newTime);
uint64 CalculateTime(uint64 t_offset) const { return m_time + t_offset; }
EventList& GetEventList() { return m_events; }
std::multimap<uint64, BasicEvent*>& GetEvents() { return m_events; }
protected:
uint64 m_time;
EventList m_events;
std::multimap<uint64, BasicEvent*> m_events;
};
#endif

4
src/server/game/Entities/Unit/Unit.cpp
View File

@@ -12517,10 +12517,8 @@ void Unit::SendPlaySpellVisualKit(uint32 id, uint32 type, uint32 duration) const
void Unit::CancelSpellMissiles(uint32 spellId, bool reverseMissile /*= false*/)
{
EventList& eventList = m_Events.GetEventList();
bool hasMissile = false;
for (auto itr : eventList)
for (auto itr : m_Events.GetEvents())
{
if (Spell const* spell = Spell::ExtractSpellFromEvent(itr.second))
{