From 727352fb9cda6bd318e433f2d0b6c0788199d90e Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 4 Jun 2019 15:31:00 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=AD=A6=E5=99=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/human.cc | 4 ++++ 1 file changed, 4 insertions(+) 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);