diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc
index c883e54..dd8fd8c 100644
--- a/server/gameserver/bullet.cc
+++ b/server/gameserver/bullet.cc
@@ -36,11 +36,22 @@ void Bullet::Update(int delta_time)
     } else {
         std::set<Entity*> objects;
         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)) {
+#endif
+                    if (TestCollision(hum)) {
+                        objects.insert(hum);
+                    }
+                }
+            }
             for (Entity* entity : grid->entity_list) {
                 switch (entity->entity_type) {
                 case ET_Obstacle:
                 case ET_Building:
-                case ET_Player:
                     {
                         if (TestCollision(entity)) {
                             objects.insert(entity);