From 73fc8b0a3dd462cb6af35b249a3c3de1245ab6d2 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Tue, 16 Apr 2019 11:54:45 +0800
Subject: [PATCH] 1

---
 server/gameserver/bullet.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/gameserver/bullet.cc b/server/gameserver/bullet.cc
index ee5640a..08b2d70 100644
--- a/server/gameserver/bullet.cc
+++ b/server/gameserver/bullet.cc
@@ -74,7 +74,7 @@ void Bullet::OnHit(std::vector<Entity*>& objects)
         case ET_Player:
             {
                 Human* hum = (Human*)target;
-                if (!hum->dead) {
+                if (!hum->dead && (hum->team_id == 0 || hum->team_id != player->team_id)) {
                     player->stats.damage_amount += 10;
                     hum->DecHP(10, player->entity_uniid, player->name);
                 }