Merge branch 'master' into Mario/killother

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

diff --git a/qcsrc/common/vehicles/sv_vehicles.qc b/qcsrc/common/vehicles/sv_vehicles.qc
index c3a1ec6c9b8e9b194541612cbe1d7adf9cea266f..fb6fd94871fbe10af4e6446dfb4ba5ce456d2ec9 100644 (file)
--- a/qcsrc/common/vehicles/sv_vehicles.qc
+++ b/qcsrc/common/vehicles/sv_vehicles.qc
@@ -894,7 +894,7 @@ void vehicles_enter(entity pl, entity veh)
 
        if(autocvar_g_vehicles_enter) // vehicle's touch function should handle this if entering via use key is disabled (TODO)
        if(veh.vehicle_flags & VHF_MULTISLOT)
-       if(veh.owner)
+       if(veh.owner && SAME_TEAM(pl, veh))
        {
                if(!veh.gunner1)
                if(time >= veh.gun1.phase)