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 broken script and last_property being empty instead of nil, closes #33

Browse Source
This commit is contained in:
ElPumpo
2018-07-04 18:14:44 +02:00
parent 148274cee5
commit 177791d472
4 changed files with 43 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/main.lua
+30 -17
View File
@@ -31,6 +31,21 @@ Citizen.CreateThread(function()
end
end)
RegisterNetEvent('esx:playerLoaded')
AddEventHandler('esx:playerLoaded', function(xPlayer)
ESX.TriggerServerCallback('esx_property:getProperties', function(properties)
Config.Properties = properties
CreateBlips()
end)
ESX.TriggerServerCallback('esx_property:getOwnedProperties', function(ownedProperties)
for i=1, #ownedProperties, 1 do
SetPropertyOwned(ownedProperties[i], true)
end
end)
end)
-- only used when script is restarting mid-session
RegisterNetEvent('esx_property:sendProperties')
AddEventHandler('esx_property:sendProperties', function(properties)
Config.Properties = properties
@@ -854,26 +869,25 @@ AddEventHandler('instance:loaded', function()
end)
AddEventHandler('playerSpawned', function()
if FirstSpawn then
if FirstSpawn then
Citizen.CreateThread(function()
Citizen.CreateThread(function()
while not ESX.IsPlayerLoaded() do
Citizen.Wait(0)
end
while not ESX.IsPlayerLoaded() do
Citizen.Wait(0)
end
ESX.TriggerServerCallback('esx_property:getLastProperty', function(propertyName)
if propertyName ~= nil then
TriggerEvent('instance:create', 'property', {property = propertyName, owner = ESX.GetPlayerData().identifier})
end
end)
end)
FirstSpawn = false
end
ESX.TriggerServerCallback('esx_property:getLastProperty', function(propertyName)
if propertyName ~= nil then
if propertyName ~= '' then
TriggerEvent('instance:create', 'property', {property = propertyName, owner = ESX.GetPlayerData().identifier})
end
end
end)
end)
FirstSpawn = false
end
end)
AddEventHandler('esx_property:getProperties', function(cb)
@@ -904,7 +918,6 @@ end)
RegisterNetEvent('instance:onEnter')
AddEventHandler('instance:onEnter', function(instance)
if instance.type == 'property' then
local property = GetProperty(instance.data.property)