Merge 2d46b1fc30 into 7fc975dc42

beatrun/gamemodes/beatrun/entities/entities/br_laser/shared.lua

@@ -64,7 +64,7 @@ function ENT:BRCollisionFunc(ent)
 
 	local dmginfo = DamageInfo()
 		dmginfo:SetAttacker(self)
-		dmginfo:SetDamage(math.huge)
+		dmginfo:SetDamage(1000)
 		dmginfo:SetDamageType(DMG_DISSOLVE)
 	ent:TakeDamageInfo(dmginfo)
 	ent:EmitSound("bigspark" .. math.random(1, 2) .. ".wav")

beatrun/gamemodes/beatrun/gamemode/sh/SafetyRoll.lua

@@ -250,7 +250,7 @@ if SERVER then
 			if speed < 800 and CurTime() < ply:GetSafetyRollKeyTime() and not ply:GetCrouchJump() and not ply:Crouching() then
 				return 0
 			else
-				return math.huge
+				return 1000
 			end
 		end
 

beatrun/gamemodes/beatrun/gamemode/shared.lua

@@ -1,4 +1,4 @@
-VERSION_GLOBAL = "1.0.18"
+VERSION_GLOBAL = "1.0.17"
 VERSION_LATEST = ""
 VERSION_CHECKED = false
 

version.txt

@@ -1 +1 @@
-1.0.18
+1.0.17