Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts: dep/PackageList.txt src/tools/map_extractor/System.cpp
This commit is contained in:
commit
874ddcb0ae
72 files changed
+6074
-2968
No files matched your search
@@ -41,8 +41,10 @@ class SummonList : public std::list<uint64>
|
||||
|
||||
template <class Predicate> void DoAction(int32 info, Predicate& predicate, uint16 max = 0)
|
||||
{
|
||||
Trinity::Containers::RandomResizeList<uint64, Predicate>(*this, predicate, max);
|
||||
for (iterator i = begin(); i != end(); )
|
||||
// We need to use a copy of SummonList here, otherwise original SummonList would be modified
|
||||
std::list<uint64> listCopy = *this;
|
||||
Trinity::Containers::RandomResizeList<uint64, Predicate>(listCopy, predicate, max);
|
||||
for (iterator i = listCopy.begin(); i != listCopy.end(); )
|
||||
{
|
||||
Creature* summon = Unit::GetCreature(*me, *i++);
|
||||
if (summon && summon->IsAIEnabled)
|
||||
|
||||
Reference in new issue
Block a user