From 2990a44ca2debecc1cef3a57ff4ef768bf425065 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Thu, 25 Apr 2019 17:11:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E8=87=AA=E5=B7=B1?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/gameserver/bullet.cc | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

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);