From 33a8d42bd79265dcc6930b67f8ceb26622d5e0fe Mon Sep 17 00:00:00 2001
From: HelloKitty <andrew.blakely@ymail.com>
Date: Mon, 18 Aug 2025 09:28:37 -0500
Subject: Script/Commands: Fix crash in `.pet create` command if
 Unit::CreateTamedPetFrom returns nullptr (#31218)

---
 src/server/scripts/Commands/cs_pet.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/server/scripts/Commands/cs_pet.cpp b/src/server/scripts/Commands/cs_pet.cpp
index 1dfc4bfdeb8..072cc68db78 100644
--- a/src/server/scripts/Commands/cs_pet.cpp
+++ b/src/server/scripts/Commands/cs_pet.cpp
@@ -95,6 +95,12 @@ public:
 
         // Everything looks OK, create new pet
         Pet* pet = player->CreateTamedPetFrom(creatureTarget);
+        if (!pet)
+        {
+            handler->PSendSysMessage("CreateTamedPetFrom returned null.");
+            handler->SetSentErrorMessage(true);
+            return false;
+        }
 
         // "kill" original creature
         creatureTarget->DespawnOrUnsummon();
-- 
cgit v1.2.3