Merge branch 'master' into feat/supported-versions

BeatTogether · Feb 8, 2025 · e405ad6 · e405ad6
2 parents 3e623f5 + 7330757
commit e405ad6
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/BeatTogether.MasterServer.Api/Implimentations/UserAuthenticator.cs b/BeatTogether.MasterServer.Api/Implimentations/UserAuthenticator.cs
@@ -147,8 +147,8 @@ public async Task<bool> TryAuthenticateUserWithPlatform(MasterServerSession sess
 
         private bool GetPlatformRequiresAuth(Platform platform)
         {
-			_logger.Debug("Authed Platforms: " + string.Join(", ", _apiServerConfiguration.AuthedClients));
-			return _apiServerConfiguration.AuthedClients.Contains(platform);
-		}
+            _logger.Debug("Authed Platforms: " + string.Join(", ", _apiServerConfiguration.AuthedClients));
+            return _apiServerConfiguration.AuthedClients.Contains(platform);
+        }
     }
 }
diff --git a/BeatTogether.MasterServer.Api/Util/UserIdHash.cs b/BeatTogether.MasterServer.Api/Util/UserIdHash.cs
@@ -16,7 +16,7 @@ public static string Generate(Platform platform, string platformUserId)
                 Platform.OculusQuest => "OculusQuest#",
                 Platform.Pico => "Pico#",
                 Platform.Steam => "Steam#",
-                Platform.PS4 => "PSN#",
+                Platform.PS4 or Platform.PS5 => "PSN#",
                 _ => ""
             };
             return Generate(platformStr, platformUserId);

diff --git a/BeatTogether.MasterServer.Data/Implementations/Repositories/MemoryServerRepository.cs b/BeatTogether.MasterServer.Data/Implementations/Repositories/MemoryServerRepository.cs
@@ -118,21 +118,21 @@ public Task<Server> GetAvailablePublicServer(
 		        server.BeatmapDifficultyMask == difficultyMask &&
 		        server.GameplayModifiersMask == modifiersMask &&
 		        server.SongPackMasks == SongPackMasks &&
-                server.SupportedVersionRange == versionRange
+                server.SupportedVersionRange == versionRange &&
+                server.CurrentPlayerCount <= server.GameplayServerConfiguration.MaxPlayerCount
 	        );
-	        if (!publicServers.Any())
-		        return Task.FromResult<Server>(null);
-	        var server = publicServers.First();
-	        foreach (var publicServer in publicServers)
-	        {
-		        if ((publicServer.CurrentPlayerCount < publicServer.GameplayServerConfiguration.MaxPlayerCount && publicServer.CurrentPlayerCount > server.CurrentPlayerCount))
-		        {
-			        server = publicServer;
-		        }
-	        }
-	        if (server.CurrentPlayerCount >= server.GameplayServerConfiguration.MaxPlayerCount)
-		        return Task.FromResult<Server>(null);
-	        return Task.FromResult(server);
+            if (!publicServers.Any())
+                return Task.FromResult<Server>(null);
+            var server = publicServers.First();
+            //Find server with most players.
+            foreach (var publicServer in publicServers)
+            {
+                if(publicServer.CurrentPlayerCount > server.CurrentPlayerCount)
+                {
+                    server = publicServer;
+                }
+            }
+            return Task.FromResult(server);
         }