feat: go to snapshot, changed the default of bungee.serverRestart, added bungee.rejoin-players-after-game

Author: Misat11

gradle.properties

@@ -1,4 +1,4 @@
-version=0.2.42.2
+version=0.2.43-SNAPSHOT
 
 org.gradle.caching=true
 org.gradle.parallel=true

plugin/src/main/java/org/screamingsandals/bedwars/config/Configurator.java

@@ -175,11 +175,12 @@ public void createFiles() {
         checkOrSetConfig(modify, "change-allowed-commands-to-blacklist", false);
 
         checkOrSetConfig(modify, "bungee.enabled", false);
-        checkOrSetConfig(modify, "bungee.serverRestart", true);
+        checkOrSetConfig(modify, "bungee.serverRestart", false);
         checkOrSetConfig(modify, "bungee.serverStop", false);
         checkOrSetConfig(modify, "bungee.server", "hub");
         checkOrSetConfig(modify, "bungee.auto-game-connect", false);
         checkOrSetConfig(modify, "bungee.kick-when-proxy-too-slow", true);
+        checkOrSetConfig(modify, "bungee.rejoin-players-after-game", false);
         checkOrSetConfig(modify, "bungee.random-game-selection.enabled", config.getBoolean("bungee.select-random-game", true));
         checkOrSetConfig(modify, "bungee.random-game-selection.preselect-games", false);
         checkOrSetConfig(modify, "bungee.motd.enabled", false);

plugin/src/main/java/org/screamingsandals/bedwars/game/Game.java

@@ -2479,7 +2479,7 @@ && getOriginalOrInheritedSpawnerHologramsCountdown()
             String message = i18nc("game_end", customPrefix);
             for (GamePlayer player : (List<GamePlayer>) ((ArrayList<GamePlayer>) players).clone()) {
                 player.player.sendMessage(message);
-                player.changeGame(null);
+                player.changeGame(null, true);
 
                 if (Main.getConfigurator().config.getBoolean("rewards.enabled")) {
                     final Player pl = player.player;

plugin/src/main/java/org/screamingsandals/bedwars/game/GamePlayer.java

@@ -19,20 +19,25 @@
 
 package org.screamingsandals.bedwars.game;
 
+import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.potion.PotionEffect;
+import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scoreboard.Scoreboard;
 import org.screamingsandals.bedwars.Main;
+import org.screamingsandals.bedwars.commands.BaseCommand;
 import org.screamingsandals.bedwars.utils.BungeeUtils;
 import org.screamingsandals.bedwars.lib.nms.entity.PlayerUtils;
 
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.screamingsandals.bedwars.commands.BaseCommand.ADMIN_PERMISSION;
+
 public class GamePlayer {
     public final Player player;
     private Game game = null;
@@ -51,13 +56,50 @@ public GamePlayer(Player player) {
     }
 
     public void changeGame(Game game) {
+        changeGame(game, false);
+    }
+
+    public void changeGame(Game game, boolean gameEndLeave) {
         if (this.game != null && game == null) {
             this.game.internalLeavePlayer(this);
             this.game = null;
             this.isSpectator = false;
             this.clean();
             if (Game.isBungeeEnabled()) {
-                BungeeUtils.movePlayerToBungeeServer(player, Main.isDisabling());
+                if (gameEndLeave
+                        && !Main.isDisabling()
+                        && Main.getConfigurator().config.getBoolean("bungee.rejoin-players-after-game")
+                        && !Main.getConfigurator().config.getBoolean("bungee.serverRestart")
+                        && !Main.getConfigurator().config.getBoolean("bungee.serverStop")) {
+                    new BukkitRunnable() {
+                        public void run() {
+                            try {
+                                Game game = null;
+                                if (Main.getConfigurator().config.getBoolean("bungee.random-game-selection.enabled")) {
+                                    if (Main.getInstance().isPreSelectGames()) {
+                                        game = Main.getInstance().getSelectedGame();
+                                    }
+                                    if (game == null) {
+                                        game = (Game) Main.getInstance().getRandomWaitingGameForBungeeMode();
+                                    }
+                                } else {
+                                    game = (Game) Main.getInstance().getFirstWaitingGame();
+                                }
+                                if (game == null) {
+                                    game = (Game) Main.getInstance().getFirstRunningGame();
+                                }
+
+                                game.joinToGame(player);
+                            } catch (NullPointerException ignored) {
+                                if (!BaseCommand.hasPermission(player, ADMIN_PERMISSION, false)) {
+                                    BungeeUtils.movePlayerToBungeeServer(player, false);
+                                }
+                            }
+                        }
+                    }.runTaskLater(Main.getInstance(), 1L);
+                } else {
+                    BungeeUtils.movePlayerToBungeeServer(player, Main.isDisabling());
+                }
             } else {
                 this.restoreInv();
             }