diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp index 4af0aa5c4..9d1b0a377 100644 --- a/src/server/game/Entities/Unit/Unit.cpp +++ b/src/server/game/Entities/Unit/Unit.cpp @@ -17852,13 +17852,6 @@ void Unit::Kill(Unit* killer, Unit* victim, bool durabilityLoss, WeaponAttackTyp isRewardAllowed = creature->IsDamageEnoughForLootingAndReward(); if (!isRewardAllowed) creature->SetLootRecipient(nullptr); - - // Call creature just died function - if (CreatureAI* ai = creature->AI()) - { - ai->JustDied(killer); - sScriptMgr->OnUnitDeath(creature, killer); - } } // pussywizard: remade this if section (player is on the same map @@ -18081,6 +18074,13 @@ void Unit::Kill(Unit* killer, Unit* victim, bool durabilityLoss, WeaponAttackTyp if (killer && killer->GetTypeId() == TYPEID_UNIT && killer->IsAIEnabled) killer->ToCreature()->AI()->KilledUnit(victim); + // Call creature just died function + if (CreatureAI* ai = creature->AI()) + { + ai->JustDied(killer); + sScriptMgr->OnUnitDeath(creature, killer); + } + if (TempSummon* summon = creature->ToTempSummon()) { if (WorldObject* summoner = summon->GetSummoner())