From: Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Date: Sun, 6 Nov 2011 12:57:14 +0000 (+0200)
Subject: Correct a check for grabbing
X-Git-Tag: xonotic-v0.6.0~35^2~18^2~12
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=67e31e49b9b8ff290b37890d109809e2b222faa2;p=xonotic%2Fxonotic-data.pk3dir.git

Correct a check for grabbing
---

diff --git a/qcsrc/server/cheats.qc b/qcsrc/server/cheats.qc
index 8e455e942..497da3081 100644
--- a/qcsrc/server/cheats.qc
+++ b/qcsrc/server/cheats.qc
@@ -719,9 +719,7 @@ float CheatFrame()
 							drag = TRUE;
 						break;
 					case 2: // owner and team mates can grab
-						if(trace_ent.owner == self || trace_ent.realowner == self)
-							drag = TRUE;
-						if(!IsDifferentTeam(trace_ent.owner, self) || !IsDifferentTeam(trace_ent.realowner, self))
+						if(!IsDifferentTeam(trace_ent.owner, self) || !IsDifferentTeam(trace_ent.realowner, self) || trace_ent.team == self.team)
 							drag = TRUE;
 						break;
 					case 3: // anyone can grab