Core/CreatureAI: Disable PetAI from database

2 files changed, 3 insertions, 1 deletions

diff --git a/src/server/game/AI/CoreAI/PetAI.cpp b/src/server/game/AI/CoreAI/PetAI.cpp
index 1fad18a2713..98841effb3b 100644
--- a/src/server/game/AI/CoreAI/PetAI.cpp
+++ b/src/server/game/AI/CoreAI/PetAI.cpp
@@ -550,6 +550,8 @@ bool PetAI::CanAttack(Unit* target)
         return false;
     }
 
+    ASSERT(me->GetCharmInfo());
+
     // Passive - passive pets can attack if told to
     if (me->HasReactState(REACT_PASSIVE))
         return me->GetCharmInfo()->IsCommandAttack();
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index f7d63afb3f1..ece9bdd7015 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -817,7 +817,7 @@ void ObjectMgr::CheckCreatureTemplate(CreatureTemplate const* cInfo)
         const_cast<CreatureTemplate*>(cInfo)->maxgold = cInfo->mingold;
     }
 
-    if (cInfo->AIName == "TotemAI")
+    if (cInfo->AIName == "TotemAI" || cInfo->AIName == "PetAI")
     {
         TC_LOG_ERROR("sql.sql", "Creature (Entry: %u) has not-allowed `AIName` '%s' set, removing", cInfo->Entry, cInfo->AIName.c_str());
         const_cast<CreatureTemplate*>(cInfo)->AIName.clear();