Use classic score in total score processor

ppy · Sep 28, 2023 · 622df85 · 622df85
1 parent 84c371f
commit 622df85
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 6 deletions.
diff --git a/osu.Server.Queues.ScoreStatisticsProcessor.Tests/DatabaseTest.cs b/osu.Server.Queues.ScoreStatisticsProcessor.Tests/DatabaseTest.cs
@@ -132,6 +132,11 @@ public static ScoreItem CreateTestScore(int? rulesetId = null, int? beatmapId =
                     { HitResult.Perfect, 5 },
                     { HitResult.LargeBonus, 0 }
                 },
+                MaximumStatistics =
+                {
+                    { HitResult.Perfect, 5 },
+                    { HitResult.LargeBonus, 2 }
+                },
                 Passed = true
             };
 

diff --git a/osu.Server.Queues.ScoreStatisticsProcessor.Tests/TotalScoreProcessorTests.cs b/osu.Server.Queues.ScoreStatisticsProcessor.Tests/TotalScoreProcessorTests.cs
@@ -12,10 +12,10 @@ public void TestTotalScoreIncrease()
             WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", (int?)null, CancellationToken);
 
             PushToQueueAndWaitForProcess(CreateTestScore());
-            WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 100000, CancellationToken);
+            WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 10081, CancellationToken);
 
             PushToQueueAndWaitForProcess(CreateTestScore());
-            WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 200000, CancellationToken);
+            WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 20162, CancellationToken);
         }
 
         [Fact]
@@ -45,12 +45,12 @@ public void TestTotalScoreReprocessDoesntIncrease()
             WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", (int?)null, CancellationToken);
 
             PushToQueueAndWaitForProcess(score);
-            WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 100000, CancellationToken);
+            WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 10081, CancellationToken);
 
             score.MarkProcessed();
 
             PushToQueueAndWaitForProcess(score);
-            WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 100000, CancellationToken);
+            WaitForDatabaseState("SELECT total_score FROM osu_user_stats WHERE user_id = 2", 10081, CancellationToken);
         }
     }
 }
diff --git a/osu.Server.Queues.ScoreStatisticsProcessor/Processors/TotalScoreProcessor.cs b/osu.Server.Queues.ScoreStatisticsProcessor/Processors/TotalScoreProcessor.cs
@@ -4,6 +4,8 @@
 using JetBrains.Annotations;
 using MySqlConnector;
 using osu.Game.Online.API.Requests.Responses;
+using osu.Game.Rulesets.Scoring;
+using osu.Game.Scoring.Legacy;
 using osu.Server.Queues.ScoreStatisticsProcessor.Models;
 
 namespace osu.Server.Queues.ScoreStatisticsProcessor.Processors
@@ -19,12 +21,12 @@ public class TotalScoreProcessor : IProcessor
         public void RevertFromUserStats(SoloScoreInfo score, UserStats userStats, int previousVersion, MySqlConnection conn, MySqlTransaction transaction)
         {
             if (previousVersion >= 2)
-                userStats.total_score -= score.TotalScore;
+                userStats.total_score -= score.GetDisplayScore(ScoringMode.Classic);
         }
 
         public void ApplyToUserStats(SoloScoreInfo score, UserStats userStats, MySqlConnection conn, MySqlTransaction transaction)
         {
-            userStats.total_score += score.TotalScore;
+            userStats.total_score += score.GetDisplayScore(ScoringMode.Classic);
         }
 
         public void ApplyGlobal(SoloScoreInfo score, MySqlConnection conn)