re-add minimum players during match

Author: jasoryeh

core/src/main/java/tc/oc/pgm/PGMConfig.java

@@ -90,6 +90,7 @@ public final class PGMConfig implements Config {
 
   // join.*
   private final long minPlayers;
+  private final long minPlayersMaintain;
   private final boolean limitJoin;
   private final boolean priorityKick;
   private final boolean balanceJoin;
@@ -196,6 +197,7 @@ public final class PGMConfig implements Config {
     this.maxExtraVotes = parseInteger(config.getString("votes.max-extra-votes", "5"));
 
     this.minPlayers = parseInteger(config.getString("join.min-players", "1"));
+    this.minPlayersMaintain = parseInteger(config.getString("gameplay.min-players-maintain", "1"));
     this.limitJoin = parseBoolean(config.getString("join.limit", "true"));
     this.priorityKick = parseBoolean(config.getString("join.priority-kick", "true"));
     this.balanceJoin = parseBoolean(config.getString("join.balance", "true"));
@@ -583,6 +585,11 @@ public Duration getTimePenalty(TimePenalty penalty) {
     return timePenalties.get(penalty);
   }
 
+  @Override
+  public long getMinimumPlayersMaintain() {
+    return this.minPlayersMaintain;
+  }
+
   @Override
   public boolean showSideBar() {
     return showSideBar;

core/src/main/java/tc/oc/pgm/api/Config.java

@@ -330,6 +330,13 @@ enum TimePenalty {
     SWITCH
   }
 
+  /**
+   * Get the number of players needed to keep a match running.
+   *
+   * @return number of players
+   */
+  long getMinimumPlayersMaintain();
+
   /**
    * Gets if extra votes are allowed based on the "pgm.vote.extra.#" permission.
    *

core/src/main/java/tc/oc/pgm/cycle/CycleMatchModule.java

@@ -47,8 +47,11 @@ public void startCountdown(@Nullable Duration duration) {
   public void onPartyChange(PlayerPartyChangeEvent event) {
     if (event.wasParticipating()
         && match.isRunning()
-        && match.getParticipants().isEmpty()) {
-      match.getLogger().info("Cycling due to empty match");
+        && match.getParticipants().size()
+            < PGM.get().getConfiguration().getMinimumPlayersMaintain()) {
+      match
+          .getLogger()
+          .info("Ending match due to an insufficient number of players.");
       match.finish();
       startCountdown(null);
     }

core/src/main/resources/config.yml

@@ -66,6 +66,7 @@ restart:
 # Changes behaviour when players try to /join a match.
 join:
   min-players: 1      # Minimum number of players before a match can start.
+  min-players-maintain: 1 # Minimum number of players that a match should maintain before PGM ends the match
   anytime: true       # Can players join after a match has started?
   balance: true       # Can players be moved to make teams more balanced?
   queue: false        # Should players be put in a queue before joining the match?