diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc
index bbf36cb..33ba5c2 100644
--- a/server/gameserver/bullet.cc
+++ b/server/gameserver/bullet.cc
@@ -113,34 +113,27 @@ void Bullet::ProcBomb()
     std::set<Entity*> objects;
     for (auto& grid : grid_list) {
         for (Human* hum: grid->human_list) {
-#if 1
-            {
-#else
-                if (hum != player &&
-                    (hum->team_id == 0 || player->team_id != hum->team_id)) {
-#endif
-                    if (TestCollision(hum)) {
-                        objects.insert(hum);
+            if (TestCollision(hum)) {
+                objects.insert(hum);
+            }
+        }
+        for (Entity* entity : grid->entity_list) {
+            switch (entity->entity_type) {
+            case ET_Obstacle:
+            case ET_Building:
+                {
+                    if (TestCollision(entity)) {
+                        objects.insert(entity);
                     }
                 }
-            }
-            for (Entity* entity : grid->entity_list) {
-                switch (entity->entity_type) {
-                case ET_Obstacle:
-                case ET_Building:
-                    {
-                        if (TestCollision(entity)) {
-                            objects.insert(entity);
-                        }
-                    }
-                    break;
-                default:
-                    {
-                    }
-                    break;
+                break;
+            default:
+                {
                 }
+                break;
             }
-        }//end for
+        }
+    }//end for
 
     room->RemoveObjectLater(this);
 }