From 9c033dcc91e6d8a432eb7f74bd8cff42da84355b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 17 Aug 2017 17:42:24 +0200 Subject: [PATCH] Use new instance code --- __resource.lua | 4 ++++ client/main.lua | 17 ++++++++++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) diff --git a/__resource.lua b/__resource.lua index d6d3babb..af0cdd5c 100644 --- a/__resource.lua +++ b/__resource.lua @@ -18,3 +18,7 @@ client_scripts { 'config.lua', 'client/main.lua' } + +dependencies { + 'instance' +} \ No newline at end of file diff --git a/client/main.lua b/client/main.lua index cb4e7f0a..3caf6ded 100644 --- a/client/main.lua +++ b/client/main.lua @@ -10,6 +10,17 @@ Citizen.CreateThread(function() end end) +TriggerEvent('instance:registerType', 'garage') + +RegisterNetEvent('instance:onCreate') +AddEventHandler('instance:onCreate', function(instance) + + if instance.type == 'garage' then + TriggerEvent('instance:enter', instance) + end + +end) + AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) if part == 'ExteriorEntryPoint' then @@ -36,7 +47,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) ESX.Game.Teleport(playerPed, spawnCoords, function() - TriggerEvent('instance:create') + TriggerEvent('instance:create', 'garage') ESX.Game.SpawnLocalVehicle(vehicleProps.model, spawnCoords, garage.InteriorSpawnPoint.Heading, function(vehicle) TaskWarpPedIntoVehicle(playerPed, vehicle, -1) @@ -81,7 +92,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) z = garage.InteriorSpawnPoint.Pos.z }, function() - TriggerEvent('instance:create') + TriggerEvent('instance:create', 'garage') ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles) @@ -124,7 +135,7 @@ AddEventHandler('esx_property:hasEnteredMarker', function(name, part, parking) z = garage.InteriorSpawnPoint.Pos.z }, function() - TriggerEvent('instance:create') + TriggerEvent('instance:create', 'garage') ESX.TriggerServerCallback('esx_vehicleshop:getVehiclesInGarage', function(vehicles)