Fix invalid operation when setting bool convar with string value

edgegamers · Jan 25, 2024 · cb90915 · cb90915
1 parent 0c13633
commit cb90915
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/mod/Jailbreak.Teams/Ratio/RatioBehavior.cs b/mod/Jailbreak.Teams/Ratio/RatioBehavior.cs
@@ -97,7 +97,7 @@ public HookResult OnRoundStart(EventRoundStart ev, GameEventInfo info)
 		var action = Evaluate(counterTerrorists, terrorists);
 
 		//	Prevent the round from ending while we make ratio adjustments
-		using (var _ = new TemporaryConvar("mp_ignore_round_win_conditions", "true"))
+		using (var _ = new TemporaryConvar<bool>("mp_ignore_round_win_conditions", true))
 		{
 			var success = action.Type switch
 			{

diff --git a/public/Jailbreak.Public/Utils/TemporaryConvar.cs b/public/Jailbreak.Public/Utils/TemporaryConvar.cs
@@ -2,22 +2,22 @@
 
 namespace Jailbreak.Public.Utils;
 
-public class TemporaryConvar : IDisposable
+public class TemporaryConvar<T> : IDisposable
 {
-	private string _previousValue;
+	private T _previousValue;
 	private ConVar _handle;
-	public TemporaryConvar(string name, string value)
+	public TemporaryConvar(string name, T value)
 	{
 		_handle = ConVar.Find(name);
 		if (_handle == null)
 			throw new InvalidOperationException($"ConVar {name} does not exist!");
 
-		_previousValue = _handle.StringValue;
-		_handle.SetValue(value);
+		_previousValue = _handle.GetPrimitiveValue<T>();
+		_handle.SetValue<T>(value);
 	}
 
 	public void Dispose()
 	{
-		_handle.StringValue = _previousValue;
+		_handle.SetValue<T>(_previousValue);
 	}
 }