add nullptr safety around pet commands

fix pet state command close cmangos#492
Daxiongmao87 · Dec 29, 2021 · 8aa3936 · 8aa3936
1 parent f9b179b
commit 8aa3936
Showing 1 changed file with 13 additions and 2 deletions.
diff --git a/src/game/PlayerBot/Base/PlayerbotAI.cpp b/src/game/PlayerBot/Base/PlayerbotAI.cpp
@@ -7446,8 +7446,10 @@ void PlayerbotAI::_HandleCommandPet(std::string& text, Player& fromPlayer)
             return;
         }
 
-        std::string state;
-        switch (pet->GetCharmInfo()->GetAI()->GetReactState())
+        if(!pet || !pet->AI())
+            return;
+
+        switch (pet->AI()->GetReactState())
         {
             case REACT_AGGRESSIVE:
                 SendWhisper("My pet is aggressive.", fromPlayer);
@@ -7467,6 +7469,9 @@ void PlayerbotAI::_HandleCommandPet(std::string& text, Player& fromPlayer)
             return;
         }
 
+        if(!pet)
+            return;
+
         uint32 spellId = (uint32) atol(text.c_str());
 
         if (spellId == 0)
@@ -7497,6 +7502,9 @@ void PlayerbotAI::_HandleCommandPet(std::string& text, Player& fromPlayer)
             return;
         }
 
+        if(!pet)
+            return;
+
         uint32 spellId = (uint32) atol(text.c_str());
 
         if (spellId == 0)
@@ -7530,6 +7538,9 @@ void PlayerbotAI::_HandleCommandPet(std::string& text, Player& fromPlayer)
             return;
         }
 
+        if(!pet)
+            return;
+
         int loc = GetMaster()->GetSession()->GetSessionDbcLocale();
 
         std::ostringstream posOut;