Fix Critical Issue with Rage Gain [M]

Batfoxkid · Mar 23, 2024 · 7057bae · 7057bae
1 parent a435098
commit 7057bae
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/addons/sourcemod/scripting/freak_fortress_2/events.sp b/addons/sourcemod/scripting/freak_fortress_2/events.sp
@@ -334,18 +334,22 @@ public Action Events_PlayerHurt(Event event, const char[] name, bool dontBroadca
 		if(Client(victim).IsBoss)
 		{
 			float rage = Client(victim).RageDamage;
-			float maxrage = Client(victim).RageMax;
-			if(rage > 0.0 && rage < maxrage)
+			if(rage > 0.0)
 			{
-				float debuff = Client(victim).RageDebuff;
-				if(debuff != 1.0)
-					Client(victim).RageDebuff = 1.0;
-
-				rage = Client(victim).GetCharge(0) + (damage * 100.0 * debuff / rage);
-				if(rage > maxrage)
-					rage = maxrage;
-
-				Client(victim).SetCharge(0, rage);
+				rage = Client(victim).GetCharge(0);
+				float maxrage = Client(victim).RageMax;
+				if(rage < maxrage)
+				{
+					float debuff = Client(victim).RageDebuff;
+					if(debuff != 1.0)
+						Client(victim).RageDebuff = 1.0;
+
+					rage += (damage * 100.0 * debuff / rage);
+					if(rage > maxrage)
+						rage = maxrage;
+
+					Client(victim).SetCharge(0, rage);
+				}
 			}
 
 			if(event.GetBool("minicrit") && event.GetBool("allseecrit"))

diff --git a/addons/sourcemod/scripting/freak_fortress_2/gamemode.sp b/addons/sourcemod/scripting/freak_fortress_2/gamemode.sp
@@ -1195,7 +1195,7 @@ void Gamemode_PlayerRunCmd(int client, int buttons)
 	{
 		Client(client).OverlayFor = 0.0;
 
-		SetVariantString("");
+		SetVariantString(NULL_STRING);
 		AcceptEntityInput(client, "SetScriptOverlayMaterial", client, client);
 	}
 }