Move hook to protect against NULL being passed causing crash

Eluna-Ports · Dec 19, 2023 · e075193 · e075193
1 parent e49e02e
commit e075193
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/src/game/Entities/Unit.cpp b/src/game/Entities/Unit.cpp
@@ -1158,6 +1158,15 @@ void Unit::Kill(Unit* killer, Unit* victim, DamageEffectType damagetype, SpellEn
 
     if (killer)
     {
+#ifdef BUILD_ELUNA
+        if (Creature* killerCre = killer->ToCreature())
+        {
+            // used by eluna
+            if (Player* killed = victim->ToPlayer())
+                sEluna->OnPlayerKilledByCreature(killerCre, killed);
+        }
+#endif
+
         // Call KilledUnit for creatures
         if (UnitAI* ai = killer->AI())
             ai->KilledUnit(victim);
@@ -1239,15 +1248,6 @@ void Unit::Kill(Unit* killer, Unit* victim, DamageEffectType damagetype, SpellEn
     else                                                // Killed creature
         JustKilledCreature(killer, static_cast<Creature*>(victim), responsiblePlayer);
 
-#ifdef BUILD_ELUNA
-    if (Creature* killerCre = killer->ToCreature())
-    {
-        // used by eluna
-        if (Player* killed = victim->ToPlayer())
-            sEluna->OnPlayerKilledByCreature(killerCre, killed);
-    }
-#endif
-
     // stop combat
     DEBUG_FILTER_LOG(LOG_FILTER_DAMAGE, "DealDamageAttackStop");
     victim->CombatStop();