diff --git a/server/gameserver/obstacle.cc b/server/gameserver/obstacle.cc index 93ffa75..afc82c2 100644 --- a/server/gameserver/obstacle.cc +++ b/server/gameserver/obstacle.cc @@ -275,21 +275,13 @@ void Obstacle::Explosion(Bullet* bullet) case ET_Player: { Human* hum = (Human*)target; -#if 1 if (!hum->dead) { -#else - if (!hum->dead && (hum->team_id == 0 || hum->team_id != player->team_id)) { -#endif - float dmg = meta->i->damage(); - #if 1 - float def = hum->ability.def; - #else - float def = hum->def + hum->buff.def_add; - #endif - float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K); - hum->DecHP(finaly_dmg, VP_Mine, "地雷", VW_Mine); - } + float dmg = meta->i->damage(); + float def = hum->ability.def; + float finaly_dmg = dmg * (1 - def/MetaMgr::Instance()->K); + hum->DecHP(finaly_dmg, VP_Mine, "地雷", VW_Mine); } + } break; case ET_Obstacle: {