mirror/azerothcore-wotlk
1
0
Fork 1
mirror of https://gitcode.com/GitHub_Trending/az/azerothcore-wotlk.git synced 2026-07-11 03:13:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:azerothshard/azerothcore

Browse Source
This commit is contained in:
Yehonal
2016-07-19 23:12:48 +02:00
parent 7d2b2c3530 a205dfdbd2
commit 078592a6ca
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Pet/pet_dk.cpp
+3 -3
View File
@@ -354,7 +354,7 @@ public:
if (!me->IsInCombat())
{
Unit* ownerTarget = nullptr;
Unit* ownerTarget = NULL;
if (Player* owner = me->GetCharmerOrOwner()->ToPlayer())
ownerTarget = owner->GetSelectedUnit();
@@ -440,9 +440,9 @@ public:
Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(me, targets, u_check);
me->VisitNearbyObject(40.0f, searcher);
Unit* highestThreatUnit = nullptr;
Unit* highestThreatUnit = NULL;
float highestThreat = 0.0f;
Unit* nearestPlayer = nullptr;
Unit* nearestPlayer = NULL;
for (std::list<Unit*>::const_iterator iter = targets.begin(); iter != targets.end(); ++iter)
{
// Consider only units without CC