Fix merge issues

project-fika · Jan 9, 2025 · b0c883d · b0c883d
1 parent 6c25161
commit b0c883d
Showing 1 changed file with 4 additions and 17 deletions.
diff --git a/Fika.Core/Coop/GameMode/CoopGame.cs b/Fika.Core/Coop/GameMode/CoopGame.cs
@@ -72,7 +72,7 @@ public sealed class CoopGame : BaseLocalGame<EftGamePlayerOwner>, IBotGame, IFik
         public FikaDynamicAI DynamicAI { get; private set; }
         public RaidSettings RaidSettings { get; private set; }
         public byte[] HostLootItems { get; private set; }
-        public GClass1315 LootItems { get; internal set; } = [];
+        public GClass1328 LootItems { get; internal set; } = [];
 
         private readonly Dictionary<int, int> botQueue = [];
         private Coroutine extractRoutine;
@@ -93,11 +93,6 @@ public sealed class CoopGame : BaseLocalGame<EftGamePlayerOwner>, IBotGame, IFik
         private TimeSpan? sessionTime;
         private BotStateManager botStateManager;
         private ESeason season;
-
-        public FikaDynamicAI DynamicAI { get; private set; }
-        public RaidSettings RaidSettings { get; private set; }
-        public byte[] HostLootItems { get; private set; }
-        public GClass1328 LootItems { get; internal set; } = [];
         BossSpawnScenario IBotGame.BossSpawnScenario
         {
             get
@@ -1658,12 +1653,7 @@ private async Task GenerateWeathers()
                 Logger.LogInfo("Generating and initializing weather...");
                 if (isServer)
                 {
-                    Task<GClass1323> weatherTask = iSession.WeatherRequest();
-                    while (!weatherTask.IsCompleted)
-                    {
-                        yield return new WaitForEndOfFrame();
-                    }
-                    GClass1323 weather = weatherTask.Result;
+                    GClass1323 weather = await iSession.WeatherRequest();
                     Season = weather.Season;
                     SeasonsSettings = weather.SeasonsSettings;
                     if (!OfflineRaidSettingsMenuPatch_Override.UseCustomWeather)
@@ -1674,14 +1664,11 @@ private async Task GenerateWeathers()
                 }
                 else
                 {
-                    Task getWeather = GetWeather();
-                    while (!getWeather.IsCompleted)
-                    {
-                        yield return new WaitForEndOfFrame();
-                    }
+                    await GetWeather();
                     WeatherController.Instance.method_0(WeatherClasses);
                 }
             }
+        }
 
         public override IEnumerator vmethod_5(Action runCallback)
         {