Merge remote-tracking branch 'origin/divVerent/allow-override-item-model'

[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 6a7787d7decd063c0dda54ddca06cc50537a5723..1705d8f8ea705edc6f71d4c5490bb32cd5d40c76 100644 (file)
--- a/qcsrc/server/t_teleporters.qc
+++ b/qcsrc/server/t_teleporters.qc
@@ -196,13 +196,18 @@ void Teleport_Touch (void)
                return;
        
        if not(other.iscreature)
-       if (other.deadflag != DEAD_NO)
                return;
 
        // 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;
 
@@ -330,10 +335,11 @@ void WarpZone_PostTeleportPlayer_Callback(entity pl)
 {
        UpdateCSQCProjectileAfterTeleport(pl);
        // "disown" projectiles after teleport
+       if(pl.owner)
        if(pl.owner == pl.realowner)
        {
                if(!(pl.flags & FL_PROJECTILE))
-                       print("A non-projectile got through a warpzone and its owner cleared. It's a \n", pl.classname, ".\n");
+                       print("A non-projectile got through a warpzone and its owner cleared. It's a ", pl.classname, ".\n");
                pl.owner = world;
        }
        if(pl.classname == "player")