Safe Zone air vehicles whitelist, updated holograms and scripts.

+ Updated Safe-Zones to whitelist air vehicles from being stopped.
+ Latest version of wl_wars2x police radar.
+ Updated weapon restrictions.
+ Fire-Scripts updated to latest version.

resources/Fire-Script/client/main.lua

@@ -1,11 +1,9 @@
 --================================--
---       FIRE SCRIPT v1.7.4       --
+--       FIRE SCRIPT v1.7.6       --
 --  by GIMI (+ foregz, Albo1125)  --
 --      License: GNU GPL 3.0      --
 --================================--
 
-local syncInProgress = false
-
 --================================--
 --              CHAT              --
 --================================--
@@ -24,6 +22,10 @@ TriggerEvent('chat:addSuggestion', '/startfire', 'Creates a fire', {
 	{
 		name = "dispatch",
 		help = "true or false (default false)"
+	},
+	{
+		name = "dispatchMessage",
+		help = "Sets a custom dispatch message (leave empty to generate automatically)"
 	}
 })
 
@@ -105,11 +107,15 @@ TriggerEvent('chat:addSuggestion', '/firewlreload', 'Reloads the whitelist from
 TriggerEvent('chat:addSuggestion', '/firedispatch', 'Manages the fire script dispatch subscribers', {
 	{
 		name = "action",
-		help = "add / remove"
+		help = "add / remove / scenario (scenario = sets the scenario's dispatch message)"
 	},
 	{
-		name = "playerID",
-		help = "The player's server ID"
+		name = "playerID / scenarioID",
+		help = "The player's server ID / the scenario's ID"
+	},
+	{
+		name = "dispatchMessage",
+		help = "(optional) Sets a custom dispatch message for the scenario (use only with par. #1 scenario; leave empty to remove previous custom message)"
 	}
 })
 
@@ -123,7 +129,7 @@ TriggerEvent('chat:addSuggestion', '/remindme', 'Sets the GPS waypoint to the sp
 TriggerEvent('chat:addSuggestion', '/cleardispatch', 'Clears navigation to the last dispatch call.', {
 	{
 		name = "dispatchID",
-		help = "(optional) The dispatch identifier, if filled in, the call's blip will be removed."
+		help = "(optional) The dispatch identifier, if filled in, the call's blip will be removed. Set to 0 to remove all dispatch blips."
 	}
 })
 
@@ -200,7 +206,13 @@ RegisterCommand(
 		local probability = tonumber(args[2])
 		local triggerDispatch = args[3] == "true"
 
-		TriggerServerEvent('fireManager:command:startfire', GetEntityCoords(GetPlayerPed(-1)), maxSpread, probability, triggerDispatch)
+		table.remove(args, 1)
+		table.remove(args, 1)
+		table.remove(args, 1)
+
+		local dispatchMessage = next(args) and table.concat(args, " ") or nil
+
+		TriggerServerEvent('fireManager:command:startfire', GetEntityCoords(GetPlayerPed(-1)), maxSpread, probability, triggerDispatch, dispatchMessage)
 	end,
 	false
 )
@@ -310,7 +322,9 @@ AddEventHandler(
 		while syncInProgress do
 			Citizen.Wait(10)
 		end
+		syncInProgress = true
 		Fire:remove(fireIndex)
+		syncInProgress = false
 	end
 )
 
@@ -321,7 +335,12 @@ AddEventHandler(
 		while syncInProgress do
 			Citizen.Wait(10)
 		end
-		Fire:removeAll()
+		syncInProgress = true
+		Fire:removeAll(
+			function()
+				syncInProgress = false
+			end
+		)
 	end
 )
 
@@ -332,7 +351,9 @@ AddEventHandler(
 		while syncInProgress do
 			Citizen.Wait(10)
 		end
+		syncInProgress = true
 		Fire:removeFlame(fireIndex, flameIndex)
+		syncInProgress = false
     end
 )
 
@@ -340,6 +361,9 @@ RegisterNetEvent("fireClient:createFlame")
 AddEventHandler(
     "fireClient:createFlame",
 	function(fireIndex, flameIndex, coords)
+		while syncInProgress do
+			Citizen.Wait(10)
+		end
 		syncInProgress = true
 		Fire:createFlame(fireIndex, flameIndex, coords)
 		syncInProgress = false