aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2019-04-28 18:47:19 +0200
committerjackpoz <giacomopoz@gmail.com>2019-04-28 18:47:19 +0200
commit70fcdc687d1227a796c03f6353fc8dbfc4f4aea3 (patch)
treeb102480f9a62b32cb23e7886a34e7be81e1a68ec /src
parent37478c5ac1efb8e4f19ffc94f444e160600c7b27 (diff)
Core/Pet: Change assert to error log
Change assert added in 43dec9e4d0b6f7da3c2051624742e9fb8a9bcb31 to error log since charmed creatures lose their AI until next map update
Diffstat (limited to 'src')
-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 d86334afc89..2fac6c180e6 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -10943,7 +10943,12 @@ bool Unit::InitTamedPet(Pet* pet, uint8 level, uint32 spell_id)
{
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());
+ }
}
// 10% durability loss on death