From 87818b3710e465f85991fb41a1611304995dd0d3 Mon Sep 17 00:00:00 2001
From: Linden <65407488+thelindat@users.noreply.github.com>
Date: Sun, 16 Mar 2025 03:41:34 +1100
Subject: [PATCH] fix(package/callback): format setValidCallback event name

---
 package/client/resource/callback/index.ts | 5 +++--
 package/server/resource/callback/index.ts | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/package/client/resource/callback/index.ts b/package/client/resource/callback/index.ts
index e64fd62..019ee94 100644
--- a/package/client/resource/callback/index.ts
+++ b/package/client/resource/callback/index.ts
@@ -55,9 +55,10 @@ export function triggerServerCallback<T = unknown>(
 }
 
 export function onServerCallback(eventName: string, cb: (...args: any[]) => any) {
-  exports.ox_lib.setValidCallback(eventName, true)
+  eventName = `__ox_cb_${eventName}`
 
-  onNet(`__ox_cb_${eventName}`, async (resource: string, key: string, ...args: any[]) => {
+  exports.ox_lib.setValidCallback(eventName, true)
+  onNet(eventName, async (resource: string, key: string, ...args: any[]) => {
     let response: any;
 
     try {
diff --git a/package/server/resource/callback/index.ts b/package/server/resource/callback/index.ts
index 9bf3a94..93e0dfe 100644
--- a/package/server/resource/callback/index.ts
+++ b/package/server/resource/callback/index.ts
@@ -39,9 +39,10 @@ export function triggerClientCallback<T = unknown>(
 }
 
 export function onClientCallback(eventName: string, cb: (playerId: number, ...args: any[]) => any) {
+  eventName = `__ox_cb_${eventName}`;
+  
   exports.ox_lib.setValidCallback(eventName, true)
-
-  onNet(`__ox_cb_${eventName}`, async (resource: string, key: string, ...args: any[]) => {
+  onNet(eventName, async (resource: string, key: string, ...args: any[]) => {
     const src = source;
     let response: any;