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

Fixed #3, fixed exploit storing boat when not in driver seat, fixed storing boat not owned

Browse Source 
- Async task for buying boats aswell
This commit is contained in:
ElPumpo
2018-08-05 13:17:12 +02:00
parent 2568a3755f
commit fa81033557
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+9 -6
View File
@@ -154,11 +154,10 @@ function OpenBoatGarage(garage)
}, function (data, menu)
-- make sure the spawn point isn't blocked
local closestVehicle = GetClosestVehicle(garage.SpawnPoint.x, garage.SpawnPoint.y, garage.SpawnPoint.z, 3.0, 0, 71)
local playerPed = PlayerPedId()
local vehicleProps = data.current.vehicleProps
local playerPed = PlayerPedId()
local vehicleProps = data.current.vehicleProps
if not DoesEntityExist(closestVehicle) then
if ESX.Game.IsSpawnPointClear(garage.SpawnPoint, 4.0) then
TriggerServerEvent('esx_boat:takeOutVehicle', vehicleProps.plate)
ESX.ShowNotification(_U('garage_taken'))
@@ -222,8 +221,12 @@ function StoreBoatInGarage(vehicle)
local vehicleProps = ESX.Game.GetVehicleProperties(vehicle)
ESX.TriggerServerCallback('esx_boat:storeVehicle', function (rowsChanged)
ESX.Game.DeleteVehicle(vehicle)
ESX.ShowNotification(_U('garage_stored'))
if rowsChanged > 0 then
ESX.Game.DeleteVehicle(vehicle)
ESX.ShowNotification(_U('garage_stored'))
else
ESX.ShowNotification(_U('garage_notowner'))
end
end, vehicleProps.plate)
end
client/marker.lua
+2 -2
View File
@@ -63,10 +63,10 @@ AddEventHandler('esx_boat:hasEnteredMarker', function(zone, zoneNum)
if IsPedInAnyVehicle(playerPed, false) then
local vehicle = GetVehiclePedIsIn(playerPed, false)
if DoesEntityExist(vehicle) then
if DoesEntityExist(vehicle) and GetPedInVehicleSeat(vehicle, -1) == playerPed then
CurrentAction = 'garage_in'
CurrentActionMsg = _U('garage_store')
CurrentActionData = {vehicle = vehicle}
CurrentActionData = { vehicle = vehicle }
end
end