starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-31 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(datastore/server): decode JSON string

Browse Source
This commit is contained in:
Linden
2022-02-14 16:14:42 +11:00
parent d5661c1a9a
commit 843f395253
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx_addons]/esx_datastore/server/classes/datastore.lua
+1 -1
View File
@@ -17,7 +17,7 @@ function CreateDataStore(name, owner, data)
self.name = name
self.owner = owner
self.data = data
self.data = type(data) == 'string' and json.decode(data) or data
local timeoutCallbacks = {}
[esx_addons]/esx_datastore/server/main.lua
+3 -3
View File
@@ -12,10 +12,10 @@ AddEventHandler('onResourceStart', function(resourceName)
DataStoresIndex[#DataStoresIndex + 1] = data.name
DataStores[data.name] = {}
end
DataStores[data.name][#DataStores[data.name] + 1] = CreateDataStore(data.name, data.owner, data.data)
DataStores[data.name][#DataStores[data.name] + 1] = CreateDataStore(data.name, data.owner, json.decode(data.data))
else
if data.data then
SharedDataStores[data.name] = CreateDataStore(data.name, nil, data.data)
SharedDataStores[data.name] = CreateDataStore(data.name, nil, json.decode(data.data))
else
newData[#newData + 1] = {data.name, '\'{}\''}
end
@@ -26,7 +26,7 @@ AddEventHandler('onResourceStart', function(resourceName)
MySQL.prepare('INSERT INTO datastore_data (name, data) VALUES (?, ?)', newData)
for i = 1, #newData do
local new = newData[i]
SharedDataStores[new[1]] = CreateDataStore(new[1], nil, new[2])
SharedDataStores[new[1]] = CreateDataStore(new[1], nil, {})
end
end
end