From ab62c65f13c10324182895790898615d7b6da06a Mon Sep 17 00:00:00 2001
From: Bluzume <39113159+KuromeSan@users.noreply.github.com>
Date: Sat, 6 Nov 2021 23:24:29 -0400
Subject: [PATCH] Fix arena EXP Rewards

---
 HorseIsleData                                 |  2 +-
 HorseIsleServer/HorseIsleServer/Game/Arena.cs | 20 +++----------------
 .../HorseIsleServer/Server/GameClient.cs      |  2 --
 .../HorseIsleServer/Server/GameDataJson.cs    | 14 +++++++------
 4 files changed, 12 insertions(+), 26 deletions(-)

diff --git a/HorseIsleData b/HorseIsleData
index 82cffb5..0f92689 160000
--- a/HorseIsleData
+++ b/HorseIsleData
@@ -1 +1 @@
-Subproject commit 82cffb522d1ebdb3d4c00da52087461a8068fa36
+Subproject commit 0f9268907fb3cd9d0da9c8ab1cba8308de0e5656
diff --git a/HorseIsleServer/HorseIsleServer/Game/Arena.cs b/HorseIsleServer/HorseIsleServer/Game/Arena.cs
index 46dc6f2..43be3a9 100644
--- a/HorseIsleServer/HorseIsleServer/Game/Arena.cs
+++ b/HorseIsleServer/HorseIsleServer/Game/Arena.cs
@@ -16,7 +16,7 @@ namespace HISP.Game
         private static List<Arena> arenas = new List<Arena>();
         private List<ArenaEntry> entries;
         private Timer arenaTimeout;
-
+        public static int[] ExpRewards;
         public int Id;
         public string Type;
         public int EntryCost;
@@ -247,23 +247,9 @@ namespace HISP.Game
             if(Mode == "COMPETING")
             {
                 string chatMessage = Messages.ArenaResultsMessage;
-                
+
                 string[] avaliblePlacings = new string[6] { Messages.ArenaFirstPlace, Messages.ArenaSecondPlace, Messages.ArenaThirdPlace, Messages.ArenaFourthPlace, Messages.ArenaFifthPlace, Messages.ArenaSixthPlace };
-                
-                int[] expRewards = new int[Entries.Length];
-                expRewards[0] = 1;
-                int expAwardMul = 1;
-                for(int i = 1; i < Entries.Length; i++)
-                {
-                    expRewards[i] = 2 * expAwardMul;
-
-                    if (expAwardMul == 1)
-                        expAwardMul = 2;
-                    else
-                        expAwardMul += 2;
-                }
-
-                expRewards = expRewards.ToArray().Reverse().ToArray();
+                int[] expRewards = ExpRewards.ToArray().Reverse().ToArray();
 
                 int place = 0;
                 ArenaEntry[] winners = Entries.OrderByDescending(o => o.SubmitScore).ToArray();
diff --git a/HorseIsleServer/HorseIsleServer/Server/GameClient.cs b/HorseIsleServer/HorseIsleServer/Server/GameClient.cs
index 628cec2..d6da593 100644
--- a/HorseIsleServer/HorseIsleServer/Server/GameClient.cs
+++ b/HorseIsleServer/HorseIsleServer/Server/GameClient.cs
@@ -514,8 +514,6 @@ namespace HISP.Server
             }
             catch (Exception e)
             {
-                if(!(e is SocketException))
-                    Logger.ErrorPrint("Exception occured: " + e.Message);
                 Disconnect();
             }
         }
diff --git a/HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs b/HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs
index b701692..1bb77a9 100644
--- a/HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs
+++ b/HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs
@@ -734,16 +734,18 @@ namespace HISP.Server
             int totalArenas = gameData.arena.Count;
             for (int i = 0; i < totalArenas; i++)
             {
-                int arenaId = gameData.arena[i].arena_id;
-                string arenaType = gameData.arena[i].arena_type;
-                int arenaEntryCost = gameData.arena[i].entry_cost;
-                int raceEvery = gameData.arena[i].race_every;
-                int slots = gameData.arena[i].slots;
-                int timeout = gameData.arena[i].timeout;
+                int arenaId = gameData.arena.arena_list[i].arena_id;
+                string arenaType = gameData.arena.arena_list[i].arena_type;
+                int arenaEntryCost = gameData.arena.arena_list[i].entry_cost;
+                int raceEvery = gameData.arena.arena_list[i].race_every;
+                int slots = gameData.arena.arena_list[i].slots;
+                int timeout = gameData.arena.arena_list[i].timeout;
 
                 Arena arena = new Arena(arenaId, arenaType, arenaEntryCost, raceEvery, slots, timeout);
                 Logger.DebugPrint("Registered Arena: " + arena.Id.ToString() + " as " + arena.Type);
             }
+            Arena.ExpRewards = gameData.arena.arena_exp.ToObject<int[]>();
+
             // Register Leaser
             int totalLeasers = gameData.leaser.Count;
             for (int i = 0; i < totalLeasers; i++)