X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Ft_teleporters.qc;h=1705d8f8ea705edc6f71d4c5490bb32cd5d40c76;hp=5d5b0a02c49bc2014ce502800254af43cc56384c;hb=c6c371883dde697e1f237d498c08e09788b6af6b;hpb=fb61c977ddeed686ef587fd54e40f55a4bdc2322

diff --git a/qcsrc/server/t_teleporters.qc b/qcsrc/server/t_teleporters.qc
index 5d5b0a02c..1705d8f8e 100644
--- 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;