PetAI: Enable more extensive scripting for pets

src/game/AI/BaseAI/PetAI.cpp

@@ -35,7 +35,12 @@ int PetAI::Permissible(const Creature* creature)
     return PERMIT_BASE_NO;
 }
 
-PetAI::PetAI(Creature* creature) : CreatureAI(creature), inCombat(false)
+PetAI::PetAI(Creature* creature) : PetAI(creature, 0)
+{
+
+}
+
+PetAI::PetAI(Creature* creature, uint32 combatActions) : CreatureAI(creature, combatActions), inCombat(false)
 {
     m_followAngle = M_PI_F / 2;
     m_followDist = 1.5f;
@@ -134,12 +139,19 @@ void PetAI::EnterEvadeMode()
 
 void PetAI::UpdateAI(const uint32 diff)
 {
+    Unit* owner = m_unit->GetMaster();
+
+    if (CanHandleCharm() && !owner)
+    {
+        CreatureAI::UpdateAI(diff);
+        return;
+    }
+
     UpdateTimers(diff, m_creature->IsInCombat());
 
     Creature* creature = (m_unit->GetTypeId() == TYPEID_UNIT) ? static_cast<Creature*>(m_unit) : nullptr;
     Pet* pet = (creature && creature->IsPet()) ? static_cast<Pet*>(m_unit) : nullptr;
 
-    Unit* owner = m_unit->GetMaster();
     if (!owner)
         return;
 
@@ -182,6 +194,8 @@ void PetAI::UpdateAI(const uint32 diff)
         charminfo->SetIsRetreating();
     }
 
+    ExecuteActions();
+
     // Stop here if casting spell (No melee and no movement)
     if (m_unit->IsNonMeleeSpellCasted(false))
         return;
@@ -439,6 +453,12 @@ void PetAI::JustDied(Unit* killer)
 void PetAI::AttackedBy(Unit* attacker)
 {
     CharmInfo* charminfo = m_unit->GetCharmInfo();
+    if (CanHandleCharm() && !charminfo)
+    {
+        CreatureAI::AttackedBy(attacker);
+        return;
+    }
+
     MANGOS_ASSERT(charminfo);
 
     // when attacked, fight back if no victim unless we have a charm state set to passive

src/game/AI/BaseAI/PetAI.h

@@ -31,6 +31,7 @@ class PetAI : public CreatureAI
     public:
 
         explicit PetAI(Creature* creature);
+        explicit PetAI(Creature* creature, uint32 combatActions);
 
         void MoveInLineOfSight(Unit* who) override;
         void AttackStart(Unit* who) override;

src/game/AI/BaseAI/UnitAI.h

@@ -475,7 +475,7 @@ class UnitAI : public CombatActions
         virtual void JustStunnedTarget(SpellEntry const* spellInfo, Unit* victim) { JustStoppedMovementOfTarget(spellInfo, victim); }
 
         // AI selection - works in connection with IsPossessCharmType
-        virtual bool CanHandleCharm() { return false; }
+        virtual bool CanHandleCharm() const { return false; }
         virtual void JustGotCharmed(Unit* charmer) {}
 
         // Movement generator responses

src/game/AI/ScriptDevAI/scripts/eastern_kingdoms/karazhan/chess_event.cpp

@@ -340,7 +340,7 @@ struct npc_chess_piece_genericAI : public Scripted_NoMovementAI
     void MoveInLineOfSight(Unit* /*pWho*/) override { }
     void AttackStart(Unit* /*pWho*/) override { }
     void EnterEvadeMode() override { }
-    bool CanHandleCharm() override { return true; }
+    bool CanHandleCharm() const override { return true; }
 
     void JustDied(Unit* /*pKiller*/) override
     {

src/game/AI/ScriptDevAI/scripts/outland/blades_edge_mountains.cpp

@@ -1832,7 +1832,7 @@ struct npc_fel_cannon : public Scripted_NoMovementAI
         m_creature->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNINTERACTIBLE);
     }
 
-    bool CanHandleCharm() override { return true; }
+    bool CanHandleCharm() const override { return true; }
 
     void SpellHit(Unit* /*pCaster*/, const SpellEntry* pSpell) override
     {

src/game/AI/ScriptDevAI/scripts/outland/hellfire_peninsula.cpp

@@ -2362,7 +2362,7 @@ struct npc_razorthorn_ravager : public CombatAI
 
     }
 
-    bool CanHandleCharm() override { return true; }
+    bool CanHandleCharm() const override { return true; }
 
     void JustGotCharmed(Unit* /*charmer*/) override
     {

src/game/AI/ScriptDevAI/scripts/outland/netherstorm.cpp

@@ -2766,7 +2766,7 @@ struct npc_scrap_reaverAI : ScriptedPetAI
 
     }
 
-    bool CanHandleCharm() override { return true; }
+    bool CanHandleCharm() const override { return true; }
 
     void JustRespawned() override
     {