diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc
index 132d00b..cc84889 100644
--- a/server/gameserver/bullet.cc
+++ b/server/gameserver/bullet.cc
@@ -151,7 +151,7 @@ void Bullet::ProcBomb()
     for (auto& grid : grid_list) {
         for (Human* hum: grid->human_list) {
 #if 1
-            if (hum != player) {
+            {
 #else
                 if (hum != player &&
                     (hum->team_id == 0 || player->team_id != hum->team_id)) {
diff --git a/server/gameserver/player.cc b/server/gameserver/player.cc
index cba84be..378e31a 100644
--- a/server/gameserver/player.cc
+++ b/server/gameserver/player.cc
@@ -154,12 +154,12 @@ void Player::UpdateShot()
         ++series_shot_frames;
         if (last_shot_frameno_ == 0 ||
             (
-             (room->frame_no - last_shot_frameno_) * (1000 / SERVER_FRAME_RATE)) >
+             (room->frame_no - last_shot_frameno_) * (1000 / SERVER_FRAME_RATE)) >=
             curr_weapon->meta->i->fire_rate()
             ) {
             Shot();
         }
-        if (series_shot_frames > 4) {
+        if (series_shot_frames > 8) {
             shot_hold = false;
             series_shot_frames = 0;
         }