From c8549db08726122a5ea1cc62946fc1fe3249d625 Mon Sep 17 00:00:00 2001
From: koneko-nyan <31385587+koneko-nyan@users.noreply.github.com>
Date: Tue, 19 Sep 2017 21:00:15 +0200
Subject: [PATCH 1/2] Update Commands.cs

(time % 1.0) * 60.0 can be equal to 59.8, then it gets rounded to undesirable 60 displayed in the time format
---
 TShockAPI/Commands.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TShockAPI/Commands.cs b/TShockAPI/Commands.cs
index 5e7b84bf..fbc6c061 100644
--- a/TShockAPI/Commands.cs
+++ b/TShockAPI/Commands.cs
@@ -3872,7 +3872,7 @@ namespace TShockAPI
 				if (!Main.dayTime)
 					time += 15.0;
 				time = time % 24.0;
-				args.Player.SendInfoMessage("The current time is {0}:{1:D2}.", (int)Math.Floor(time), (int)Math.Round((time % 1.0) * 60.0));
+				args.Player.SendInfoMessage("The current time is {0}:{1:D2}.", (int)Math.Floor(time), (int)Math.Floor((time % 1.0) * 60.0));
 				return;
 			}
 

From 65582ceaecb4be28acecf88059a4bc4798e38bbd Mon Sep 17 00:00:00 2001
From: koneko-nyan <31385587+koneko-nyan@users.noreply.github.com>
Date: Tue, 19 Sep 2017 21:22:56 +0200
Subject: [PATCH 2/2] Update CHANGELOG.md

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7ab5308..efa71d54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@ This is the rolling changelog for TShock for Terraria. Use past tense when addin
 * Fixed /spawnmob not spawning negative IDs (@MarioE)
 * Validated tile placement on PlaceObject; clients can no longer place frames, paintings etc with dirt blocks (@bartico6, @ProfessorXZ)
 * Updated to new stat tracking system with more data so we can actually make informed software decisions (Jordan Coulam)
+* Fixed /time display at the end of Terraria hours (@koneko-nyan)
 
 ## TShock 4.3.24
 * API: Changed `PlayerHooks` permission hook mechanisms to allow negation from hooks (@deadsurgeon42)