diff --git a/server/gameserver/human.cc b/server/gameserver/human.cc
index 3130da2..f1092a3 100644
--- a/server/gameserver/human.cc
+++ b/server/gameserver/human.cc
@@ -516,6 +516,7 @@ void Human::FillSMGameOver(cs::SMGameOver& msg)
 void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
 {
     if (!dead && !room->game_over) {
+        lethal_weapon = weapon_id;
         Entity* hum = room->GetEntityByUniId(killer_id);
         if (hum && hum->entity_type == ET_Player) {
             if (killer_id == entity_uniid) {
@@ -1841,6 +1842,9 @@ void Human::GenBattleReportData(a8::MutableXObject* params)
 
 void Human::InternalSendGameOver()
 {
+    if (entity_subtype != EST_Player) {
+        return;
+    }
     if (already_report_battle_) {
         cs::SMGameOver msg;
         FillSMGameOver(msg);