Make sure player is online before teleporting them to the lobby

Tofpu · Feb 23, 2024 · a73af54 · a73af54
1 parent df8f0c7
commit a73af54
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandSetup.java b/spigot/src/main/java/io/tofpu/speedbridge2/model/island/object/setup/IslandSetup.java
@@ -13,6 +13,7 @@
 import org.bukkit.GameMode;
 import org.bukkit.Location;
 import org.bukkit.Material;
+import org.bukkit.entity.Player;
 
 import java.util.UUID;
 
@@ -169,10 +170,11 @@ public void cancel() {
 
         resetState();
 
-        // teleporting the player to the lobby location
-        player.getPlayer()
-                .teleport(ConfigurationManager.INSTANCE.getLobbyCategory()
-                        .getLobbyLocation());
+        Player bukkitPlayer = player.getPlayer();
+        if (bukkitPlayer != null && bukkitPlayer.isOnline()) {
+            // teleporting the player to the lobby location
+            bukkitPlayer.teleport(ConfigurationManager.INSTANCE.getLobbyCategory().getLobbyLocation());
+        }
 
         resetPlot();
     }
@@ -181,10 +183,12 @@ private void resetState() {
         player.toggleSetup();
 
         // inactivate the setup umbrella
-        umbrella.inactivate(player.getPlayer());
-
-        // setting the player's gamemode back to survival
-        player.getPlayer().setGameMode(GameMode.SURVIVAL);
+        Player bukkitPlayer = player.getPlayer();
+        umbrella.inactivate(bukkitPlayer);
+        if (bukkitPlayer != null && bukkitPlayer.isOnline()) {
+            // setting the player's gamemode back to survival
+            bukkitPlayer.setGameMode(GameMode.SURVIVAL);
+        }
     }
 
     /**