From 703e0f7ec98f94097f00306d00d0ed4f6788d6fd Mon Sep 17 00:00:00 2001
From: "Jonny_Bro (Nikita)" <niktom.nikto@yandex.ru>
Date: Sat, 9 Sep 2023 12:26:07 +0500
Subject: [PATCH] some minor fixes

---
 beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua | 14 ++------------
 .../gamemodes/beatrun/gamemode/sh/SafetyRoll.lua   |  8 ++++++--
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua b/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua
index ad47ce1..a340246 100644
--- a/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/cl/JumpAnim.lua
@@ -448,12 +448,7 @@ local worldarm = {
 	ladderclimbhangstart = true,
 	snatchscar = true,
 	jumpcoil = true,
-	jumpturnlandidle = true,
-	water_swimfwd = true,
-	water_swimright = true,
-	water_swimleft = true,
-	water_swimback = true,
-	water_float = true
+	jumpturnlandidle = true
 }
 
 local ignorezarm = {
@@ -463,12 +458,7 @@ local ignorezarm = {
 	hangfoldedheaveup = true,
 	wallrunverticalstart = true,
 	diestandlong = true,
-	vaultontohigh = true,
-	water_swimfwd = true,
-	water_swimright = true,
-	water_swimleft = true,
-	water_swimback = true,
-	water_float = true
+	vaultontohigh = true
 }
 
 local nocyclereset = {
diff --git a/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua b/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua
index d43f73b..a1fbeb8 100644
--- a/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua
+++ b/beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua
@@ -13,7 +13,9 @@ local function SafetyRollThink(ply, mv, cmd)
 		mv:SetButtons(bit.band(mv:GetButtons(), bit.bnot(IN_DUCK)))
 	end
 
-	if CurTime() > ply:GetSafetyRollTime() and weapons.IsBasedOn(ply:GetActiveWeapon():GetClass(), "mg_base") then RunConsoleCommand("mgbase_debug_vmrender", "1") end
+	if ply:Alive() and CurTime() > ply:GetSafetyRollTime() and weapons.IsBasedOn(ply:GetActiveWeapon():GetClass(), "mg_base") then
+		RunConsoleCommand("mgbase_debug_vmrender", "1")
+	end
 
 	if CurTime() < ply:GetSafetyRollTime() then
 		ply.FootstepLand = false
@@ -128,7 +130,9 @@ hook.Add("OnPlayerHitGround", "SafetyRoll", function(ply, water, floater, speed)
 
 		ParkourEvent("roll", ply)
 
-		if (weapons.IsBasedOn(ply:GetActiveWeapon():GetClass(), "mg_base")) then RunConsoleCommand("mgbase_debug_vmrender", "0") end
+		if ply:Alive() and weapons.IsBasedOn(ply:GetActiveWeapon():GetClass(), "mg_base") then
+			RunConsoleCommand("mgbase_debug_vmrender", "0")
+		end
 
 		local ang = ply:EyeAngles()
 		local land = ply:GetVelocity()