From 2d58e51e9ac3c42678ebe0e852ecebdf0f162212 Mon Sep 17 00:00:00 2001 From: Bluzume <39113159+KuromeSan@users.noreply.github.com> Date: Thu, 11 Nov 2021 20:39:46 -0500 Subject: [PATCH] Fix Awards being wrong --- HorseIsleData | 2 +- HorseIsleServer/HorseIsleServer/Player/Award.cs | 2 ++ HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/HorseIsleData b/HorseIsleData index eed8fcb..731175f 160000 --- a/HorseIsleData +++ b/HorseIsleData @@ -1 +1 @@ -Subproject commit eed8fcbfbb36646528e53e22873a50e196c16d60 +Subproject commit 731175fef56355cf8ecf7e7e3a034d5fc3f0d258 diff --git a/HorseIsleServer/HorseIsleServer/Player/Award.cs b/HorseIsleServer/HorseIsleServer/Player/Award.cs index ade24af..d0ba64b 100644 --- a/HorseIsleServer/HorseIsleServer/Player/Award.cs +++ b/HorseIsleServer/HorseIsleServer/Player/Award.cs @@ -21,6 +21,7 @@ namespace HISP.Player public static AwardEntry GetAwardById(int id) { + //99% fo the time this will work try { AwardEntry award = GlobalAwardList[id - 1]; @@ -29,6 +30,7 @@ namespace HISP.Player } catch (Exception) { }; + // Incase it doesnt... foreach(AwardEntry award in GlobalAwardList) { if (award.Id == id) diff --git a/HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs b/HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs index 1939169..74dec15 100644 --- a/HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs +++ b/HorseIsleServer/HorseIsleServer/Server/GameDataJson.cs @@ -416,7 +416,7 @@ namespace HISP.Server { Award.AwardEntry award = new Award.AwardEntry(); - award.Id = i + 1; + award.Id = gameData.award_list[i].id; award.Sort = gameData.award_list[i].sort_by; award.Title = gameData.award_list[i].title; award.IconId = gameData.award_list[i].icon_id;