Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw

3 files changed, 6 insertions, 5 deletions

diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp
index 31a6af2fc1c..799aaf5d0a2 100644
--- a/src/server/scripts/Pet/pet_dk.cpp
+++ b/src/server/scripts/Pet/pet_dk.cpp
@@ -47,13 +47,14 @@ class npc_pet_dk_ebon_gargoyle : public CreatureScript
 
             void InitializeAI() OVERRIDE
             {
+                // Not needed to be despawned now
+                _despawnTimer = 0;
+
                 CasterAI::InitializeAI();
                 uint64 ownerGuid = me->GetOwnerGUID();
                 if (!ownerGuid)
                     return;
-
-                // Not needed to be despawned now
-                _despawnTimer = 0;
+                
                 // Find victim of Summon Gargoyle spell
                 std::list<Unit*> targets;
                 Trinity::AnyUnfriendlyUnitInObjectRangeCheck u_check(me, me, 30.0f);
diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp
index f10a14716c6..f59f850c20b 100644
--- a/src/server/scripts/Pet/pet_generic.cpp
+++ b/src/server/scripts/Pet/pet_generic.cpp
@@ -62,7 +62,7 @@ class npc_pet_gen_mojo : public CreatureScript
                     return;
                 }
 
-                Talk(SAY_MOJO, player->GetGUID());
+                Talk(SAY_MOJO, player);
 
                 if (_victimGUID)
                     if (Player* victim = ObjectAccessor::GetPlayer(*me, _victimGUID))
diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp
index 85247b29f84..7ac50f4313c 100644
--- a/src/server/scripts/Pet/pet_mage.cpp
+++ b/src/server/scripts/Pet/pet_mage.cpp
@@ -49,7 +49,7 @@ class npc_pet_mage_mirror_image : public CreatureScript
                 // Inherit Master's Threat List (not yet implemented)
                 owner->CastSpell((Unit*)NULL, SPELL_MAGE_MASTERS_THREAT_LIST, true);
                 // here mirror image casts on summoner spell (not present in client dbc) 49866
-                // here should be auras (not present in client dbc): 35657, 35658, 35659, 35660 selfcasted by mirror images (stats related?)
+                // here should be auras (not present in client dbc): 35657, 35658, 35659, 35660 selfcast by mirror images (stats related?)
                 // Clone Me!
                 owner->CastSpell(me, SPELL_MAGE_CLONE_ME, false);
             }