Added fallback for retrieving current champion and bumped version

- Implemented a fallback mechanism to retrieve the current champion if the initial method fails - Version bumped
Rokuazery · May 10, 2023 · ad7eb4a · ad7eb4a
1 parent 3b03f84
commit ad7eb4a
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 3 deletions.
diff --git a/LoL Assist/ViewModels/MainViewModel.cs b/LoL Assist/ViewModels/MainViewModel.cs
@@ -822,6 +822,11 @@ public async void LoLMonitor()
         private async void ReImport() => await Task.Run(async () => {
             var currentChampion = (await LCUWrapper.GetCurrentChampionIdAsync(SummonerId)).ToString();
             currentChampion = Converter.ChampionKeyToName(currentChampion);
+
+            // Fallback if the mode doesn't support /lol-champ-select-legacy/v1/session
+            if (string.IsNullOrEmpty(currentChampion))
+                currentChampion = await LCUWrapper.GetCurrentChampionAsyncV2();
+
             ImportBuilds(currentChampion, true); 
         });
 

diff --git a/LoLA/LoLA/Networking/LCU/Events/ChampionMonitor.cs b/LoLA/LoLA/Networking/LCU/Events/ChampionMonitor.cs
@@ -46,8 +46,14 @@ private async void championMonitor()
                 var phase = await LCUWrapper.GetGamePhaseAsync();
                 if (phase == Phase.ChampSelect)
                 {
+
                     var currentChampion = (await LCUWrapper.GetCurrentChampionIdAsync(SummonerId)).ToString();
                     currentChampion = Converter.ChampionKeyToName(currentChampion);
+
+                    // Fallback if the mode doesn't support /lol-champ-select-legacy/v1/session
+                    if (string.IsNullOrEmpty(currentChampion))
+                        currentChampion = await LCUWrapper.GetCurrentChampionAsyncV2();
+
                     if (LastChampion != currentChampion)
                     {
                         LastChampion = currentChampion;

diff --git a/LoLA/LoLA/Networking/LCU/LCUWrapper.cs b/LoLA/LoLA/Networking/LCU/LCUWrapper.cs
@@ -221,7 +221,7 @@ public static async Task<JObject> GetCurrentSessionAsync()
             if (!await InitAsync())
                 return null;
 
-            var currentSessionJson = await GetDataRequestAsync(RequestMethod.GET, "/lol-champ-select/v1/session");
+            var currentSessionJson = await GetDataRequestAsync(RequestMethod.GET, "/lol-champ-select-legacy/v1/session");
 
             if (string.IsNullOrEmpty(currentSessionJson)) return null;
 

diff --git a/Version.txt b/Version.txt
@@ -1,2 +1,2 @@
-2.0.0.8
-2.0.0.6
+2.0.1.2
+2.0.1.0
-Original file line number
+Diff line change
@@ -1,2 +1,2 @@
-.0.0.8
-.0.0.6
+.0.1.2
+.0.1.0