From bdc063fb5ef5856d9812a796d1b134e2f13b1653 Mon Sep 17 00:00:00 2001 From: Rocky28447 <26193486+Rocky28447@users.noreply.github.com> Date: Sun, 24 Mar 2019 18:28:05 -0400 Subject: [PATCH] Update DataService.lua --- .../Aero/Services/DataService.lua | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/src/ServerStorage/Aero/Services/DataService.lua b/src/ServerStorage/Aero/Services/DataService.lua index 99b9840..38106c7 100644 --- a/src/ServerStorage/Aero/Services/DataService.lua +++ b/src/ServerStorage/Aero/Services/DataService.lua @@ -5,18 +5,16 @@ --[[ Server: - PLAYER DATA METHODS: DataService:Set(player, key, value) DataService:Get(player, key) DataService:Remove(player, key) + DataService:OnUpdate(player, key, callback) DataService:Flush(player) DataService:FlushKey(player, key) DataService:FlushAll() DataService:FlushAllConcurrent() - - GLOBAL DATA METHODS: DataService:SetGlobal(key, value) @@ -25,8 +23,6 @@ DataService:OnUpdateGlobal(key, callback) DataService:FlushGlobal(key) DataService:FlushAllGlobal() - - CUSTOM DATA METHODS: DataService:SetCustom(name, scope, key, value) @@ -36,14 +32,9 @@ DataService:FlushCustom(name, scope, key) DataService:FlushAllCustom(name, scope, key) - GAME CLOSING CALLBACK: - DataService:BindToClose(callbackFunction) - - EVENTS: - DataService.PlayerFailed(player, method, key, errorMessage) DataService.GlobalFailed(method, key, errorMessage) DataService.CustomFailed(name, scope, method, key, errorMessage) @@ -52,7 +43,6 @@ Client: DataService:Get(key) - DataService.Failed(method, key, errorMessage) --]] @@ -130,6 +120,11 @@ function DataService:Remove(player, key) end +function DataService:OnUpdate(player, key, callback) + self:GetPlayerCache(player):OnUpdate(key, callback) +end + + function DataService:SetGlobal(key, value) globalCache:Set(key, value) end @@ -271,7 +266,6 @@ function DataService:Start() local function FireBoundToCloseCallbacks() --[[ CONCURRENCY DISABLED DUE TO BINDTOCLOSE YIELDING BUG - local thread = coroutine.running() local numBinded = #boundToCloseFuncs if (numBinded == 0) then return end @@ -288,7 +282,6 @@ function DataService:Start() end)() end coroutine.yield() - ]] -- Temporary patch using BindableEvent instead of coroutines: