From: Mario <mario.mario@y7mail.com>
Date: Fri, 17 May 2013 01:28:32 +0000 (+1000)
Subject: Move VehicleTouch to the correct function
X-Git-Tag: xonotic-v0.7.0~41^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a738772e9dfacbc7dc1a648d68dc0d496f013d7d;p=xonotic%2Fxonotic-data.pk3dir.git

Move VehicleTouch to the correct function
---

diff --git a/qcsrc/server/vehicles/vehicles.qc b/qcsrc/server/vehicles/vehicles.qc
index dc78b0545..1e78bd5a2 100644
--- 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);