PlayerData - add field for 'online'

- Will be set to false when the player logs out
- This is used for teleporting outside of the, making sure not to use async TP when player has quit

Author: ShaneBeee

src/main/java/tk/shanebee/hg/data/PlayerData.java

@@ -34,6 +34,7 @@ public class PlayerData implements Cloneable {
     private final UUID uuid;
     private final Scoreboard scoreboard;
     private Location previousLocation = null;
+    private boolean online;
 
     //InGame data
     private Team team;
@@ -61,6 +62,7 @@ public PlayerData(Player player, Game game) {
         player.setLevel(0);
         player.setExp(0);
         scoreboard = player.getScoreboard();
+        online = true;
     }
 
     /**
@@ -192,6 +194,14 @@ public Location getPreviousLocation() {
         }
     }
 
+    public boolean isOnline() {
+        return online;
+    }
+
+    public void setOnline(boolean online) {
+        this.online = online;
+    }
+
     /**
      * Get the {@link Player Bukkit Player} belonging to this player data
      *

src/main/java/tk/shanebee/hg/game/GamePlayerData.java

@@ -356,8 +356,8 @@ public void leave(Player player, Boolean death) {
         Location previousLocation = playerData.getPreviousLocation();
 
         playerData.restore(player);
-        playerManager.removePlayerData(player);
         exit(player, previousLocation);
+        playerManager.removePlayerData(player);
         if (death) {
             player.playSound(player.getLocation(), Sound.UI_TOAST_CHALLENGE_COMPLETE, 5, 1);
         }
@@ -379,7 +379,11 @@ void exit(Player player, @Nullable Location exitLocation) {
             Location bedLocation = player.getBedSpawnLocation();
             loc = bedLocation != null ? bedLocation : worldSpawn;
         }
-        PaperLib.teleportAsync(player, loc);
+        if (playerManager.getData(player).isOnline()) {
+            PaperLib.teleportAsync(player, loc);
+        } else {
+            player.teleport(loc);
+        }
     }
 
     /**
@@ -429,7 +433,6 @@ public void leaveSpectate(Player spectator) {
         Location previousLocation = playerData.getPreviousLocation();
 
         playerData.restore(spectator);
-        playerManager.removeSpectatorData(uuid);
         spectators.remove(spectator.getUniqueId());
         spectator.setCollidable(true);
         if (Config.spectateFly) {
@@ -440,6 +443,7 @@ public void leaveSpectate(Player spectator) {
         if (Config.spectateHide)
             revealPlayer(spectator);
         exit(spectator, previousLocation);
+        playerManager.removeSpectatorData(uuid);
     }
 
     void revealPlayer(Player hidden) {

src/main/java/tk/shanebee/hg/listeners/GameListener.java

@@ -727,10 +727,14 @@ private void onPickup(EntityPickupItemEvent event) {
 	private void onLogout(PlayerQuitEvent event) {
 		Player player = event.getPlayer();
 		if (playerManager.hasPlayerData(player)) {
-			playerManager.getPlayerData(player).getGame().getGamePlayerData().leave(player, false);
+		    PlayerData playerData = playerManager.getPlayerData(player);
+		    playerData.setOnline(false);
+			playerData.getGame().getGamePlayerData().leave(player, false);
 		}
 		if (playerManager.hasSpectatorData(player)) {
-			playerManager.getSpectatorData(player).getGame().getGamePlayerData().leaveSpectate(player);
+		    PlayerData playerData = playerManager.getSpectatorData(player);
+            playerData.setOnline(false);
+			playerData.getGame().getGamePlayerData().leaveSpectate(player);
 		}
 	}