From: Rudolf Polzer <divVerent@xonotic.org>
Date: Sun, 26 Jun 2011 05:56:32 +0000 (+0200)
Subject: warpzonelib: don't teleport MOVETYPE_FOLLOW stuff
X-Git-Tag: xonotic-v0.5.0~159^2~32
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c6af57af3213ec10d2f2f2d0b1adfccec0f88e53;p=xonotic%2Fxonotic-data.pk3dir.git

warpzonelib: don't teleport MOVETYPE_FOLLOW stuff
---

diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc
index 1ec660221..27b96c291 100644
--- a/qcsrc/warpzonelib/server.qc
+++ b/qcsrc/warpzonelib/server.qc
@@ -134,7 +134,7 @@ void WarpZone_Touch (void)
 		return;
 
 	// FIXME needs a better check to know what is safe to teleport and what not
-	if(other.movetype == MOVETYPE_NONE)
+	if(other.movetype == MOVETYPE_NONE || other.movetype == MOVETYPE_FOLLOW)
 		return;
 
 	if(WarpZoneLib_ExactTrigger_Touch())