diff --git a/resources/CarWipe/client/client.lua b/resources/CarWipe/client/client.lua index 66ee05b38..e7e59926b 100644 --- a/resources/CarWipe/client/client.lua +++ b/resources/CarWipe/client/client.lua @@ -1,6 +1,8 @@ RegisterNetEvent("delall") AddEventHandler("delall", function () if Config.alerts then + exports['EGRP-Notifications']:Warning("System", "Vehicles will be wiped in 5 minutes. Stay in your vehicle to prevent deletion.", "top", 5000, true) + Citizen.Wait(240000) exports['EGRP-Notifications']:Warning("System", "Vehicles will be wiped in 1 minute. Stay in your vehicle to prevent deletion.", "top", 5000, true) --TriggerEvent("chat:addMessage", {color = { 255, 0, 0},multiline = false,args = {"[SYSTEM]", "Vehicles will be wiped in ^*^11 minute.^r Stay in your vehicle if you do not want it to be deleted."}}) Citizen.Wait(30000) @@ -77,3 +79,74 @@ AddEventHandler("delall", function () --TriggerEvent("chat:addMessage", {color = { 255, 0, 0},multiline = false,args = {"[SYSTEM]", "Vehicles have been wiped!"}}) end end) + +--Delete all vehicles instantly-- + +RegisterNetEvent("delallnow") +AddEventHandler("delallnow", function () + Citizen.Wait(1000) + for vehicle in EnumerateVehicles() do + if (not IsPedAPlayer(GetPedInVehicleSeat(vehicle, -1))) then + if Config.OnlyWipeBroken == true then + if GetVehicleEngineHealth(vehicle) <= 100.0 then + SetVehicleHasBeenOwnedByPlayer(vehicle, false) + SetEntityAsMissionEntity(vehicle, false, false) + DeleteVehicle(vehicle) + if Config.UseESX then + ESX.Game.DeleteVehicle(vehicle) + end + DeleteEntity(vehicle) + DeleteVehicle(vehicle) + if Config.UseESX then + ESX.Game.DeleteVehicle(vehicle) + end + DeleteEntity(vehicle) + if (DoesEntityExist(vehicle)) then + DeleteVehicle(vehicle) + if Config.UseESX then + ESX.Game.DeleteVehicle(vehicle) + end + DeleteEntity(vehicle) + DeleteVehicle(vehicle) + if Config.UseESX then + ESX.Game.DeleteVehicle(vehicle) + end + DeleteEntity(vehicle) + end + end + else + SetVehicleHasBeenOwnedByPlayer(vehicle, false) + SetEntityAsMissionEntity(vehicle, false, false) + DeleteVehicle(vehicle) + if Config.UseESX then + ESX.Game.DeleteVehicle(vehicle) + end + DeleteEntity(vehicle) + DeleteVehicle(vehicle) + if Config.UseESX then + ESX.Game.DeleteVehicle(vehicle) + end + DeleteEntity(vehicle) + if (DoesEntityExist(vehicle)) then + DeleteVehicle(vehicle) + if Config.UseESX then + ESX.Game.DeleteVehicle(vehicle) + end + DeleteEntity(vehicle) + DeleteVehicle(vehicle) + if Config.UseESX then + ESX.Game.DeleteVehicle(vehicle) + end + DeleteEntity(vehicle) + end + end + if Config.use10msdelay then + Citizen.Wait(10) + end + end + end + if Config.DoneNotify then + exports['EGRP-Notifications']:Success("System", "Vehicles have been successfully wiped!", "top", 5000, true) + --TriggerEvent("chat:addMessage", {color = { 255, 0, 0},multiline = false,args = {"[SYSTEM]", "Vehicles have been wiped!"}}) + end +end) \ No newline at end of file diff --git a/resources/CarWipe/config.lua b/resources/CarWipe/config.lua index ad48193b0..090079965 100644 --- a/resources/CarWipe/config.lua +++ b/resources/CarWipe/config.lua @@ -2,6 +2,7 @@ Config = {} Config = { commandName = "delall", -- For manual carwipes + commandNowName = "delallnow", -- For manual carwipes restricCommand = true, -- Now you need permission to do alerts = true, -- Notify in chat when a carwipe is comming use10msdelay = true, -- use 10ms delay by deleting a vehicle diff --git a/resources/CarWipe/server/server.lua b/resources/CarWipe/server/server.lua index 07f00ee76..5be1f9b1f 100644 --- a/resources/CarWipe/server/server.lua +++ b/resources/CarWipe/server/server.lua @@ -1,5 +1,7 @@ RegisterCommand(Config.commandName, function(source, args, rawCommand) TriggerClientEvent("delall", -1) end, Config.restricCommand) +RegisterCommand(Config.commandNowName, function(source, args, rawCommand) TriggerClientEvent("delallnow", -1) end, Config.restricCommand) + function CleanUpCronTask(d, h, m) TriggerClientEvent("delall", -1) end