From b638ec33ff055b3ea70c68d86c399c5c37df792f Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Fri, 24 Apr 2020 15:37:38 +0800 Subject: [PATCH] =?UTF-8?q?=E6=89=8B=E9=9B=B7=E5=8F=96=E6=B6=88=E5=8F=8B?= =?UTF-8?q?=E5=86=9B=E4=BC=A4=E5=AE=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- server/gameserver/bullet.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc index 828337d..b4d1a75 100644 --- a/server/gameserver/bullet.cc +++ b/server/gameserver/bullet.cc @@ -127,7 +127,9 @@ void Bullet::ProcBomb() for (Human* hum: grid->human_list) { if (!is_tank_skin || player->team_id != hum->team_id) { //友军火箭筒伤害取消 - if (meta->i->_inventory_slot() == 4 && player->team_id == hum->team_id) { + if ((meta->i->_inventory_slot() == 4 || + meta->i->_inventory_slot() == 5) && + player->team_id == hum->team_id) { continue; } if (TestCollision(hum)) {