From 2dbb211742124484f4a420c61b4511b2c5f16b38 Mon Sep 17 00:00:00 2001
From: rtldg <rtldg@protonmail.com>
Date: Fri, 2 Dec 2022 00:46:20 +0000
Subject: [PATCH] move 0.11s timer absolute minimum stuff

---
 addons/sourcemod/scripting/shavit-core.sp     | 21 ++++++-------------
 .../translations/shavit-core.phrases.txt      |  5 +++++
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/addons/sourcemod/scripting/shavit-core.sp b/addons/sourcemod/scripting/shavit-core.sp
index 27634637..cf13fd0d 100644
--- a/addons/sourcemod/scripting/shavit-core.sp
+++ b/addons/sourcemod/scripting/shavit-core.sp
@@ -1884,20 +1884,6 @@ public int Native_ChangeClientStyle(Handle handler, int numParams)
 	return false;
 }
 
-public Action Shavit_OnFinishPre(int client, timer_snapshot_t snapshot)
-{
-	float minimum_time = GetStyleSettingFloat(snapshot.bsStyle, snapshot.iTimerTrack == Track_Main ? "minimum_time" : "minimum_time_bonus");
-
-	if (snapshot.fCurrentTime < minimum_time)
-	{
-		Shavit_PrintToChat(client, "%T", "TimeUnderMinimumTime", client, minimum_time, snapshot.fCurrentTime, snapshot.iTimerTrack == Track_Main ? "minimum_time" : "minimum_time_bonus");
-		Shavit_StopTimer(client);
-		return Plugin_Stop;
-	}
-
-	return Plugin_Continue;
-}
-
 void CalculateRunTime(timer_snapshot_t s, bool include_end_offset)
 {
 	float ticks = float(s.iFullTicks) + (s.iFractionalTicks / 10000.0);
@@ -1943,8 +1929,13 @@ public int Native_FinishMap(Handle handler, int numParams)
 
 	CalculateRunTime(gA_Timers[client], true);
 
-	if (gA_Timers[client].fCurrentTime <= 0.11)
+	float minimum_time = GetStyleSettingFloat(gA_Timers[client].bsStyle, gA_Timers[client].iTimerTrack == Track_Main ? "minimum_time" : "minimum_time_bonus");
+	float current_time = gA_Timers[client].fCurrentTime;
+
+	if (current_time <= 0.11 || current_time < minimum_time)
 	{
+		Shavit_PrintToChat(client, "%T", (current_time <= 0.11) ? "TimeUnderMinimumTime2" : "TimeUnderMinimumTime", client, (current_time <= 0.11) ? 0.11 : minimum_time, current_time,
+		gA_Timers[client].iTimerTrack == Track_Main ? "minimum_time" : "minimum_time_bonus");
 		Shavit_StopTimer(client);
 		return 0;
 	}
diff --git a/addons/sourcemod/translations/shavit-core.phrases.txt b/addons/sourcemod/translations/shavit-core.phrases.txt
index 36d786bd..28106d26 100644
--- a/addons/sourcemod/translations/shavit-core.phrases.txt
+++ b/addons/sourcemod/translations/shavit-core.phrases.txt
@@ -40,6 +40,11 @@
 		"#format"   "{1:f},{2:f},{3:s}"
 		"en"        "Your time ({2}) was faster than the style's {3} setting ({1}) and did not count."
 	}
+	"TimeUnderMinimumTime2"
+	{
+		"#format"   "{1:f},{2:f}"
+		"en"        "Your time ({2}) was faster or equal to the timer's minimum ({1}) and did not count."
+	}
 	// ---------- Menus ---------- //
 	"StyleMenuTitle"
 	{