Core/Unit: Restore function of HandleKillPlayer after bf107e0

* also fix build
Mishura4 · Jan 1, 2024 · 78012da · 78012da
1 parent bf107e0
commit 78012da
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git 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
@@ -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);
             }
-Original file line number
+Diff line change
@@ Expand Up @@
         {
             if (Player* killerPlayer = killer->GetCharmerOrOwnerPlayerOrPlayerItself())
                 killerPlayer->CastSpell(killerPlayer, SPELL_DESTROYED_VEHICLE_ACHIEVEMENT, true);
+        }
     }
     void BattlegroundIC::HandleKillPlayer(Player* player, Player* killer)
@@ Expand Down @@