From 163b181eac242d110300423f28390e392edb16eb Mon Sep 17 00:00:00 2001
From: Bluzume <39113159+KuromeSan@users.noreply.github.com>
Date: Sat, 6 Nov 2021 23:45:35 -0400
Subject: [PATCH] Fix time-based minigames saying best time was worst time

---
 HorseIsleServer/HorseIsleServer/Game/Meta.cs         | 8 ++++----
 HorseIsleServer/HorseIsleServer/Server/Database.cs   | 7 +++++--
 HorseIsleServer/HorseIsleServer/Server/GameClient.cs | 2 +-
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/HorseIsleServer/HorseIsleServer/Game/Meta.cs b/HorseIsleServer/HorseIsleServer/Game/Meta.cs
index 4bd3b16..70cd8aa 100644
--- a/HorseIsleServer/HorseIsleServer/Game/Meta.cs
+++ b/HorseIsleServer/HorseIsleServer/Game/Meta.cs
@@ -864,7 +864,7 @@ namespace HISP.Game
         {
             Highscore.HighscoreTableEntry[] scores = Database.GetTopScores(gameName, 20);
             if (scores.Length <= 0)
-                return "ERROR: No scores recorded.";
+                return "ERROR: No scores recorded." + Messages.BackToMap + Messages.MetaTerminator;
             string message = "";
 
             message += Messages.FormatHighscoreHeader(gameName);
@@ -881,7 +881,7 @@ namespace HISP.Game
         {
             Highscore.HighscoreTableEntry[] scores = Database.GetTopWinners(gameName, 20);
             if (scores.Length <= 0)
-                return "No wins recorded.";
+                return "ERROR: No wins recorded." + Messages.BackToMap + Messages.MetaTerminator;
             string message = "";
 
             message += Messages.FormatWinlooseHeader(gameName);
@@ -896,9 +896,9 @@ namespace HISP.Game
         }
         public static string BuildTopTimes(string gameName)
         {
-            Highscore.HighscoreTableEntry[] scores = Database.GetTopScores(gameName, 20);
+            Highscore.HighscoreTableEntry[] scores = Database.GetTopScores(gameName, 20, false);
             if (scores.Length <= 0)
-                return "No times recorded.";
+                return "ERROR: No times recorded. "+Messages.BackToMap+Messages.MetaTerminator;
             string message = "";
 
             message += Messages.FormatBestTimeHeader(gameName);
diff --git a/HorseIsleServer/HorseIsleServer/Server/Database.cs b/HorseIsleServer/HorseIsleServer/Server/Database.cs
index fe58358..0b39bf5 100644
--- a/HorseIsleServer/HorseIsleServer/Server/Database.cs
+++ b/HorseIsleServer/HorseIsleServer/Server/Database.cs
@@ -5447,14 +5447,17 @@ namespace HISP.Server
             }
         }
 
-        public static Highscore.HighscoreTableEntry[] GetTopScores(string gameTitle, int limit)
+        public static Highscore.HighscoreTableEntry[] GetTopScores(string gameTitle, int limit, bool scores=true)
         {
             List<Highscore.HighscoreTableEntry> entires = new List<Highscore.HighscoreTableEntry>();
             using (MySqlConnection db = new MySqlConnection(ConnectionString))
             {
                 db.Open();
                 MySqlCommand sqlCommand = db.CreateCommand();
-                sqlCommand.CommandText = "SELECT * FROM Leaderboards WHERE minigame=@gameTitle ORDER BY score DESC LIMIT @limit";
+                if(scores)
+                    sqlCommand.CommandText = "SELECT * FROM Leaderboards WHERE minigame=@gameTitle ORDER BY score DESC LIMIT @limit";
+                else
+                    sqlCommand.CommandText = "SELECT * FROM Leaderboards WHERE minigame=@gameTitle ORDER BY score ASC LIMIT @limit";
                 sqlCommand.Parameters.AddWithValue("@gameTitle", gameTitle);
                 sqlCommand.Parameters.AddWithValue("@limit", limit);
                 sqlCommand.Prepare();
diff --git a/HorseIsleServer/HorseIsleServer/Server/GameClient.cs b/HorseIsleServer/HorseIsleServer/Server/GameClient.cs
index d6da593..1f13172 100644
--- a/HorseIsleServer/HorseIsleServer/Server/GameClient.cs
+++ b/HorseIsleServer/HorseIsleServer/Server/GameClient.cs
@@ -512,7 +512,7 @@ namespace HISP.Server
             {
                 ClientSocket.Send(PacketData);
             }
-            catch (Exception e)
+            catch (Exception)
             {
                 Disconnect();
             }