From b837f95794a0d62e03f13ac9456ec222dc5f07e4 Mon Sep 17 00:00:00 2001
From: LuaDeldu <luadelduwaht@outlook.fr>
Date: Wed, 8 Nov 2017 19:25:25 +0100
Subject: [PATCH] Fix vehicle delivery

Mecanos must be in VehicleDelivery to complete NPCJobMission !
No more glitches
---
 client/main.lua | 26 +++++++++++++++++++++-----
 locales/fr.lua  |  1 +
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/client/main.lua b/client/main.lua
index 9fb72829..b32693ee 100644
--- a/client/main.lua
+++ b/client/main.lua
@@ -27,6 +27,7 @@ local NPCTargetTowableZone     = nil
 local NPCHasSpawnedTowable    = false
 local NPCLastCancel           = GetGameTimer() - 5 * 60000
 local NPCHasBeenNextToTowable = false
+local NPCTargetDeleterZone    = false
 
 ESX                           = nil
 GUI.Time                      = 0
@@ -567,13 +568,20 @@ function OpenMobileMecanoActionsMenu()
 
             if NPCOnJob then
 
-              if CurrentlyTowedVehicle == NPCTargetTowable then
-                ESX.Game.DeleteVehicle(NPCTargetTowable)
-                TriggerServerEvent('esx_mecanojob:onNPCJobMissionCompleted')
-                StopNPCJob()
+              if NPCTargetDeleterZone then
+
+                if CurrentlyTowedVehicle == NPCTargetTowable then
+                  ESX.Game.DeleteVehicle(NPCTargetTowable)
+                  TriggerServerEvent('esx_mecanojob:onNPCJobMissionCompleted')
+                  StopNPCJob()
+                  NPCTargetDeleterZone = false
+
+                else
+                  ESX.ShowNotification(_U('not_right_veh'))
+                end
 
               else
-                ESX.ShowNotification(_U('not_right_veh'))
+                ESX.ShowNotification(_U('not_right_place'))
               end
 
             end
@@ -886,6 +894,10 @@ AddEventHandler('esx_mecanojob:hasEnteredMarker', function(zone)
 
   end
 
+  if zone =='VehicleDelivery' then
+    NPCTargetDeleterZone = true
+  end
+
   if zone == 'MecanoActions' then
     CurrentAction     = 'mecano_actions_menu'
     CurrentActionMsg  = _U('open_actions')
@@ -922,6 +934,10 @@ end)
 
 AddEventHandler('esx_mecanojob:hasExitedMarker', function(zone)
 
+  if zone =='VehicleDelivery' then
+    NPCTargetDeleterZone = false
+  end
+
   if zone == 'Craft' then
     TriggerServerEvent('esx_mecanojob:stopCraft')
     TriggerServerEvent('esx_mecanojob:stopCraft2')
diff --git a/locales/fr.lua b/locales/fr.lua
index aacdc13e..90409948 100644
--- a/locales/fr.lua
+++ b/locales/fr.lua
@@ -62,6 +62,7 @@ Locales['fr'] = {
   ['please_tow']                = 'veuillez ~y~remorquer~s~ le véhicule',
   ['wait_five']                 = 'Vous devez ~r~attendre~s~ 5 minutes',
   ['must_in_flatbed']           = 'Vous devez être en flatbed pour commencer la mission',
+  ['not_right_place']           = 'Vous devez être au bon endroit pour faire cela',
   ['mechanic_customer']         = 'client mecano',
   ['you_do_not_room']           = '~r~Vous n\'avez plus de place',
   ['recovery_gas_can']          = 'Récupération de ~b~bouteille de gaz~s~...',