Merge branch 'master' into dev

Goobwabber · web-flow · commit 8a370b6ddefb · 2021-05-30T16:18:33.000-04:00
diff --git a/MultiplayerExtensions/OverrideClasses/GameStateControllerStub.cs b/MultiplayerExtensions/OverrideClasses/GameStateControllerStub.cs
@@ -183,8 +183,11 @@ private void StartLevel()
 
         private void handleLevelFinished(MultiplayerLevelScenesTransitionSetupDataSO sceneSetupData, MultiplayerResultsData resultsData)
         {
+            if (resultsData.localPlayerResultData.levelCompletionResults == null)
+                return;
+            
             string? hash = Utilities.Utils.LevelIdToHash(sceneSetupData.previewBeatmapLevel.levelID);
-            if (hash != null && resultsData != null && resultsData.localPlayerResultData?.levelCompletionResults != null)
+            if (hash != null)
                 _ = Statistics.PlayMap(hash, sceneSetupData.beatmapDifficulty.ToString(), sceneSetupData.beatmapCharacteristic.serializedName, (int)Math.Floor(resultsData.localPlayerResultData.levelCompletionResults.endSongTime), (int)ExtendedPlayerManager.localPlatform, MPState.CurrentMasterServer.hostname);
         }
 

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,11 @@ private void StartLevel()`
`183`	`183`
`184`	`184`	`private void handleLevelFinished(MultiplayerLevelScenesTransitionSetupDataSO sceneSetupData, MultiplayerResultsData resultsData)`
`185`	`185`	`{`
	`186`	`+ if (resultsData.localPlayerResultData.levelCompletionResults == null)`
	`187`	`+ return;`
	`188`	`+`
`186`	`189`	`string? hash = Utilities.Utils.LevelIdToHash(sceneSetupData.previewBeatmapLevel.levelID);`
`187`		`- if (hash != null && resultsData != null && resultsData.localPlayerResultData?.levelCompletionResults != null)`
	`190`	`+ if (hash != null)`
`188`	`191`	`_ = Statistics.PlayMap(hash, sceneSetupData.beatmapDifficulty.ToString(), sceneSetupData.beatmapCharacteristic.serializedName, (int)Math.Floor(resultsData.localPlayerResultData.levelCompletionResults.endSongTime), (int)ExtendedPlayerManager.localPlatform, MPState.CurrentMasterServer.hostname);`
`189`	`192`	`}`
`190`	`193`