Fix join and leave commands

Author: Pablete1234

src/main/java/in/twizmwaz/cardinal/command/CommandJoin.java

@@ -31,6 +31,7 @@
 import ee.ellytr.command.argument.Optional;
 import in.twizmwaz.cardinal.Cardinal;
 import in.twizmwaz.cardinal.match.Match;
+import in.twizmwaz.cardinal.match.MatchThread;
 import in.twizmwaz.cardinal.module.team.SinglePlayerContainer;
 import in.twizmwaz.cardinal.module.team.Team;
 import in.twizmwaz.cardinal.playercontainer.Containers;
@@ -50,7 +51,8 @@ public class CommandJoin {
   @PlayerCommand
   public static void join(CommandContext cmd, @Optional Team team) {
     Player player = (Player) cmd.getSender();
-    Match match = Cardinal.getMatch(player);
+    MatchThread thread = Cardinal.getMatchThread(player);
+    Match match = thread.getCurrentMatch();
     PlayingPlayerContainer playing = team;
     if (!match.isFfa()) {
       if (playing == null) {
@@ -59,9 +61,24 @@ public static void join(CommandContext cmd, @Optional Team team) {
     } else {
       playing = SinglePlayerContainer.of(player);
     }
-    PlayerContainerData newData = new PlayerContainerData(match.getMatchThread(), match, playing);
+    PlayerContainerData newData = new PlayerContainerData(thread, match, playing);
     PlayerContainerData oldData = PlayerContainerData.of(player);
     Containers.handleStateChangeEvent(player, oldData, newData);
   }
 
-}
+  /**
+   * Leave the game.
+   *
+   * @param cmd  The context of this command.
+   */
+  @Command(aliases = "leave", description = "Leave the game")
+  @PlayerCommand
+  public static void leave(CommandContext cmd) {
+    Player player = (Player) cmd.getSender();
+    MatchThread thread = Cardinal.getMatchThread(player);
+    PlayerContainerData newData = new PlayerContainerData(thread, null, null);
+    PlayerContainerData oldData = PlayerContainerData.of(player);
+    Containers.handleStateChangeEvent(player, oldData, newData);
+  }
+
+}

src/main/java/in/twizmwaz/cardinal/match/Match.java

@@ -135,8 +135,8 @@ public void addPlayer(@NonNull Player player) {
 
   @Override
   public void removePlayer(@NonNull Player player) {
-    players.remove(player);
     PlayingPlayerContainer container = getPlayingContainer(player);
+    players.remove(player);
     if (isFfa()) {
       playerContainers.remove(container);
     } else {

src/main/java/in/twizmwaz/cardinal/module/interact/InteractModule.java

@@ -26,12 +26,10 @@
 package in.twizmwaz.cardinal.module.interact;
 
 import in.twizmwaz.cardinal.Cardinal;
-import in.twizmwaz.cardinal.match.Match;
 import in.twizmwaz.cardinal.match.MatchThread;
 import in.twizmwaz.cardinal.module.AbstractListenerModule;
 import in.twizmwaz.cardinal.module.ModuleEntry;
 import in.twizmwaz.cardinal.module.spawn.SpawnModule;
-import in.twizmwaz.cardinal.util.ListUtil;
 import lombok.NonNull;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
@@ -68,12 +66,7 @@ private boolean canInteract(@NonNull Player player) {
    */
   @EventHandler(ignoreCancelled = true)
   public void onPlayerMove(PlayerMoveEvent event) {
-    Player player = event.getPlayer();
-    if (!canInteract(player) && event.getTo().getY() < -64) {
-      Match match = Cardinal.getMatch(player);
-      event.setTo(ListUtil.getRandom(Cardinal.getModule(SpawnModule.class).getDefaultSpawn(match).getRegions())
-          .getRandomPoint().toLocation(match.getWorld()));
-    }
+    handlePlayerMove(event);
   }
 
   /**
@@ -83,11 +76,13 @@ public void onPlayerMove(PlayerMoveEvent event) {
    */
   @EventHandler(ignoreCancelled = true)
   public void onPlayerTeleport(PlayerTeleportEvent event) {
+    handlePlayerMove(event);
+  }
+
+  private void handlePlayerMove(PlayerMoveEvent event) {
     Player player = event.getPlayer();
     if (!canInteract(player) && event.getTo().getY() < -64) {
-      Match match = Cardinal.getMatch(player);
-      event.setTo(ListUtil.getRandom(Cardinal.getModule(SpawnModule.class).getDefaultSpawn(match).getRegions())
-          .getRandomPoint().toLocation(match.getWorld()));
+      event.setTo(Cardinal.getModule(SpawnModule.class).getDefaultSpawnLocation(Cardinal.getMatch(player)));
     }
   }
 

src/main/java/in/twizmwaz/cardinal/module/spawn/SpawnModule.java

@@ -34,6 +34,7 @@
 import in.twizmwaz.cardinal.event.player.PlayerContainerChangeStateEvent;
 import in.twizmwaz.cardinal.match.Match;
 import in.twizmwaz.cardinal.match.MatchState;
+import in.twizmwaz.cardinal.match.MatchThread;
 import in.twizmwaz.cardinal.module.AbstractListenerModule;
 import in.twizmwaz.cardinal.module.ModuleEntry;
 import in.twizmwaz.cardinal.module.ModuleError;
@@ -49,6 +50,7 @@
 import in.twizmwaz.cardinal.util.Players;
 import lombok.NonNull;
 import org.bukkit.Bukkit;
+import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -220,10 +222,15 @@ public void onPlayerJoin(PlayerJoinEvent event) {
   @EventHandler
   public void onPlayerChangeTeam(PlayerContainerChangeStateEvent event) {
     Player player = event.getPlayer();
-    if (event.getNewData().getMatchThread().getCurrentMatch().isRunning()) {
-      Match match = Cardinal.getMatch(event.getPlayer());
-      Spawn spawn = ListUtil.getRandom(getSpawns(match, event.getNewData().getPlaying()));
-      Bukkit.getPluginManager().callEvent(new CardinalRespawnEvent(player, spawn));
+    MatchThread newThread = event.getNewData().getMatchThread();
+    if (newThread != null && newThread.getCurrentMatch().isRunning()) {
+      Match match = newThread.getCurrentMatch();
+      if (event.getNewData().getPlaying() != null) {
+        Spawn spawn = ListUtil.getRandom(getSpawns(match, event.getNewData().getPlaying()));
+        Bukkit.getPluginManager().callEvent(new CardinalRespawnEvent(player, spawn));
+      } else {
+        Bukkit.getPluginManager().callEvent(new CardinalRespawnEvent(player, getDefaultSpawn(match)));
+      }
     }
   }
 
@@ -273,7 +280,7 @@ public void onCardinalRespawn(CardinalRespawnEvent event) {
    * @return The default spawn.
    */
   @NonNull
-  public Spawn getDefaultSpawn(@NonNull Match match) {
+  private Spawn getDefaultSpawn(@NonNull Match match) {
     for (Spawn spawn : spawns.get(match)) {
       if (spawn.isDefaultSpawn()) {
         return spawn;
@@ -283,6 +290,15 @@ public Spawn getDefaultSpawn(@NonNull Match match) {
     return null;
   }
 
+  /**
+   * Gets the location of the default spawn.
+   * @param match The match.
+   */
+  @NonNull
+  public Location getDefaultSpawnLocation(@NonNull Match match) {
+    return getDefaultSpawn(match).getSpawnPoint();
+  }
+
   /**
    * Gets a list of {@link Spawn} based on a team. If no spawn is found, spawns without a team will be returned.
    *

src/main/java/in/twizmwaz/cardinal/playercontainer/Containers.java

@@ -26,7 +26,7 @@
 package in.twizmwaz.cardinal.playercontainer;
 
 import in.twizmwaz.cardinal.event.player.PlayerContainerChangeStateEvent;
-import in.twizmwaz.cardinal.module.team.Team;
+import in.twizmwaz.cardinal.module.team.SinglePlayerContainer;
 import lombok.AccessLevel;
 import lombok.NoArgsConstructor;
 import org.bukkit.Bukkit;
@@ -46,30 +46,30 @@ public static void handleStateChangeEvent(Player player, PlayerContainerData old
     PlayerContainerChangeStateEvent event = new PlayerContainerChangeStateEvent(player, oldData, newData);
     Bukkit.getPluginManager().callEvent(event);
     if (!event.isCancelled()) {
-      if (isNonNullAndHasPlayer(oldData.getMatchThread(), player)) {
-        oldData.getMatchThread().removePlayer(player);
-      }
-      if (isNonNullAndHasPlayer(oldData.getMatch(), player)) {
-        oldData.getMatch().removePlayer(player);
-      }
-      if (isNonNullAndHasPlayer(oldData.getPlaying(), player) && oldData.getPlaying() instanceof Team) {
-        oldData.getPlaying().removePlayer(player);
+      switchPlayer(oldData.getMatchThread(), newData.getMatchThread(), player);
+      switchPlayer(oldData.getMatch(), newData.getMatch(), player);
+      if (oldData.getMatch() == newData.getMatch()) {
+        switchPlayer(oldData.getPlaying(), newData.getPlaying(), player);
+      } else {
+        // If match is not the same, removing the player from the match already kicked the player from the team.
+        addPlayer(newData.getPlaying(), player);
       }
+    }
+  }
 
-      if (newData.getMatchThread() != null) {
-        newData.getMatchThread().addPlayer(player);
-      }
-      if (newData.getMatch() != null) {
-        newData.getMatch().addPlayer(player);
-      }
-      if (newData.getPlaying() != null && newData.getPlaying() instanceof Team) {
-        newData.getPlaying().addPlayer(player);
+  private static void switchPlayer(PlayerContainer oldContainer, PlayerContainer newContainer, Player player) {
+    if (oldContainer != newContainer) {
+      if (oldContainer != null && oldContainer.hasPlayer(player)) {
+        oldContainer.removePlayer(player);
       }
+      addPlayer(newContainer, player);
     }
   }
 
-  private static boolean isNonNullAndHasPlayer(PlayerContainer container, Player player) {
-    return container != null && container.hasPlayer(player);
+  private static void addPlayer(PlayerContainer newContainer, Player player) {
+    if (newContainer != null && !(newContainer instanceof SinglePlayerContainer)) {
+      newContainer.addPlayer(player);
+    }
   }
 
 }