Core/Unit: Restore function of HandleKillPlayer after bf107e0581c58f767b21f15fe7f75cb7eac95d97

* also fix build

2 files changed, 5 insertions, 1 deletions

diff --git a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
index f604f83dc0c..e34a0adaf52 100644
--- a/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
+++ b/src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
@@ -387,6 +387,7 @@ void BattlegroundIC::HandleKillUnit(Creature* unit, Unit* killer)
     {
         if (Player* killerPlayer = killer->GetCharmerOrOwnerPlayerOrPlayerItself())
             killerPlayer->CastSpell(killerPlayer, SPELL_DESTROYED_VEHICLE_ACHIEVEMENT, true);
+    }
 }
 
 void BattlegroundIC::HandleKillPlayer(Player* player, Player* killer)
diff --git a/src/server/game/Entities/Unit/Unit.cpp b/src/server/game/Entities/Unit/Unit.cpp
index a930d11acd5..31d30c9949b 100644
--- a/src/server/game/Entities/Unit/Unit.cpp
+++ b/src/server/game/Entities/Unit/Unit.cpp
@@ -10957,7 +10957,10 @@ void Unit::SetMeleeAnimKitId(uint16 animKitId)
             if (Battleground* bg = bgMap->GetBG())
             {
                 if (Player* playerVictim = victim->ToPlayer())
-                    bg->HandleKillPlayer(playerVictim, player);
+                {
+                    if (player)
+                        bg->HandleKillPlayer(playerVictim, player);
+                }
                 else
                     bg->HandleKillUnit(victim->ToCreature(), attacker);
             }