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

修复火焰枪战前伤害问题

Browse Source
This commit is contained in:
aozhiwei 2022-05-10 08:56:53 +08:00
parent b9fcee3e99
commit 1be8e2da29
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/gameserver/buff.cc
View File

@ -776,7 +776,7 @@ void Buff::ProcDive()
} }
hum->DecHP(MetaMgr::Instance()->dive_hp_consume, hum->DecHP(MetaMgr::Instance()->dive_hp_consume,
VP_Water, VP_Water,
"水", "water",
0); 0);
}, },
&xtimer_attacher.timer_list_ &xtimer_attacher.timer_list_

3
server/gameserver/human.cc
View File

@ -860,6 +860,9 @@ void Human::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id) void Human::DecHP(float dec_hp, int killer_id, const std::string& killer_name, int weapon_id)
{ {
if (!c->room->BattleStarted()) {
return;
}
#ifdef DEBUG #ifdef DEBUG
#if 0 #if 0
if (IsPlayer()) { if (IsPlayer()) {