aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/scripts/Commands/cs_pet.cpp6
1 files changed, 6 insertions, 0 deletions
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();