Merge branch 'master' into mirceakitsune/damage_effects

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

diff --git a/qcsrc/server/t_teleporters.qc b/qcsrc/server/t_teleporters.qc
index 5d5b0a02c49bc2014ce502800254af43cc56384c..1705d8f8ea705edc6f71d4c5490bb32cd5d40c76 100644 (file)
--- a/qcsrc/server/t_teleporters.qc
+++ b/qcsrc/server/t_teleporters.qc
@@ -201,7 +201,13 @@ void Teleport_Touch (void)
        // for gameplay: vehicles can't teleport
        if (other.vehicle_flags & VHF_ISVEHICLE)
                return;
-
+    
+    if(other.vehicle)
+        return;
+        
+    if(other.turrcaps_flags & TFL_TURRCAPS_ISTURRET)
+        return;
+        
        if (other.deadflag != DEAD_NO)
                return;