Merge branch 'master' into terencehill/music_player

[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 898274f090ec8e5bdd41b58e166a23da67ba7519..785d39516f79968a6202dd6901fb2b778038a96e 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -608,6 +608,12 @@ void vehicles_enter()
 
     if(self.phase > time)
         return;
+    if(other.frozen)
+        return;
+    if(other.vehicle)
+        return;
+    if(other.deadflag != DEAD_NO)
+        return;
 
     if(teamplay)
     if(self.team)