Merge remote-tracking branch 'origin/ablu/bumblebeefix'

[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 dc78b054553c67f9893e4bc2db791a55a323664e..1e78bd5a28eec14fc7cffa9f5e9703ccffd09bc6 100644 (file)
--- a/qcsrc/server/vehicles/vehicles.qc
+++ b/qcsrc/server/vehicles/vehicles.qc
@@ -537,6 +537,9 @@ void vehilces_impact(float _minspeed, float _speedfac, float _maxpain)
 .void() vehicle_impact;
 void vehicles_touch()
 {
+       if(MUTATOR_CALLHOOK(VehicleTouch))
+               return;
+       
     // Vehicle currently in use
     if(self.owner)
     {
@@ -585,9 +588,6 @@ void vehicles_enter()
     if(self.team)
     if(self.team != other.team)
         return;
-               
-       if(MUTATOR_CALLHOOK(VehicleTouch))
-               return;
 
     RemoveGrapplingHook(other);