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

1

Browse Source
This commit is contained in:
aozhiwei 2022-11-21 14:45:30 +08:00
parent 23a7d85ff4
commit 85fa3e272c
2 changed files with 7 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

@ -3863,7 +3863,11 @@ void Human::OnExplosionHit(Explosion* e)
RemoveBuffByEffectId(kBET_PeaceMode); RemoveBuffByEffectId(kBET_PeaceMode);
float finaly_dmg = GetBattleContext()->CalcDmg(e); float finaly_dmg = GetBattleContext()->CalcDmg(e);
#if 1
{
#else
if (e->GetSender().Get()) { if (e->GetSender().Get()) {
#endif
DecHP(finaly_dmg, DecHP(finaly_dmg,
VP_Explosion, VP_Explosion,
"", "",

3
server/gameserver/player.cc
View File

@ -436,6 +436,9 @@ void Player::UpdateUseItemIdx()
if (use_item_idx >= 0 && use_item_idx < IS_END) { if (use_item_idx >= 0 && use_item_idx < IS_END) {
MetaData::Equip* item_meta = MetaMgr::Instance()->GetEquipBySlotId(use_item_idx); MetaData::Equip* item_meta = MetaMgr::Instance()->GetEquipBySlotId(use_item_idx);
if (item_meta) { if (item_meta) {
if (GetInventory(item_meta->i->_inventory_slot()) <= 0) {
return;
}
int use_time = item_meta->i->use_time(); int use_time = item_meta->i->use_time();
switch (use_item_idx) { switch (use_item_idx) {
case IS_HEALTHKIT: case IS_HEALTHKIT: