From 3f9d40b724ee0c08a0cfae0dc8d9dc7cb0f1a6d5 Mon Sep 17 00:00:00 2001
From: div0 <div0@f962a42d-fe04-0410-a3ab-8c8b0445ebaa>
Date: Wed, 30 Jan 2008 16:50:16 +0000
Subject: [PATCH] fix logic in IsDifferentTeam

git-svn-id: svn://svn.icculus.org/nexuiz/trunk@3315 f962a42d-fe04-0410-a3ab-8c8b0445ebaa
---
 data/qcsrc/server/g_damage.qc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/data/qcsrc/server/g_damage.qc b/data/qcsrc/server/g_damage.qc
index 578adbcc2..814c346a6 100644
--- a/data/qcsrc/server/g_damage.qc
+++ b/data/qcsrc/server/g_damage.qc
@@ -16,8 +16,15 @@ void announce(entity player, string msg)
 float IsDifferentTeam(entity a, entity b)
 {
 	if(teams_matter)
+	{
 		if(a.team == b.team)
 			return 0;
+	}
+	else
+	{
+		if(a == b)
+			return 0;
+	}
 	return 1;
 }
 
-- 
2.39.2