]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
warpzonelib: don't teleport MOVETYPE_FOLLOW stuff
authorRudolf Polzer <divVerent@xonotic.org>
Sun, 26 Jun 2011 05:56:32 +0000 (07:56 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sun, 26 Jun 2011 05:56:32 +0000 (07:56 +0200)
qcsrc/warpzonelib/server.qc

index 1ec66022144fbf74bf67a1fa9196627e108cddc7..27b96c29117102974d0b1e74afd850eb782ac5f5 100644 (file)
@@ -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())