diff --git a/CoreRT.dll b/CoreRT.dll index 81b368469..9124810a2 100644 Binary files a/CoreRT.dll and b/CoreRT.dll differ diff --git a/FXServer.exe b/FXServer.exe index 5443c3635..b8fed264f 100644 Binary files a/FXServer.exe and b/FXServer.exe differ diff --git a/botan.dll b/botan.dll index 5d6c7d20f..eff6e4983 100644 Binary files a/botan.dll and b/botan.dll differ diff --git a/cfx_curl_x86_64.dll b/cfx_curl_x86_64.dll index 2e802d10f..6382bd976 100644 Binary files a/cfx_curl_x86_64.dll and b/cfx_curl_x86_64.dll differ diff --git a/citizen-devtools.dll b/citizen-devtools.dll index 9a3370f36..df27d4b13 100644 Binary files a/citizen-devtools.dll and b/citizen-devtools.dll differ diff --git a/citizen-resources-core.dll b/citizen-resources-core.dll index e543b0ca9..4abb9313f 100644 Binary files a/citizen-resources-core.dll and b/citizen-resources-core.dll differ diff --git a/citizen-resources-metadata-lua.dll b/citizen-resources-metadata-lua.dll index 27b2ca405..45684104b 100644 Binary files a/citizen-resources-metadata-lua.dll and b/citizen-resources-metadata-lua.dll differ diff --git a/citizen-scripting-core.dll b/citizen-scripting-core.dll index d4804eadf..8c5a5d0e8 100644 Binary files a/citizen-scripting-core.dll and b/citizen-scripting-core.dll differ diff --git a/citizen-scripting-lua.dll b/citizen-scripting-lua.dll index 2cd856eec..1af3ffef3 100644 Binary files a/citizen-scripting-lua.dll and b/citizen-scripting-lua.dll differ diff --git a/citizen-scripting-lua54.dll b/citizen-scripting-lua54.dll index 3676cd83f..af841341a 100644 Binary files a/citizen-scripting-lua54.dll and b/citizen-scripting-lua54.dll differ diff --git a/citizen-scripting-mono.dll b/citizen-scripting-mono.dll index 60a6c2bf9..90a659701 100644 Binary files a/citizen-scripting-mono.dll and b/citizen-scripting-mono.dll differ diff --git a/citizen-scripting-v8node.dll b/citizen-scripting-v8node.dll index 63e76d3a7..0f97004fb 100644 Binary files a/citizen-scripting-v8node.dll and b/citizen-scripting-v8node.dll differ diff --git a/citizen-server-fxdk.dll b/citizen-server-fxdk.dll index e14664025..feb215ab0 100644 Binary files a/citizen-server-fxdk.dll and b/citizen-server-fxdk.dll differ diff --git a/citizen-server-gui.dll b/citizen-server-gui.dll index 931c4cff2..21e8ee002 100644 Binary files a/citizen-server-gui.dll and b/citizen-server-gui.dll differ diff --git a/citizen-server-impl.dll b/citizen-server-impl.dll index 8b4912c88..69b1c8d1f 100644 Binary files a/citizen-server-impl.dll and b/citizen-server-impl.dll differ diff --git a/citizen-server-instance.dll b/citizen-server-instance.dll index 21d234f65..066d92f55 100644 Binary files a/citizen-server-instance.dll and b/citizen-server-instance.dll differ diff --git a/citizen-server-main.dll b/citizen-server-main.dll index 5b349b1f5..6a737960f 100644 Binary files a/citizen-server-main.dll and b/citizen-server-main.dll differ diff --git a/citizen-server-monitor.dll b/citizen-server-monitor.dll index 6988b446b..a9f2628d3 100644 Binary files a/citizen-server-monitor.dll and b/citizen-server-monitor.dll differ diff --git a/citizen-server-net.dll b/citizen-server-net.dll index 1123380be..5c37f8870 100644 Binary files a/citizen-server-net.dll and b/citizen-server-net.dll differ diff --git a/citizen-server-state-fivesv.dll b/citizen-server-state-fivesv.dll index daa9450a3..8ed3720ac 100644 Binary files a/citizen-server-state-fivesv.dll and b/citizen-server-state-fivesv.dll differ diff --git a/citizen-server-state-rdr3sv.dll b/citizen-server-state-rdr3sv.dll index d75db68c3..bc161f91b 100644 Binary files a/citizen-server-state-rdr3sv.dll and b/citizen-server-state-rdr3sv.dll differ diff --git a/comptest.dll b/comptest.dll index c706c810f..0834fa34e 100644 Binary files a/comptest.dll and b/comptest.dll differ diff --git a/conhost-server.dll b/conhost-server.dll index fae205408..3adee3f41 100644 Binary files a/conhost-server.dll and b/conhost-server.dll differ diff --git a/debug-script.dll b/debug-script.dll index de352377f..b02d57938 100644 Binary files a/debug-script.dll and b/debug-script.dll differ diff --git a/devcon.dll b/devcon.dll index 7936bd0a7..e9bfe74e3 100644 Binary files a/devcon.dll and b/devcon.dll differ diff --git a/http-client.dll b/http-client.dll index f5ff64b4d..e342c3542 100644 Binary files a/http-client.dll and b/http-client.dll differ diff --git a/imgui.dll b/imgui.dll index d44c0ab91..2d6940c47 100644 Binary files a/imgui.dll and b/imgui.dll differ diff --git a/libuv.dll b/libuv.dll index f8b675cb2..bef197315 100644 Binary files a/libuv.dll and b/libuv.dll differ diff --git a/net-base.dll b/net-base.dll index 9130a0810..5fe6bd89e 100644 Binary files a/net-base.dll and b/net-base.dll differ diff --git a/net-http-server.dll b/net-http-server.dll index 9b495d39d..35b58f751 100644 Binary files a/net-http-server.dll and b/net-http-server.dll differ diff --git a/net-tcp-server.dll b/net-tcp-server.dll index 67e9502f0..b22189dd4 100644 Binary files a/net-tcp-server.dll and b/net-tcp-server.dll differ diff --git a/nng.dll b/nng.dll index 2c5924e00..a34b77bcd 100644 Binary files a/nng.dll and b/nng.dll differ diff --git a/node.dll b/node.dll index fea0826b9..c35785d19 100644 Binary files a/node.dll and b/node.dll differ diff --git a/resources/Safe-Zones/client/client.lua b/resources/Safe-Zones/client/client.lua index af7d2ab5c..6b9f7c889 100644 --- a/resources/Safe-Zones/client/client.lua +++ b/resources/Safe-Zones/client/client.lua @@ -47,17 +47,22 @@ Citizen.CreateThread(function() exports.pNotify:SendNotification({text = Config.pNotifyEnterMessage, type = Config.pNotifyEnterType, timeout = math.random(1000, 10000)}) end end - if not has_value(Config.WeaponBypass, GetSelectedPedWeapon(iPed)) then - SetCurrentPedWeapon(iPed, GetHashKey("WEAPON_UNARMED"), true) - DisablePlayerFiring(iPed, true) - SetWeaponDamageModifierThisFrame(GetSelectedPedWeapon(iPed), -1000) - end + NetworkSetFriendlyFireOption(false) + DisablePlayerFiring(iPed, true) + SetCurrentPedWeapon(_source,GetHashKey("WEAPON_UNARMED"),true) + if IsPedDoingDriveby(iPed) then + DisableControlAction(0, 69, true) + DisableControlAction(0, 92, true) + else + DisableControlAction(0, 69, false) + DisableControlAction(0, 92, false) + end if IsPedInAnyVehicle(iPed, false) then veh = GetVehiclePedIsUsing(iPed) SetEntityCanBeDamaged(veh, false) if Config.MaxVehicleSpeed then - if not has_value(Config.MaxSpeedBypass, GetVehicleClass(veh)) then + if not has_value(Config.MaxSpeedBypass, veh) then SetVehicleMaxSpeed(veh, Config.MaxVehicleSpeed) end end diff --git a/resources/Safe-Zones/config.lua b/resources/Safe-Zones/config.lua index d12e1e43e..a28e51cf9 100644 --- a/resources/Safe-Zones/config.lua +++ b/resources/Safe-Zones/config.lua @@ -29,11 +29,6 @@ Config.MaxSpeedBypass = { -- Vehicles classes added in this bypass will still be --20, -- Commercial --21, -- Trains } - -Config.WeaponBypass = { - --GetHashKey("WEAPON_PISTOL"), - GetHashKey("WEAPON_PISTOL"), -} Config.pNotify = false diff --git a/resources/Safe-Zones/version.json b/resources/Safe-Zones/version.json index d6dd86e46..ed0b5fb92 100644 --- a/resources/Safe-Zones/version.json +++ b/resources/Safe-Zones/version.json @@ -1,5 +1,5 @@ { "date": "Oct 7, 2021", "version": "1.0.8", - "changelog": "Added:\n•Speed limit bypass option for vehicles classes." -} + "changelog": "Added Speed limit bypass option for vehicles classes." +} \ No newline at end of file diff --git a/scrbind-base.dll b/scrbind-base.dll index 0fbdab870..4ad867236 100644 Binary files a/scrbind-base.dll and b/scrbind-base.dll differ diff --git a/scripting-server.dll b/scripting-server.dll index 689817f27..8f07e9889 100644 Binary files a/scripting-server.dll and b/scripting-server.dll differ diff --git a/svadhesive.dll b/svadhesive.dll index d1fef9140..c4869b138 100644 Binary files a/svadhesive.dll and b/svadhesive.dll differ diff --git a/vfs-core.dll b/vfs-core.dll index 3ec76116b..ac2f3e43d 100644 Binary files a/vfs-core.dll and b/vfs-core.dll differ diff --git a/vfs-impl-server.dll b/vfs-impl-server.dll index 622cbfbe7..a99885f61 100644 Binary files a/vfs-impl-server.dll and b/vfs-impl-server.dll differ diff --git a/voip-server-mumble.dll b/voip-server-mumble.dll index 75bafb08c..dafd5519f 100644 Binary files a/voip-server-mumble.dll and b/voip-server-mumble.dll differ