Make sure we want to generate the world when we get them

Author: Innectic

API/src/main/java/me/ifydev/dimensify/api/DimensifyConstants.java

@@ -67,6 +67,7 @@ public class DimensifyConstants {
     public static final String CANNOT_DELETE_MAIN_WORLD = DIMENSIFY_PREFIX + "&c&lCannot delete the main world!";
     public static final String COULD_NOT_CONNECT_TO_DATABASE = DIMENSIFY_PREFIX + "&c&lCannot connect to the database!";
     public static final String CANNOT_ENTER_THIS_DIMENSION = DIMENSIFY_PREFIX + "&c&lYou don't have permission to enter this domain!";
+    public static final String THIS_DIMENSION_DOES_NOT_EXIST_ANYMORE = DIMENSIFY_PREFIX + "&c&lThis dimension does not exist anymore!";
 
     // General success
     public static final String CREATING_WORLD = DIMENSIFY_PREFIX + "World '<WORLD>' is being created...";

API/src/main/java/me/ifydev/dimensify/api/backend/impl/SQLHandler.java

@@ -86,6 +86,7 @@ public void initialize(String defaultWorld) {
 
             connection.close();
         } catch (SQLException e) {
+            System.out.println("Encountered an error while trying to setup the database:");
             e.printStackTrace();
         }
 

DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/commands/handlers/BasicHandler.java

@@ -94,10 +94,10 @@ public static String createDimension(CommandSender sender, String dimensionType,
     public static String goToDimension(Player player, String dimension) {
         DimensifyMain plugin = DimensifyMain.get();
         // Make sure this dimension actually exists
-        World world = plugin.getWorldController().getWorld(dimension);
-        if (world == null)
+        Optional<World> world = plugin.getWorldController().getWorld(dimension);
+        if (!world.isPresent())
             return DimensifyConstants.INVALID_WORLD.replace("<WORLD>", dimension);
-        WorldController.enterDimension(player, world);
+        WorldController.enterDimension(player, world.get());
         return "";
     }
 
@@ -121,16 +121,16 @@ public static String sendPlayerToDimension(String playerName, String dimension)
         DimensifyMain plugin = DimensifyMain.get();
 
         // Make sure the player and world exist
-        World world = plugin.getWorldController().getWorld(dimension);
-        if (world == null)
+        Optional<World> world = plugin.getWorldController().getWorld(dimension);
+        if (!world.isPresent())
             return DimensifyConstants.INVALID_WORLD.replace("<WORLD>", dimension);
         Player player = Bukkit.getPlayerExact(playerName);
         if (player == null) return DimensifyConstants.INVALID_PLAYER.replace("<PLAYER>", playerName);
 
         // Send the player to the dimension
-        player.teleport(world.getSpawnLocation());
+        player.teleport(world.get().getSpawnLocation());
         player.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(ColorUtil.makeReadable(DimensifyConstants.WHOOSH)));
-        return DimensifyConstants.PLAYER_HAS_BEEN_SENT.replace("<PLAYER>", player.getName());
+        return DimensifyConstants.PLAYER_HAS_BEEN_SENT.replace("<PLAYER>", player.getName()).replace("<WORLD>", dimension);
     }
 
     public static List<String> listWorlds() {

DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/commands/handlers/PortalHandler.java

@@ -62,8 +62,8 @@ public static String linkPortal(String portal, String destination) {
         if (!db.get().getPortal(portal).isPresent())
             return DimensifyConstants.PORTAL_DOES_NOT_EXIST.replace("<PORTAL>", portal);
         // And make sure the world exists
-        World world = plugin.getWorldController().getWorld(destination);
-        if (world == null)
+        Optional<World> world = plugin.getWorldController().getWorld(destination);
+        if (!world.isPresent())
             return DimensifyConstants.INVALID_WORLD.replace("<WORLD>", destination);
 
         return db.get().setPortalDestination(portal, destination)

DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/events/PlayerJoin.java

@@ -1,7 +1,6 @@
 package me.ifydev.dimensifyspigot.events;
 
 import me.ifydev.dimensifyspigot.DimensifyMain;
-import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
@@ -22,9 +21,7 @@ public void onPlayerJoinEvent(PlayerJoinEvent e) {
         if (plugin.isSendPlayersToDefaultWorldOnLogin()) {
             plugin.getApi().getDatabaseHandler().ifPresent(db -> {
                 String dimension = db.getDefaultDimension(false);
-
-                World world = plugin.getWorldController().getWorld(dimension);
-                player.teleport(world.getSpawnLocation());
+                plugin.getWorldController().getWorld(dimension).ifPresent(dim -> player.teleport(dim.getSpawnLocation()));
             });
         }
     }

DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/events/PlayerPortal.java

@@ -1,13 +1,17 @@
 package me.ifydev.dimensifyspigot.events;
 
+import me.ifydev.dimensify.api.DimensifyConstants;
 import me.ifydev.dimensifyspigot.DimensifyMain;
+import me.ifydev.dimensifyspigot.util.ColorUtil;
 import me.ifydev.dimensifyspigot.world.WorldController;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerPortalEvent;
 
+import java.util.Optional;
+
 /**
  * @author Innectic
  * @since 06/22/2018
@@ -26,8 +30,12 @@ public void onPlayerAboutToTeleportEvent(PlayerPortalEvent e) {
             if (!corners.getDestination().isPresent()) return;
 
             String link = corners.getDestination().get();
-            World dimension = DimensifyMain.get().getWorldController().getWorld(link);
-            WorldController.enterDimension(player, dimension);
+            Optional<World> dimension = DimensifyMain.get().getWorldController().getWorld(link);
+            if (!dimension.isPresent()) {
+                player.sendMessage(ColorUtil.makeReadable(DimensifyConstants.THIS_DIMENSION_DOES_NOT_EXIST_ANYMORE));
+                return;
+            }
+            WorldController.enterDimension(player, dimension.get());
         });
     }
 }

DimensifySpigot/src/main/java/me/ifydev/dimensifyspigot/world/WorldController.java

@@ -13,20 +13,25 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.Optional;
 
 /**
  * @author Innectic
  * @since 10/1/2017
  */
 public class WorldController {
 
-    public World getWorld(String name) {
+    public Optional<World> getWorld(String name) {
+        return getWorld(name, false);
+    }
+
+    public Optional<World> getWorld(String name, boolean andMake) {
         World world = Bukkit.getWorld(name);
-        if (world == null) {
+        if (world == null && andMake) {
             this.loadWorld(new DimensifyWorld(name, DimensifyMain.get()));
             world = Bukkit.getWorld(name);
         }
-        return world;
+        return Optional.ofNullable(world);
     }
 
     public void loadWorld(DimensifyWorld creator) {
@@ -87,8 +92,4 @@ public static void enterDimension(Player player, World dimension) {
         player.teleport(dimension.getSpawnLocation());
         player.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(ColorUtil.makeReadable(DimensifyConstants.WHOOSH)));
     }
-
-    public static void enterDimension(Player player, String dimension) {
-        enterDimension(player, DimensifyMain.get().getWorldController().getWorld(dimension));
-    }
 }