Merge pull request #21 from Jordan2139/master

fix(wraithv2): Alert no registration not working fix(bodycam): Beeps not playing + error
Sonoran-Software · Dec 23, 2024 · c6d89bd · c6d89bd
2 parents 64c06ff + 100d481
commit c6d89bd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/sonorancad/core/client.lua b/sonorancad/core/client.lua
@@ -414,7 +414,7 @@ CreateThread(function()
             if bodyCamOn then
                 SendNUIMessage({
                     type = 'playSound',
-                    transactionFile = GetResourcePath(GetCurrentResourceName()) .. '/core/client_nui/sounds/beeps.mp3',
+                    transactionFile = 'sounds/beeps.mp3',
                     transactionVolume = 0.3
                 })
                 Wait(Config.bodycamBeepFrequency)

diff --git a/sonorancad/fxmanifest.lua b/sonorancad/fxmanifest.lua
@@ -3,7 +3,7 @@ games {'gta5'}
 
 author 'Sonoran CAD'
 description 'Sonoran CAD FiveM Integration'
-version '3.0.7'
+version '3.0.8'
 
 server_scripts {
     'core/http.js'

diff --git a/sonorancad/submodules/wraithv2/sv_wraithv2.lua b/sonorancad/submodules/wraithv2/sv_wraithv2.lua
@@ -83,10 +83,10 @@ if pluginConfig.enabled then
 			end
 			if #charData < 1 then
 				debugLog('Invalid registration')
-				return
+				reg = false
 			end
-			local person = charData[1]
 			if reg then
+				local person = charData[1]
 				TriggerEvent('SonoranCAD::wraithv2:PlateLocked', source, reg, cam, plate, index)
 				local plate = reg.plate
 				if regData == nil then
@@ -227,6 +227,14 @@ if pluginConfig.enabled then
 						TriggerClientEvent('SonoranCAD::wraithv2:PlaySound', source, 'registration')
 					end
 				end
+			else
+				if pluginConfig.alertNoRegistration then
+					TriggerClientEvent('pNotify:SendNotification', source,
+									{text = '<b style=\'color:yellow\'>' .. camCapitalized .. ' ALPR</b><br/>Plate: ' .. plate:upper() .. '<br/>Status: Not Registered', type = 'warning', queue = 'alpr',
+						timeout = pluginConfig.notificationTimers.noReg, layout = 'centerLeft'})
+					TriggerEvent('SonoranCAD::wraithv2:NoRegAlert', plate)
+					TriggerClientEvent('SonoranCAD::wraithv2:PlaySound', source, 'registration')
+				end
 			end
 		end)
 	end)

diff --git a/sonorancad/version.json b/sonorancad/version.json
@@ -1,5 +1,5 @@
 {
-  "resource": "3.0.7",
+  "resource": "3.0.8",
   "testedFxServerVersion": "5932",
   "submoduleConfigs": {
     "callcommands": {