From 77dda714c5ec2a5a941ee20b7fa2b0f164d0642b Mon Sep 17 00:00:00 2001
From: Shady1 <eolshady@gmail.com>
Date: Sun, 7 Sep 2025 17:35:26 +0300
Subject: [PATCH 1/2] Refactor reload script to server-side only

This PR refactors the reload script to run server-side only, removing the client-side implementation.
---
 [gameplay]/reload/meta.xml     |  3 +--
 [gameplay]/reload/reload.lua   | 40 ++++++++++++++++++++++++++++++----
 [gameplay]/reload/reload_c.lua | 32 ---------------------------
 3 files changed, 37 insertions(+), 38 deletions(-)
 delete mode 100644 [gameplay]/reload/reload_c.lua

diff --git a/[gameplay]/reload/meta.xml b/[gameplay]/reload/meta.xml
index 3f154dce5..a701071b0 100644
--- a/[gameplay]/reload/meta.xml
+++ b/[gameplay]/reload/meta.xml
@@ -1,6 +1,5 @@
 <meta>
-	<info name="Reload" version="0.9" type="misc" author="Gamesnert" description="Script that allows you to reload your weapon by pushing the button for it"/>
+	<info name="Reload" version="1.0" type="misc" author="Gamesnert" description="Script that allows you to reload your weapon by pushing the button for it"/>
 
 	<script src="reload.lua"/>
-	<script src="reload_c.lua" type="client"/>
 </meta>
diff --git a/[gameplay]/reload/reload.lua b/[gameplay]/reload/reload.lua
index e83f0fc19..4ee623219 100644
--- a/[gameplay]/reload/reload.lua
+++ b/[gameplay]/reload/reload.lua
@@ -1,5 +1,37 @@
-local function reloadWeapon()
-	reloadPedWeapon(client)
+local spamTimer = {}
+
+function reloadWeapon(player)
+    if getControlState(player,"aimweapon") then return end
+    if getControlState(player,"fire") then return end
+    if isPedDead(player) then return end
+    if isPedInVehicle(player) then return end
+    if getPedWeapon(player) == 0 then return end
+
+    if getPedAmmoInClip(player) == getPedTotalAmmo(player) then return end
+
+    if spamTimer[player] and getTickCount() - spamTimer[player] < 3000 then 
+        return 
+    end
+
+    spamTimer[player] = getTickCount()
+
+    reloadPedWeapon(player)
 end
-addEvent("relWep", true)
-addEventHandler("relWep", root, reloadWeapon)
\ No newline at end of file
+
+addEventHandler("onPlayerJoin", root, function() 
+    bindKey(source, "r", "down", reloadWeapon) 
+end) 
+
+addEventHandler("onResourceStart", resourceRoot, function() 
+    for _, player in ipairs (getElementsByType("player")) do 
+        bindKey(player, "r", "down", reloadWeapon)
+    end 
+end)
+
+addEventHandler("onPlayerWeaponReload", root, function()
+    spamTimer[source] = getTickCount()
+end)
+
+addEventHandler("onPlayerQuit", root, function() 
+    spamTimer[source] = nil
+end)
\ No newline at end of file
diff --git a/[gameplay]/reload/reload_c.lua b/[gameplay]/reload/reload_c.lua
deleted file mode 100644
index a8933f570..000000000
--- a/[gameplay]/reload/reload_c.lua
+++ /dev/null
@@ -1,32 +0,0 @@
-local reloadKey = "r"
-local reloadCmd = "reload"
-
-local blockedTasks = {
-    ["TASK_SIMPLE_JUMP"] = true,
-    ["TASK_SIMPLE_LAND"] = true,
-    ["TASK_SIMPLE_SWIM"] = true,
-    ["TASK_SIMPLE_FALL"] = true,
-    ["TASK_SIMPLE_CLIMB"] = true,
-    ["TASK_SIMPLE_GET_UP"] = true,
-    ["TASK_SIMPLE_IN_AIR"] = true,
-    ["TASK_SIMPLE_HIT_HEAD"] = true,
-    ["TASK_SIMPLE_NAMED_ANIM"] = true,
-    ["TASK_SIMPLE_CAR_GET_IN"] = true,
-    ["TASK_SIMPLE_GO_TO_POINT"] = true,
-    ["TASK_SIMPLE_CAR_OPEN_DOOR_FROM_OUTSIDE"] = true,
-}
-
-local function reloadTimer()
-    local task = getPedSimplestTask(localPlayer)
-    if blockedTasks[task] then return end
-    if isPedInVehicle(localPlayer) then return end
-    if getPedAmmoInClip(localPlayer) == getPedTotalAmmo(localPlayer) then return end
-    triggerServerEvent("relWep", localPlayer)
-end
-
-local function reloadWeapon()
-    setTimer(reloadTimer, math.random(50, 120), 1)
-end
-
-bindKey(reloadKey, "down", reloadCmd)
-addCommandHandler(reloadCmd, reloadWeapon)

From f61d65f0ea0abcfdcd3f71843e195e47ef361ab7 Mon Sep 17 00:00:00 2001
From: Eren Yaman <68560906+shadylua@users.noreply.github.com>
Date: Sun, 7 Sep 2025 17:41:11 +0300
Subject: [PATCH 2/2] Update reload.lua

---
 [gameplay]/reload/reload.lua | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/[gameplay]/reload/reload.lua b/[gameplay]/reload/reload.lua
index 4ee623219..2165aa3ca 100644
--- a/[gameplay]/reload/reload.lua
+++ b/[gameplay]/reload/reload.lua
@@ -1,37 +1,36 @@
 local spamTimer = {}
 
-function reloadWeapon(player)
-    if getControlState(player,"aimweapon") then return end
-    if getControlState(player,"fire") then return end
+local function reloadWeapon(player)
+    if getControlState(player, "aim_weapon") then return end
+    if getControlState(player, "fire") then return end
     if isPedDead(player) then return end
     if isPedInVehicle(player) then return end
     if getPedWeapon(player) == 0 then return end
 
     if getPedAmmoInClip(player) == getPedTotalAmmo(player) then return end
 
-    if spamTimer[player] and getTickCount() - spamTimer[player] < 3000 then 
-        return 
+    if spamTimer[player] and getTickCount() - spamTimer[player] < 3000 then
+        return
     end
 
     spamTimer[player] = getTickCount()
-
     reloadPedWeapon(player)
 end
 
-addEventHandler("onPlayerJoin", root, function() 
-    bindKey(source, "r", "down", reloadWeapon) 
-end) 
+addEventHandler("onPlayerJoin", root, function()
+    bindKey(source, "r", "down", reloadWeapon)
+end)
 
-addEventHandler("onResourceStart", resourceRoot, function() 
-    for _, player in ipairs (getElementsByType("player")) do 
+addEventHandler("onResourceStart", resourceRoot, function()
+    for _, player in ipairs(getElementsByType("player")) do
         bindKey(player, "r", "down", reloadWeapon)
-    end 
+    end
 end)
 
 addEventHandler("onPlayerWeaponReload", root, function()
     spamTimer[source] = getTickCount()
 end)
 
-addEventHandler("onPlayerQuit", root, function() 
+addEventHandler("onPlayerQuit", root, function()
     spamTimer[source] = nil
-end)
\ No newline at end of file
+end)