Don't count spectators as players in waiting lobby

NucleoidMC · Nov 10, 2024 · a7c0158 · a7c0158
1 parent 8968fa8
commit a7c0158
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/main/java/xyz/nucleoid/plasmid/api/game/common/GameWaitingLobby.java b/src/main/java/xyz/nucleoid/plasmid/api/game/common/GameWaitingLobby.java
@@ -161,7 +161,7 @@ private void onTick() {
 
     @Nullable
     private GameResult requestStart() {
-        if (this.gameSpace.getPlayers().size() < this.playerConfig.minPlayers()) {
+        if (this.gameSpace.getPlayers().participants().size() < this.playerConfig.minPlayers()) {
             return GameResult.error(GameTexts.Start.notEnoughPlayers());
         }
 
@@ -218,7 +218,7 @@ private long getTargetCountdownDuration() {
             return START_REQUESTED_COUNTDOWN;
         }
 
-        if (this.gameSpace.getPlayers().size() >= this.playerConfig.minPlayers()) {
+        if (this.gameSpace.getPlayers().participants().size() >= this.playerConfig.minPlayers()) {
             if (this.isActiveFull()) {
                 return countdown.fullSeconds() * 20L;
             } else if (this.isReady()) {
@@ -261,10 +261,10 @@ private void updateSidebar() {
 
             if (this.playerConfig.playerConfig().maxPlayers().isEmpty()) {
                 b.add(Text.translatable("text.plasmid.game.waiting_lobby.sidebar.players",
-                        Text.literal("" + this.gameSpace.getPlayers().size()).formatted(Formatting.AQUA), "", ""));
+                        Text.literal("" + this.gameSpace.getPlayers().participants().size()).formatted(Formatting.AQUA), "", ""));
             } else {
                 b.add(Text.translatable("text.plasmid.game.waiting_lobby.sidebar.players",
-                        Text.literal("" + this.gameSpace.getPlayers().size()).formatted(Formatting.AQUA),
+                        Text.literal("" + this.gameSpace.getPlayers().participants().size()).formatted(Formatting.AQUA),
                         Text.literal("/").formatted(Formatting.GRAY),
                         Text.literal("" + this.playerConfig.playerConfig().maxPlayers().orElse(0)).formatted(Formatting.AQUA)));
             }
@@ -297,7 +297,7 @@ private long getRemainingTicks(long time) {
     }
 
     private boolean isReady() {
-        return this.gameSpace.getPlayers().size() >= this.playerConfig.thresholdPlayers();
+        return this.gameSpace.getPlayers().participants().size() >= this.playerConfig.thresholdPlayers();
     }
 
     private boolean isFull() {