aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/server/game/Entities/Unit/Unit.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index 4e9b7c222c9..d37f06ca242 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -10476,7 +10476,12 @@ void Unit::SetMeleeAnimKitId(uint16 animKitId)
{
Pet* pet = player->GetPet();
if (pet && pet->IsAlive() && pet->isControlled())
- ASSERT_NOTNULL(pet->AI())->KilledUnit(victim);
+ {
+ if (pet->IsAIEnabled())
+ pet->AI()->KilledUnit(victim);
+ else
+ TC_LOG_ERROR("entities.unit", "Pet doesn't have any AI in Unit::Kill(). %s", pet->GetDebugInfo().c_str());
+ }
}
// 10% durability loss on death