fix(callback): bad argument to unpack when callback throws error

Throwing an error responds with false rather than a string.
overextended · Oct 19, 2022 · 2bb0d68 · 2bb0d68
1 parent 6f0bf6a
commit 2bb0d68
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/imports/callback/client.lua b/imports/callback/client.lua
@@ -50,7 +50,7 @@ local function triggerServerCallback(_, event, delay, cb, ...)
 			return promise:resolve(response and { msgpack.unpack(response) } or {})
 		end
 
-		return cb and cb(msgpack.unpack(response))
+		return cb and cb(response and msgpack.unpack(response))
 	end
 
 	if promise then

diff --git a/imports/callback/server.lua b/imports/callback/server.lua
@@ -31,7 +31,7 @@ local function triggerClientCallback(_, event, playerId, cb, ...)
 			return promise:resolve(response and { msgpack.unpack(response) } or {})
 		end
 
-		return cb and cb(msgpack.unpack(response))
+		return cb and cb(response and msgpack.unpack(response))
 	end
 
 	if promise then
@@ -74,4 +74,6 @@ function lib.callback.register(name, cb)
 	end)
 end
 
-return lib.callback
+return lib.callback
+
+