server/game2001
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复武器问题

Browse Source
This commit is contained in:
aozhiwei 2019-06-04 15:31:00 +08:00
parent 4fdcfae520
commit 727352fb9c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
server/gameserver/human.cc
View File

@ -516,6 +516,7 @@ void Human::FillSMGameOver(cs::SMGameOver& msg)
void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id) void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
{ {
if (!dead && !room->game_over) { if (!dead && !room->game_over) {
lethal_weapon = weapon_id;
Entity* hum = room->GetEntityByUniId(killer_id); Entity* hum = room->GetEntityByUniId(killer_id);
if (hum && hum->entity_type == ET_Player) { if (hum && hum->entity_type == ET_Player) {
if (killer_id == entity_uniid) { if (killer_id == entity_uniid) {
@ -1841,6 +1842,9 @@ void Human::GenBattleReportData(a8::MutableXObject* params)
void Human::InternalSendGameOver() void Human::InternalSendGameOver()
{ {
if (entity_subtype != EST_Player) {
return;
}
if (already_report_battle_) { if (already_report_battle_) {
cs::SMGameOver msg; cs::SMGameOver msg;
FillSMGameOver(msg); FillSMGameOver(msg);