From 03dcf14f7e6abf857fa6370432bce0f2df207a96 Mon Sep 17 00:00:00 2001 From: Linden <65407488+thelindat@users.noreply.github.com> Date: Tue, 25 Oct 2022 03:02:44 +1100 Subject: [PATCH] fix(callback): multi-return values for callback method Resolves #136 --- imports/callback/client.lua | 4 +++- imports/callback/server.lua | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/imports/callback/client.lua b/imports/callback/client.lua index e47a3cc..b24a4ec 100644 --- a/imports/callback/client.lua +++ b/imports/callback/client.lua @@ -50,7 +50,9 @@ local function triggerServerCallback(_, event, delay, cb, ...) return promise:resolve(response and { msgpack.unpack(response) } or {}) end - return cb and cb(response and msgpack.unpack(response)) + if cb and response then + cb(msgpack.unpack(response)) + end end if promise then diff --git a/imports/callback/server.lua b/imports/callback/server.lua index 184dd31..d8e85dd 100644 --- a/imports/callback/server.lua +++ b/imports/callback/server.lua @@ -31,7 +31,9 @@ local function triggerClientCallback(_, event, playerId, cb, ...) return promise:resolve(response and { msgpack.unpack(response) } or {}) end - return cb and cb(response and msgpack.unpack(response)) + if cb and response then + cb(msgpack.unpack(response)) + end end if promise then