diff options
| author | ariel- <ariel-@users.noreply.github.com> | 2016-10-17 04:55:44 -0300 |
|---|---|---|
| committer | joschiwald <joschiwald.trinity@gmail.com> | 2017-10-03 21:14:28 +0200 |
| commit | 88ae5f6068c158ab342c7dc0c3396d8426306952 (patch) | |
| tree | 91e948eaf0e8d8b345448634a4e5d3db42650c55 /src | |
| parent | 93973b87b16feb145abd3898815fbe457b684d5e (diff) | |
Core/Unit: Change aura proc pair container to vector
(cherry picked from commit 34f734c89047900da30c8bfea61af1be567bf7c8)
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.cpp | 4 | ||||
| -rw-r--r-- | src/server/game/Entities/Unit/Unit.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index cd6bf8073da..62beb6dedef 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -10171,7 +10171,7 @@ void Unit::GetProcAurasTriggeredOnEvent(AuraApplicationProcContainer& aurasTrigg if (uint32 procEffectMask = aurApp->GetBase()->IsProcTriggeredOnEvent(aurApp, eventInfo, now)) { aurApp->GetBase()->PrepareProcToTrigger(aurApp, eventInfo, now); - aurasTriggeringProc.emplace_back(std::make_pair(procEffectMask, aurApp)); + aurasTriggeringProc.emplace_back(procEffectMask, aurApp); } } } @@ -10183,7 +10183,7 @@ void Unit::GetProcAurasTriggeredOnEvent(AuraApplicationProcContainer& aurasTrigg if (uint32 procEffectMask = itr->second->GetBase()->IsProcTriggeredOnEvent(itr->second, eventInfo, now)) { itr->second->GetBase()->PrepareProcToTrigger(itr->second, eventInfo, now); - aurasTriggeringProc.emplace_back(std::make_pair(procEffectMask, itr->second)); + aurasTriggeringProc.emplace_back(procEffectMask, itr->second); } } } diff --git a/src/server/game/Entities/Unit/Unit.h b/src/server/game/Entities/Unit/Unit.h index 572a6ec4c8c..84e769c3e3d 100644 --- a/src/server/game/Entities/Unit/Unit.h +++ b/src/server/game/Entities/Unit/Unit.h @@ -966,7 +966,7 @@ class TC_GAME_API Unit : public WorldObject typedef std::list<AuraApplication *> AuraApplicationList; typedef std::array<DiminishingReturn, DIMINISHING_MAX> Diminishing; - typedef std::deque<std::pair<uint32 /*procEffectMask*/, AuraApplication*>> AuraApplicationProcContainer; + typedef std::vector<std::pair<uint32 /*procEffectMask*/, AuraApplication*>> AuraApplicationProcContainer; struct VisibleAuraSlotCompare { bool operator()(AuraApplication* left, AuraApplication* right) const; }; typedef std::set<AuraApplication*, VisibleAuraSlotCompare> VisibleAuraContainer; |
