From 78fb8804d8085f182bd966136b1a433846a5991e Mon Sep 17 00:00:00 2001
From: Ashleigh Adams <ashleigh.k.adams@gmail.com>
Date: Wed, 3 Sep 2025 22:06:54 +0100
Subject: [PATCH] Prevent flicker

Prevent flickering of the HTML menu, and close it instantly when the menu is closed
---
 src/SharpModMenu/PlayerMenuState.cs | 12 ++++++++++++
 src/SharpModMenu/SharpModMenu.cs    | 23 +++++++++++++++++++++++
 2 files changed, 35 insertions(+)

diff --git a/src/SharpModMenu/PlayerMenuState.cs b/src/SharpModMenu/PlayerMenuState.cs
index fd2759d..f025b40 100644
--- a/src/SharpModMenu/PlayerMenuState.cs
+++ b/src/SharpModMenu/PlayerMenuState.cs
@@ -142,7 +142,15 @@ private bool MenuActive
 			if (value)
 				Driver.ActiveMenuStates.Add(this);
 			else
+			{
 				Driver.ActiveMenuStates.Remove(this);
+				if (ShowingHtmlContent)
+				{
+					ShowingHtmlContent = false;
+					Player.PrintToCenterHtml(HtmlContent ?? "<font></font>", 0);
+					HtmlContent = null;
+				}
+			}
 		}
 	}
 
@@ -609,13 +617,17 @@ private void BuildMenuStrings(Menu currentMenu, Action<string, TextStyling, int?
 	}
 
 	public bool ForceRefresh = true;
+	public bool ShowingHtmlContent;
 	public void Tick()
 	{
 		if (CurrentMenu is null)
 			return;
 
 		if (PresentingHtml && HtmlContent is not null)
+		{
+			ShowingHtmlContent = true;
 			Player.PrintToCenterHtml(HtmlContent);
+		}
 
 		var observerInfo = Player.GetObserverInfo();
 
diff --git a/src/SharpModMenu/SharpModMenu.cs b/src/SharpModMenu/SharpModMenu.cs
index 562b897..fdcef2c 100644
--- a/src/SharpModMenu/SharpModMenu.cs
+++ b/src/SharpModMenu/SharpModMenu.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Globalization;
+using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
 
@@ -13,6 +14,7 @@
 using CounterStrikeSharp.API.Modules.Memory.DynamicFunctions;
 
 using CSSUniversalMenuAPI;
+
 using static CounterStrikeSharp.API.Core.Listeners;
 
 namespace SharpModMenu;
@@ -58,6 +60,7 @@ public override void Load(bool hotReload)
 
 		RegisterListener<OnTick>(OnTick);
 		RegisterListener<CheckTransmit>(OnCheckTransmit);
+		RegisterListener<OnMapStart>(OnMapStartHandler);
 	}
 
 	public override void Unload(bool hotReload)
@@ -67,8 +70,28 @@ public override void Unload(bool hotReload)
 		ProcessUserCmdsFunc?.Unhook(ProcessUserCmds, HookMode.Pre);
 	}
 
+	// thanks to Deana for this snippet
+	private CCSGameRules? GameRulesEnt { get; set; }
+	private bool LoadedGameRules { get; set; }
+
+	private void OnMapStartHandler(string map)
+	{
+		GameRulesEnt = null;
+		LoadedGameRules = false;
+	}
+
 	private void OnTick()
 	{
+		if (!LoadedGameRules)
+		{
+			LoadedGameRules = true;
+			GameRulesEnt = Utilities.FindAllEntitiesByDesignerName<CCSGameRulesProxy>("cs_gamerules").FirstOrDefault()?.GameRules;
+		}
+		else if (GameRulesEnt is not null)
+		{
+			GameRulesEnt.GameRestart = GameRulesEnt.RestartRoundTime < Server.CurrentTime;
+		}
+
 		if (UseFallbackWasdInputMethod)
 		{
 			for (int i = 0; i < DriverInstance!.ActiveMenuStates.Count; i++)