From bbbaf621ee9156b90c63a43ddede738af946fad3 Mon Sep 17 00:00:00 2001 From: edshot99 Date: Mon, 30 Sep 2024 13:54:08 -0500 Subject: [PATCH] replace hook with stub to disable the acf3 scanner scanner hook.Run() call doesnt work reliably for me and id rather just remove/disable all the original code anyways --- .../lua/acf/scanner/scanner_sh.lua | 38 +++++++++++++++++++ .../lua/autorun/server/acf3_no_scanning.lua | 4 -- 2 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 acf3_no_scanning/lua/acf/scanner/scanner_sh.lua delete mode 100644 acf3_no_scanning/lua/autorun/server/acf3_no_scanning.lua diff --git a/acf3_no_scanning/lua/acf/scanner/scanner_sh.lua b/acf3_no_scanning/lua/acf/scanner/scanner_sh.lua new file mode 100644 index 0000000..7cadf48 --- /dev/null +++ b/acf3_no_scanning/lua/acf/scanner/scanner_sh.lua @@ -0,0 +1,38 @@ +print("> Loading scanner stub...") + +local ACF = ACF + +local scanning = {} +ACF.Scanning = scanning + +local whyNot = "" + +if SERVER then + util.AddNetworkString("ACF_Scanning_PlayerListChanged") + + hook.Add("PlayerInitialSpawn", "ACF_Scanning_PlayerInitialSpawn", function() + net.Start("ACF_Scanning_PlayerListChanged") + net.Broadcast() + end) + + hook.Add("PlayerDisconnected", "ACF_Scanning_PlayerDisconnected", function() + net.Start("ACF_Scanning_PlayerListChanged") + net.Broadcast() + end) + + function scanning.BeginScanning(playerScanning, targetPlayer) + return + end +end + +if CLIENT then + function scanning.BeginScanning(target) + if (LocalPlayer():InVehicle()) then + Derma_Message("You cannot scan a target while being in a vehicle. Exit the vehicle, then try again.", "Scanning Blocked", "OK") + else + Derma_Message("Scanning has been blocked by the server: " .. whyNot, "Scanning Blocked", "OK") + end + + return + end +end diff --git a/acf3_no_scanning/lua/autorun/server/acf3_no_scanning.lua b/acf3_no_scanning/lua/autorun/server/acf3_no_scanning.lua deleted file mode 100644 index 43e7b81..0000000 --- a/acf3_no_scanning/lua/autorun/server/acf3_no_scanning.lua +++ /dev/null @@ -1,4 +0,0 @@ -hook.Add("ACF_PreBeginScanning", "edshot_acf3_noscan", function() - return false, "noob" -end) -