Merge branch 'master' into terencehill/cmd_fixes

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

diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index 0aae5e174d8cb289b356c42fa9fd747b9db0d145..20c74d3a17e24deb0012882c634c9d527d4747d0 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -356,7 +356,7 @@ void vehicles_spawn()
 
     // Return to spawn
     self.angles             = self.pos2;
-    setorigin(self, self.pos1 + '0 0 128');
+    setorigin(self, self.pos1 + '0 0 0');
     // Show it
     pointparticles(particleeffectnum("teleport"), self.origin + '0 0 64', '0 0 0', 1);
 
@@ -533,6 +533,7 @@ void vehicles_enter()
     }
     
     self.vehicle_enter();
+    antilag_clear(other);
 }
 
 /** vehicles_findgoodexit