From e54b7f365947da9985597aff129d136d8e49e29d Mon Sep 17 00:00:00 2001
From: relaxtakenotes <91839650+relaxtakenotes@users.noreply.github.com>
Date: Wed, 12 Feb 2025 16:34:27 +0500
Subject: [PATCH] fixes

- fix the climb trace overextending
- fix grapple acceleration in singleplayer
---
 beatrun/gamemodes/beatrun/gamemode/sh/Climb.lua   | 4 ++--
 beatrun/gamemodes/beatrun/gamemode/sh/Grapple.lua | 2 ++
 beatrun/gamemodes/beatrun/gamemode/shared.lua     | 2 +-
 version.txt                                       | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/Climb.lua b/beatrun/gamemodes/beatrun/gamemode/sh/Climb.lua
index a1fe372..1b2e139 100644
--- a/beatrun/gamemodes/beatrun/gamemode/sh/Climb.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/sh/Climb.lua
@@ -621,7 +621,7 @@ local function ClimbingCheck(ply, mv, cmd)
 		mv:SetOrigin(startpos)
 	end
 
-	tr.start = startpos - wallang:Forward() * 0.533
+	tr.start = mv:GetOrigin() + wallang:Forward() * 20 + vector_up * tr.maxs.z + vector_up
 	tr.endpos = tr.start
 
 	util.TraceHull(tr)
@@ -652,7 +652,7 @@ local function ClimbingCheck(ply, mv, cmd)
 
 	ply:SetClimbing(climbvalue)
 	ply:SetClimbingStart(startpos)
-	ply:SetClimbingEnd(endpos)
+	ply:SetClimbingEnd(tr.endpos)
 	ply:SetClimbingTime(0)
 	ply:SetClimbingDelay(CurTime() + 0.75)
 
diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/Grapple.lua b/beatrun/gamemodes/beatrun/gamemode/sh/Grapple.lua
index 646d91f..dade5ec 100644
--- a/beatrun/gamemodes/beatrun/gamemode/sh/Grapple.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/sh/Grapple.lua
@@ -65,6 +65,8 @@ hook.Add("SetupMove", "Grapple", function(ply, mv, cmd)
 	if not ply:Alive() or Course_Name ~= "" and ply:GetNW2Int("CPNum", 1) ~= -1 and not ply:GetNW2Entity("Swingrope"):IsValid() then return end
 	if GetGlobalBool("GM_INFECTION") or GetGlobalBool("GM_DATATHEFT") or GetGlobalBool("GM_DEATHMATCH") and not ply:GetNW2Entity("Swingrope"):IsValid() then return end
 
+	if FrameTime() <= 0 then return end
+
 	local usingrh = ply:UsingRH()
 
 	if not ply.Grapple_tr then
diff --git a/beatrun/gamemodes/beatrun/gamemode/shared.lua b/beatrun/gamemodes/beatrun/gamemode/shared.lua
index cf47139..83ffcb4 100644
--- a/beatrun/gamemodes/beatrun/gamemode/shared.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/shared.lua
@@ -1,4 +1,4 @@
-VERSION_GLOBAL = "1.0.32"
+VERSION_GLOBAL = "1.0.33"
 VERSION_LATEST = ""
 VERSION_CHECKED = false
 
diff --git a/version.txt b/version.txt
index 08a69b5..c1cf2f9 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.0.32
\ No newline at end of file
+1.0.33
\ No newline at end of file