From fe942b05433375dbb92a428ed36c2ed22c3343af Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Sun, 28 Apr 2019 17:53:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E7=88=86=E4=B8=8D=E6=89=93=E8=87=AA?=
 =?UTF-8?q?=E5=B7=B1=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/server/gameserver/room.cc b/server/gameserver/room.cc
index 151f83a..c4bb70d 100644
--- a/server/gameserver/room.cc
+++ b/server/gameserver/room.cc
@@ -538,7 +538,7 @@ void Room::OnHumanDie(Human* hum)
 {
     if (hum->skill_meta && hum->skill_meta->i->condition() == ST_SelfDetonate) {
         for (auto& pair : human_hash_) {
-            if (pair.second != hum) {
+            if (pair.second != hum && (pair.second->team_id == 0 || pair.second->team_id != hum->team_id)) {
                 float distance = (hum->pos - pair.second->pos).Norm();
                 if (distance <= hum->skill_meta->i->area()) {
                     pair.second->DecHP(hum->skill_meta->i->value1(),