diff options
Diffstat (limited to 'src/server/scripts/Pet')
| -rw-r--r-- | src/server/scripts/Pet/pet_dk.cpp | 4 | ||||
| -rw-r--r-- | src/server/scripts/Pet/pet_generic.cpp | 10 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp index b24336cb33c..edbec51f4b1 100644 --- a/src/server/scripts/Pet/pet_dk.cpp +++ b/src/server/scripts/Pet/pet_dk.cpp @@ -59,7 +59,7 @@ class npc_pet_dk_ebon_gargoyle : public CreatureScript Initialize(); CasterAI::InitializeAI(); - uint64 ownerGuid = me->GetOwnerGUID(); + ObjectGuid ownerGuid = me->GetOwnerGUID(); if (!ownerGuid) return; @@ -69,7 +69,7 @@ class npc_pet_dk_ebon_gargoyle : public CreatureScript Trinity::UnitListSearcher<Trinity::AnyUnfriendlyUnitInObjectRangeCheck> searcher(me, targets, u_check); me->VisitNearbyObject(30.0f, searcher); for (std::list<Unit*>::const_iterator iter = targets.begin(); iter != targets.end(); ++iter) - if ((*iter)->GetAura(SPELL_DK_SUMMON_GARGOYLE_1, ownerGuid)) + if ((*iter)->HasAura(SPELL_DK_SUMMON_GARGOYLE_1, ownerGuid)) { me->Attack((*iter), false); break; diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index d0e950dec32..538dca8e4b9 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -41,17 +41,11 @@ class npc_pet_gen_mojo : public CreatureScript { npc_pet_gen_mojoAI(Creature* creature) : ScriptedAI(creature) { - Initialize(); - } - - void Initialize() - { - _victimGUID = 0; } void Reset() override { - Initialize(); + _victimGUID.Clear(); if (Unit* owner = me->GetOwner()) me->GetMotionMaster()->MoveFollow(owner, 0.0f, 0.0f); @@ -84,7 +78,7 @@ class npc_pet_gen_mojo : public CreatureScript } private: - uint64 _victimGUID; + ObjectGuid _victimGUID; }; CreatureAI* GetAI(Creature* creature) const override |