some fixes to what can be pushed, teleported, trigger_impulsed

[xonotic/xonotic-data.pk3dir.git] / qcsrc / warpzonelib / server.qc

diff --git a/qcsrc/warpzonelib/server.qc b/qcsrc/warpzonelib/server.qc
index 2bcb579ccf0cdffc2d8bb8e4cd2cd4fc841379b0..861b2e01f863cdb618adab1613d1df7d260e0548 100644 (file)
--- a/qcsrc/warpzonelib/server.qc
+++ b/qcsrc/warpzonelib/server.qc
@@ -156,7 +156,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 || other.movetype == MOVETYPE_FOLLOW)
+       if(other.movetype == MOVETYPE_NONE || other.movetype == MOVETYPE_FOLLOW || other.tag_entity)
                return;
 
        if(WarpZoneLib_ExactTrigger_Touch())