fix: handle nullable difficulty beatmap on level start

roydejong · Mar 17, 2023 · b5b1e40 · b5b1e40
1 parent cbfa97b
commit b5b1e40
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 13 deletions.
diff --git a/Core/BssbDataCollector.cs b/Core/BssbDataCollector.cs
@@ -281,7 +281,7 @@ private void FinishPreConnectHandling()
         [AffinityPostfix]
         [AffinityPatch(typeof(LobbyGameStateController), "StartMultiplayerLevel")]
         private void HandleStartMultiplayerLevel(ILevelGameplaySetupData gameplaySetupData,
-            IDifficultyBeatmap difficultyBeatmap, Action beforeSceneSwitchCallback)
+            IDifficultyBeatmap? difficultyBeatmap, Action beforeSceneSwitchCallback)
         {
             var previewBeatmapLevel = gameplaySetupData.beatmapLevel.beatmapLevel;
             var beatmapDifficulty = gameplaySetupData.beatmapLevel.beatmapDifficulty;
@@ -295,8 +295,8 @@ private void HandleStartMultiplayerLevel(ILevelGameplaySetupData gameplaySetupDa
                       $"difficulty={beatmapDifficulty}, characteristic={beatmapCharacteristic}, " +
                       $"modifiers={gameplayModifiers})");
 
-            Current.Level = BssbServerLevel.FromDifficultyBeatmap(difficultyBeatmap, gameplayModifiers,
-                beatmapCharacteristic.serializedName);
+            Current.Level = BssbServerLevel.FromLevelStartData(previewBeatmapLevel, beatmapDifficulty, difficultyBeatmap, 
+                gameplayModifiers, beatmapCharacteristic.serializedName);
 
             if (Current.Level.Difficulty.HasValue && Current.LobbyDifficulty != BssbDifficulty.All)
                 Current.LobbyDifficulty = Current.Level.Difficulty.Value.ToBssbDifficulty();

diff --git a/Models/BssbServerLevel.cs b/Models/BssbServerLevel.cs
@@ -26,20 +26,36 @@ public string CharacteristicText
             }
         }
 
-        public static BssbServerLevel FromDifficultyBeatmap(IDifficultyBeatmap db, GameplayModifiers? modifiers,
-            string? characteristic)
+        public static BssbServerLevel FromLevelStartData(IPreviewBeatmapLevel previewBeatmapLevel,
+            BeatmapDifficulty difficulty, IDifficultyBeatmap? db = null, GameplayModifiers? modifiers = null,
+            string? characteristic = null)
         {
+            if (db != null)
+            {
+                return new BssbServerLevel()
+                {
+                    LevelId = db.level.levelID,
+                    SongName = db.level.songName,
+                    SongSubName = db.level.songSubName,
+                    SongAuthorName = db.level.songAuthorName,
+                    LevelAuthorName = db.level.levelAuthorName,
+                    Difficulty = db.difficulty,
+                    Modifiers = modifiers,
+                    Characteristic = characteristic
+                };
+            }
+
             return new BssbServerLevel()
             {
-                LevelId = db.level.levelID,
-                SongName = db.level.songName,
-                SongSubName = db.level.songSubName,
-                SongAuthorName = db.level.songAuthorName,
-                LevelAuthorName = db.level.levelAuthorName,
-                Difficulty = db.difficulty,
+                LevelId = previewBeatmapLevel.levelID,
+                SongName = previewBeatmapLevel.songName,
+                SongSubName = previewBeatmapLevel.songSubName,
+                SongAuthorName = previewBeatmapLevel.songAuthorName,
+                LevelAuthorName = previewBeatmapLevel.levelAuthorName,
+                Difficulty = difficulty,
                 Modifiers = modifiers,
-                Characteristic = characteristic 
-            };
+                Characteristic = characteristic
+            };  
         }
     }
 }