types

# Conflicts:
#	server/src/index.ts
#	server/src/types.ts

server/src/index.ts

@@ -38,20 +38,21 @@ class Server {
     public registerMany<EventName extends RageFW_ServerEvent>(events: {
         [event in EventName]: RageFW_ServerEventCallback<event>
     }): void {
-        Object.entries(events).map(([eventName, callback]) => {
+        Object.entries<RageFW_ServerEventCallback<EventName>>(events).map(
-            if (nativeEvents.includes(eventName)) {
+            ([eventName, callback]) => {
-                mp.events.add(
+                if (this.isNativeEvent(eventName)) {
-                    eventName as keyof IServerEvents,
+                    mp.events.add(eventName, callback)
-                    callback as (...arg: unknown[]) => void,
+                } else {
-                )
+                    rpc.register(eventName, (args: unknown[]) => {
-            } else {
+                        return Array.isArray(args)
-                rpc.register(eventName, (args: unknown[]) => {
+                            ? (callback as (...arg: typeof args) => void)(
-                    return Array.isArray(args)
+                                  ...args,
-                        ? (callback as (...arg: typeof args) => void)(...args)
+                              )
-                        : (callback as (arg: typeof args) => void)(args)
+                            : (callback as (arg: typeof args) => void)(args)
-                })
+                    })
-            }
+                }
-        })
+            },
+        )
     }
 }
 

server/src/types.ts

@@ -16,7 +16,7 @@ export type RageFW_ServerEventCallback<K extends RageFW_ServerEvent> =
               ...args: Parameters<RageFW_ICustomServerEvent[K]>
           ) => ReturnType<RageFW_ICustomServerEvent[K]>
         : K extends keyof IServerEvents
-          ? ThisifyServerEvents[K]
+          ? IServerEvents[K]
           : never
 
 export type RageFW_ClientEvent = keyof RageFW_ICustomClientEvent

shared-types/types/types/index.d.ts

@@ -1,5 +1,8 @@
 declare module 'rage-fw-shared-types' {
-    export interface RageFW_ICustomServerEvent {}
+    export interface RageFW_ICustomServerEvent {
+        customServerEvent(customArgs: string[]): boolean
+        customServerEvent2(customArgs2: number[]): void
+    }
 
     export interface RageFW_ICustomClientEvent {}
 }