feat: use the bungee random game selection algorithm for /bw join w…

…ithout arguments to make it more random The only difference is that it remembers all the games with the max player count and then randomly chooses one of them, instead of doing it deterministically
ScreamingSandals · Dec 31, 2024 · 14dd90c · 14dd90c
1 parent 1da422f
commit 14dd90c
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/plugin/src/main/java/org/screamingsandals/bedwars/Main.java b/plugin/src/main/java/org/screamingsandals/bedwars/Main.java
@@ -802,16 +802,20 @@ public org.screamingsandals.bedwars.api.game.Game getRandomWaitingGameForBungeeM
                 return;
             }
 
+            if (game.getConnectedPlayers().size() >= game.getMaxPlayers()) {
+                return;
+            }
+
             availableGames.computeIfAbsent(game.getConnectedPlayers().size(), ArrayList::new).add(game);
         });
 
         if (availableGames.isEmpty()) {
             return null;
         }
 
-        List<Game> gamesWithMinimumPlayers = availableGames.lastEntry().getValue();
+        List<Game> gamesWithMaximumPlayers = availableGames.lastEntry().getValue();
 
-        return gamesWithMinimumPlayers.get(MiscUtils.randInt(0, gamesWithMinimumPlayers.size() - 1));
+        return gamesWithMaximumPlayers.get(MiscUtils.randInt(0, gamesWithMaximumPlayers.size() - 1));
     }
 
     public org.screamingsandals.bedwars.api.game.Game getFirstRunningGame() {

diff --git a/plugin/src/main/java/org/screamingsandals/bedwars/commands/AutojoinCommand.java b/plugin/src/main/java/org/screamingsandals/bedwars/commands/AutojoinCommand.java
@@ -42,7 +42,7 @@ public boolean execute(CommandSender sender, List<String> args) {
             return true;
         }
 
-        Game game = Main.getInstance().getGameWithHighestPlayers(); // prioritizing player count - scorp
+        Game game = Main.getInstance().getRandomWaitingGameForBungeeMode();
         if (game == null) {
             player.sendMessage(i18n("there_is_no_empty_game"));
         } else {

diff --git a/plugin/src/main/java/org/screamingsandals/bedwars/commands/JoinCommand.java b/plugin/src/main/java/org/screamingsandals/bedwars/commands/JoinCommand.java
@@ -50,7 +50,7 @@ public boolean execute(CommandSender sender, List<String> args) {
                 player.sendMessage(i18n("no_arena_found"));
             }
         } else {
-            final Game game = Main.getInstance().getGameWithHighestPlayers();
+            final Game game = Main.getInstance().getRandomWaitingGameForBungeeMode();
             if (game != null) {
                 game.joinToGame(player);
                 return true;