starred/esx_core-esx-framework
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-09-04 16:23:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Implemented teleport after storing boat in garage, closes #2

Browse Source
This commit is contained in:
ElPumpo
2018-08-08 21:03:50 +02:00
parent d29646b7e0
commit 2eab7e866f
3 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+10 -6
View File
@@ -72,7 +72,7 @@ function OpenBoatShop(shop)
ESX.TriggerServerCallback('esx_boat:buyBoat', function (bought)
if bought then
ESX.ShowNotification(_U('boat_shop_bought', data.current.model, data.current.price))
ESX.ShowNotification(_U('boat_shop_bought', data.current.name, data.current.price))
DeleteSpawnedVehicles()
isInShopMenu = false
@@ -114,7 +114,7 @@ function OpenBoatShop(shop)
end, function (data, menu)
DeleteSpawnedVehicles()
ESX.Game.SpawnLocalVehicle(data.current.model, shop.Inside, shop.Heading, function (vehicle)
ESX.Game.SpawnLocalVehicle(data.current.model, shop.Inside, shop.Inside.h, function (vehicle)
table.insert(spawnedVehicles, vehicle)
TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
FreezeEntityPosition(vehicle, true)
@@ -123,7 +123,7 @@ function OpenBoatShop(shop)
-- spawn first vehicle
DeleteSpawnedVehicles()
ESX.Game.SpawnLocalVehicle(Config.Vehicles[1].model, shop.Inside, shop.Heading, function (vehicle)
ESX.Game.SpawnLocalVehicle(Config.Vehicles[1].model, shop.Inside, shop.Inside.h, function (vehicle)
table.insert(spawnedVehicles, vehicle)
TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
FreezeEntityPosition(vehicle, true)
@@ -162,7 +162,7 @@ function OpenBoatGarage(garage)
TriggerServerEvent('esx_boat:takeOutVehicle', vehicleProps.plate)
ESX.ShowNotification(_U('garage_taken'))
ESX.Game.SpawnVehicle(vehicleProps.model, garage.SpawnPoint, garage.Heading, function(vehicle)
ESX.Game.SpawnVehicle(vehicleProps.model, garage.SpawnPoint, garage.SpawnPoint.h, function(vehicle)
TaskWarpPedIntoVehicle(playerPed, vehicle, -1)
ESX.Game.SetVehicleProperties(vehicle, vehicleProps)
end)
@@ -217,7 +217,7 @@ function OpenLicenceMenu(shop)
end)
end
function StoreBoatInGarage(vehicle)
function StoreBoatInGarage(vehicle, teleportCoords)
local vehicleProps = ESX.Game.GetVehicleProperties(vehicle)
@@ -225,6 +225,11 @@ function StoreBoatInGarage(vehicle)
if rowsChanged > 0 then
ESX.Game.DeleteVehicle(vehicle)
ESX.ShowNotification(_U('garage_stored'))
local playerPed = PlayerPedId()
ESX.Game.Teleport(playerPed, teleportCoords, function()
SetEntityHeading(playerPed, teleportCoords.h)
end)
else
ESX.ShowNotification(_U('garage_notowner'))
end
@@ -232,7 +237,6 @@ function StoreBoatInGarage(vehicle)
end
-- Key controls
Citizen.CreateThread(function()
while true do