Merge Raw event listeners for JS runtime (pr-2194)

5adfa2f - fix(scripting/v8): raw event listeners
citizenfx · Aug 20, 2024 · b6d2585 · b6d2585
2 parents a0a1b20 + 5adfa2f
commit b6d2585
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/data/shared/citizen/scripting/v8/main.js b/data/shared/citizen/scripting/v8/main.js
@@ -469,10 +469,21 @@ const EXT_LOCALFUNCREF = 11;
 				global.source = parseInt(source.substr(13));
 			}
 
-			const payload = unpack(payloadSerialized) || [];
+			// Running raw event listeners
+			try {
+				rawEmitter.emit(name, payloadSerialized, source);
+			} catch (e) {
+				console.error('Unhandled error during running raw event listeners', e);
+			}
+
 			const listeners = emitter.listeners(name);
+			if (listeners.length == 0) {
+				global.source = null;
+				return;
+			}
 
-			if (listeners.length === 0 || !Array.isArray(payload)) {
+			const payload = unpack(payloadSerialized) || [];
+			if(!Array.isArray(payload)) {
 				global.source = null;
 				return;
 			}
@@ -496,13 +507,6 @@ const EXT_LOCALFUNCREF = 11;
 				}
 			}
 
-			// Running raw event listeners
-			try {
-				rawEmitter.emit(name, payloadSerialized, source);
-			} catch (e) {
-				console.error('Unhandled error during running raw event listeners', e);
-			}
-
 			global.source = null;
 		});
 	});