feat: allow lobby sending on game end to be configured

emortalmc · Mar 10, 2024 · 744c39d · 744c39d
1 parent 8ef77c3
commit 744c39d
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/src/main/java/dev/emortal/minestom/gamesdk/config/GameSdkConfig.java b/src/main/java/dev/emortal/minestom/gamesdk/config/GameSdkConfig.java
@@ -12,7 +12,7 @@
  * @param gameCreator a function that can be called to create a game instance
  */
 public record GameSdkConfig(int minPlayers, int maxGames, int minTrackingInterval, int maxTrackingInterval,
-                            @NotNull GameCreator gameCreator) {
+                            boolean lobbyOnFinish, @NotNull GameCreator gameCreator) {
 
     public static @NotNull Builder builder() {
         return new BuilderImpl();
@@ -33,6 +33,8 @@ interface GameCreatorStep {
 
             @NotNull GameCreatorStep maxTrackingInterval(int interval);
 
+            @NotNull GameCreatorStep lobbyOnFinish(boolean lobbyOnFinish);
+
             @NotNull EndStep gameCreator(@NotNull GameCreator creator);
         }
 
@@ -48,6 +50,7 @@ private static final class BuilderImpl implements Builder, Builder.MaxGamesStep,
         private int maxGames;
         private int minTrackingInterval = GameTracker.DEFAULT_MIN_UPDATE_INTERVAL;
         private int maxTrackingInterval = GameTracker.DEFAULT_MAX_UPDATE_INTERVAL;
+        private boolean lobbyOnFinish = true;
         private GameCreator gameCreator;
 
         @Override
@@ -74,6 +77,12 @@ private static final class BuilderImpl implements Builder, Builder.MaxGamesStep,
             return this;
         }
 
+        @Override
+        public @NotNull GameCreatorStep lobbyOnFinish(boolean lobbyOnFinish) {
+            this.lobbyOnFinish = lobbyOnFinish;
+            return this;
+        }
+
         @Override
         public @NotNull EndStep gameCreator(@NotNull GameCreator creator) {
             this.gameCreator = creator;
@@ -83,7 +92,7 @@ private static final class BuilderImpl implements Builder, Builder.MaxGamesStep,
         @Override
         public @NotNull GameSdkConfig build() {
             return new GameSdkConfig(this.minPlayers, this.maxGames, this.minTrackingInterval, this.maxTrackingInterval,
-                    this.gameCreator);
+                    this.lobbyOnFinish, this.gameCreator);
         }
     }
 }
diff --git a/src/main/java/dev/emortal/minestom/gamesdk/internal/GameManager.java b/src/main/java/dev/emortal/minestom/gamesdk/internal/GameManager.java
@@ -97,7 +97,11 @@ private void onGameFinish(@NotNull GameFinishedEvent event) {
         }
 
         this.removeGame(game);
-        KurushimiMinestomUtils.sendToLobby(game.getPlayers(), () -> this.cleanUpGame(game), () -> this.cleanUpGame(game));
+        if (this.config.lobbyOnFinish()) {
+            KurushimiMinestomUtils.sendToLobby(game.getPlayers(), () -> this.cleanUpGame(game), () -> this.cleanUpGame(game));
+        } else {
+            this.cleanUpGame(game);
+        }
     }
 
     private void cleanUpGame(@NotNull Game game) {