1

2019-04-17 11:51:27 +08:00 · 2019-04-17 11:51:27 +08:00 · 75b60a46ba
commit 75b60a46ba
parent 5a281bf4f1
1 changed files with 4 additions and 0 deletions
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@ -360,8 +360,12 @@ void Room::CollisionDetection(Entity* sender, int detection_flags, std::vector<E
            if (sender->entity_type == ET_Bullet) {
                Bullet* bullet = (Bullet*)sender;
                Human* hum = (Human*)pair.second;
+#if 1
+                if (hum != bullet->player) {
+#else
                if (hum != bullet->player &&
                    (hum->team_id == 0 || bullet->player->team_id != hum->team_id)) {
+#endif
                    if (bullet->TestCollision(hum)) {
                        objects.push_back(hum);
                    }