allow coord arguments to setspawn command (#1975)

* allow coord arguments to setspawn command

* Implement PR changes as requested

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>com.onarandombox.multiversecore</groupId>
     <artifactId>Multiverse-Core</artifactId>
-    <version>4.1.1-1.8.8-SNAPSHOT</version>
+    <version>3.0.0-SNAPSHOT</version>
     <name>Multiverse-Core</name>
     <description>World Management Plugin</description>
     <properties>
@@ -247,7 +247,7 @@
         <dependency>
            <groupId>org.bukkit</groupId>
            <artifactId>bukkit</artifactId>
-           <version>1.8.8-R0.1-SNAPSHOT</version>
+           <version>1.13.2-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
         </dependency>
         <!-- SerializationConfig Dependency -->
@@ -267,7 +267,7 @@
         <dependency>
             <groupId>net.milkbowl.vault</groupId>
             <artifactId>VaultAPI</artifactId>
-            <version>1.5</version>
+            <version>1.7</version>
             <scope>provided</scope>
         </dependency>
         <!-- End of Economy Dependency -->
@@ -275,7 +275,7 @@
         <dependency>
             <groupId>com.pneumaticraft.commandhandler</groupId>
             <artifactId>CommandHandler</artifactId>
-            <version>11</version>
+            <version>10</version>
         </dependency>
         <dependency>
             <groupId>com.dumptruckman.minecraft</groupId>
@@ -285,7 +285,7 @@
         <dependency>
             <groupId>org.mcstats.bukkit</groupId>
             <artifactId>metrics</artifactId>
-            <version>R6</version>
+            <version>R8-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.bukkit</groupId>

src/main/java/com/onarandombox/MultiverseCore/MultiverseCore.java

@@ -7,23 +7,6 @@
 
 package com.onarandombox.MultiverseCore;
 
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.logging.Level;
-
 import buscript.Buscript;
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MVWorld.NullLocation;
@@ -78,7 +61,6 @@ import com.onarandombox.MultiverseCore.destination.DestinationFactory;
 import com.onarandombox.MultiverseCore.destination.ExactDestination;
 import com.onarandombox.MultiverseCore.destination.PlayerDestination;
 import com.onarandombox.MultiverseCore.destination.WorldDestination;
-import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
 import com.onarandombox.MultiverseCore.event.MVVersionEvent;
 import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
 import com.onarandombox.MultiverseCore.listeners.MVChatListener;
@@ -124,11 +106,23 @@ import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.plugin.java.JavaPluginLoader;
 import org.mcstats.Metrics;
 
+import java.io.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.logging.Level;
+
 /**
  * The implementation of the Multiverse-{@link Core}.
  */
 public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
-    private static final int PROTOCOL = 24;
+    private static final int PROTOCOL = 22;
     // TODO: Investigate if this one is really needed to be static.
     // Doubt it. -- FernFerret
     private static Map<String, String> teleportQueue = new HashMap<String, String>();
@@ -177,6 +171,11 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         teleportQueue.put(teleportee, teleporter);
     }
 
+    @Override
+    public String toString() {
+        return "The Multiverse-Core Plugin";
+    }
+
     /**
      * {@inheritDoc}
      * @deprecated This is now deprecated, nobody needs it any longer.
@@ -305,6 +304,7 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         // Setup & Load our Configuration files.
         loadConfigs();
         if (this.multiverseConfig != null) {
+            Logging.setDebugLevel(getMVConfig().getGlobalDebug());
             Logging.setShowingConfig(!getMVConfig().getSilentStart());
             this.worldManager.loadDefaultWorlds();
             this.worldManager.loadWorlds(true);
@@ -339,9 +339,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
 
         // Output a little snippet to show it's enabled.
         Logging.config("Version %s (API v%s) Enabled - By %s", this.getDescription().getVersion(), PROTOCOL, getAuthors());
-
-        getLogger().info("Help dumptruckman keep this project alive. Become a patron! https://www.patreon.com/dumptruckman");
-        getLogger().info("One time donations are also appreciated: https://www.paypal.me/dumptruckman");
     }
 
     /**
@@ -410,17 +407,18 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         try {
             Metrics m = new Metrics(this);
 
-            Metrics.Graph envGraph = m.createGraph("worlds_by_env");
+            Metrics.Graph envGraph = m.createGraph("Worlds by environment");
             for (Environment env : Environment.values())
                 envGraph.addPlotter(new EnvironmentPlotter(this, env));
 
-            m.addCustomData(new Metrics.Plotter("Loaded worlds") {
+            Metrics.Graph loadedWorldsGraph = m.createGraph("Worlds by environment");
+            loadedWorldsGraph.addPlotter(new Metrics.Plotter("Loaded worlds") {
                 @Override
                 public int getValue() {
                     return getMVWorldManager().getMVWorlds().size();
                 }
             });
-            m.addCustomData(new Metrics.Plotter("Total number of worlds") {
+            loadedWorldsGraph.addPlotter(new Metrics.Plotter("Total number of worlds") {
                 @Override
                 public int getValue() {
                     return getMVWorldManager().getMVWorlds().size()
@@ -433,13 +431,13 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
                 gens.add(w.getGenerator());
             gens.remove(null);
             gens.remove("null");
-            Metrics.Graph genGraph = m.createGraph("custom_gens");
+            Metrics.Graph genGraph = m.createGraph("Custom Generators");
             for (String gen : gens)
                 genGraph.addPlotter(new GeneratorPlotter(this, gen));
 
             m.start();
             log(Level.FINE, "Metrics have run!");
-        } catch (IOException e) {
+        } catch (Exception e) {
             log(Level.WARNING, "There was an issue while enabling metrics: " + e.getMessage());
         }
     }
@@ -511,12 +509,6 @@ public class MultiverseCore extends JavaPlugin implements MVPlugin, Core {
         // Old Config Format
         this.migrate22Values();
         this.saveMVConfigs();
-
-        int level = Logging.getDebugLevel();
-        Logging.setDebugLevel(getMVConfig().getGlobalDebug());
-        if (level != Logging.getDebugLevel()) {
-            getServer().getPluginManager().callEvent(new MVDebugModeEvent(level));
-        }
     }
 
     /**

src/main/java/com/onarandombox/MultiverseCore/MultiverseCoreConfiguration.java

@@ -2,9 +2,7 @@ package com.onarandombox.MultiverseCore;
 
 import com.dumptruckman.minecraft.util.*;
 import com.onarandombox.MultiverseCore.api.*;
-import com.onarandombox.MultiverseCore.event.MVDebugModeEvent;
 import me.main__.util.SerializationConfig.*;
-import org.bukkit.Bukkit;
 
 import java.util.*;
 
@@ -231,7 +229,6 @@ public class MultiverseCoreConfiguration extends SerializationConfig implements
     public void setGlobalDebug(int globalDebug) {
         this.globaldebug = globalDebug;
         Logging.setDebugLevel(globalDebug);
-        Bukkit.getPluginManager().callEvent(new MVDebugModeEvent(globalDebug));
     }
 
     /**

src/main/java/com/onarandombox/MultiverseCore/api/MultiverseWorld.java

@@ -475,7 +475,7 @@ public interface MultiverseWorld {
     /**
      * Sets the price for entry to this world.
      * You can think of this like an amount.
-     * The type can be set with {@link #setCurrency(Material)}
+     * The type can be set with {@link #setCurrency(int)}
      *
      * @param price The Amount of money/item to enter the world.
      */

src/main/java/com/onarandombox/MultiverseCore/commands/DeleteCommand.java

@@ -33,13 +33,9 @@ public class DeleteCommand extends MultiverseCommand {
 
     @Override
     public void runCommand(CommandSender sender, List<String> args) {
-        String worldName = args.get(0);
-
         Class<?>[] paramTypes = {String.class};
         List<Object> objectArgs = new ArrayList<Object>(args);
-        this.plugin.getCommandHandler()
-                   .queueCommand(sender, "mvdelete", "deleteWorld", objectArgs,
-                                 paramTypes, ChatColor.GREEN + "World '" + worldName + "' Deleted!",
-                                 ChatColor.RED + "World '" + worldName + "' could NOT be deleted!");
+        this.plugin.getCommandHandler().queueCommand(sender, "mvdelete", "deleteWorld", objectArgs,
+                paramTypes, ChatColor.GREEN + "World Deleted!", ChatColor.RED + "World could NOT be deleted!");
     }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/ImportCommand.java

@@ -57,7 +57,7 @@ public class ImportCommand extends MultiverseCommand {
             File[] files = worldFolder.listFiles(new FilenameFilter() {
                 @Override
                 public boolean accept(File file, String name) {
-                    return name.toLowerCase().endsWith(".dat");
+                    return name.equalsIgnoreCase("level.dat");
                 }
             });
             if (files != null && files.length > 0) {
@@ -147,25 +147,21 @@ public class ImportCommand extends MultiverseCommand {
             return;
         }
 
-        if (!worldFile.exists()) {
-            sender.sendMessage(ChatColor.RED + "FAILED.");
-            String worldList = this.getPotentialWorlds();
-            sender.sendMessage("That world folder does not exist. These look like worlds to me:");
-            sender.sendMessage(worldList);
-        } else if (!checkIfIsWorld(worldFile)) {
-            sender.sendMessage(ChatColor.RED + "FAILED.");
-            sender.sendMessage(String.format("'%s' does not appear to be a world. It is lacking a .dat file.",
-                                             worldName));
-        } else if (env == null) {
-            sender.sendMessage(ChatColor.RED + "FAILED.");
-            sender.sendMessage("That world environment did not exist.");
-            sender.sendMessage("For a list of available world types, type: " + ChatColor.AQUA + "/mvenv");
-        } else {
+        if (worldFile.exists() && env != null) {
             Command.broadcastCommandMessage(sender, String.format("Starting import of world '%s'...", worldName));
             if (this.worldManager.addWorld(worldName, environment, null, null, null, generator, useSpawnAdjust))
                 Command.broadcastCommandMessage(sender, ChatColor.GREEN + "Complete!");
             else
                 Command.broadcastCommandMessage(sender, ChatColor.RED + "Failed!");
+        } else if (env == null) {
+            sender.sendMessage(ChatColor.RED + "FAILED.");
+            sender.sendMessage("That world environment did not exist.");
+            sender.sendMessage("For a list of available world types, type: " + ChatColor.AQUA + "/mvenv");
+        } else {
+            sender.sendMessage(ChatColor.RED + "FAILED.");
+            String worldList = this.getPotentialWorlds();
+            sender.sendMessage("That world folder does not exist. These look like worlds to me:");
+            sender.sendMessage(worldList);
         }
     }
 }

src/main/java/com/onarandombox/MultiverseCore/commands/VersionCommand.java

@@ -16,15 +16,12 @@ import com.onarandombox.MultiverseCore.utils.webpaste.PasteService;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceFactory;
 import com.onarandombox.MultiverseCore.utils.webpaste.PasteServiceType;
 import com.onarandombox.MultiverseCore.utils.webpaste.URLShortener;
-import com.pneumaticraft.commandhandler.CommandHandler;
-import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.scheduler.BukkitRunnable;
-import org.bukkit.util.StringUtil;
 
 import java.io.*;
 import java.util.HashMap;
@@ -40,8 +37,8 @@ public class VersionCommand extends MultiverseCommand {
     public VersionCommand(MultiverseCore plugin) {
         super(plugin);
         this.setName("Multiverse Version");
-        this.setCommandUsage("/mv version " + ChatColor.GOLD + "-[bh] [--include-plugin-list]");
-        this.setArgRange(0, 2);
+        this.setCommandUsage("/mv version " + ChatColor.GOLD + "-[bh]");
+        this.setArgRange(0, 1);
         this.addKey("mv version");
         this.addKey("mvv");
         this.addKey("mvversion");
@@ -152,31 +149,22 @@ public class VersionCommand extends MultiverseCommand {
         final Map<String, String> files = this.getVersionFiles();
         this.plugin.getServer().getPluginManager().callEvent(versionEvent);
 
-        String versionInfo = versionEvent.getVersionInfo();
-
-        if (CommandHandler.hasFlag("--include-plugin-list", args)) {
-            versionInfo = versionInfo + "\nPlugins: " + getPluginList();
-        }
-
-        final String data = versionInfo;
-
         // log to console
+        final String data = versionEvent.getVersionInfo();
         String[] lines = data.split("\n");
         for (String line : lines) {
-            if (!line.isEmpty()) {
-                Logging.info(line);
-            }
+            Logging.info(line);
         }
 
         BukkitRunnable logPoster = new BukkitRunnable() {
             @Override
             public void run() {
-                if (args.size() > 0) {
+                if (args.size() == 1) {
                     String pasteUrl;
-                    if (CommandHandler.hasFlag("-b", args)) {
+                    if (args.get(0).equalsIgnoreCase("-b")) {
                         // private post to pastebin
                         pasteUrl = postToService(PasteServiceType.PASTEBIN, true, data, files);
-                    } else if (CommandHandler.hasFlag("-h", args)) {
+                    } else if (args.get(0).equalsIgnoreCase("-h")) {
                         // private post to pastebin
                         pasteUrl = postToService(PasteServiceType.HASTEBIN, true, data, files);
                     } else {
@@ -220,8 +208,4 @@ public class VersionCommand extends MultiverseCommand {
             return "Error posting to service";
         }
     }
-
-    private String getPluginList() {
-        return StringUtils.join(plugin.getServer().getPluginManager().getPlugins(), ", ");
-    }
 }

src/main/java/com/onarandombox/MultiverseCore/event/MVDebugModeEvent.java

@@ -1,43 +0,0 @@
-package com.onarandombox.MultiverseCore.event;
-
-import org.bukkit.event.Event;
-import org.bukkit.event.HandlerList;
-
-/**
- * Called when Core's debug level is changed.
- */
-public class MVDebugModeEvent extends Event {
-
-    private static final HandlerList HANDLERS = new HandlerList();
-
-    private final int level;
-
-    public MVDebugModeEvent(int level) {
-        this.level = level;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public HandlerList getHandlers() {
-        return HANDLERS;
-    }
-
-    /**
-     * Gets the handler list. This is required by the event system.
-     * @return A list of HANDLERS.
-     */
-    public static HandlerList getHandlerList() {
-        return HANDLERS;
-    }
-
-    /**
-     * Returns the current debug level of Core.
-     *
-     * @return the current debug level of Core.
-     */
-    public int getLevel() {
-        return level;
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/listeners/MVMapListener.java

@@ -29,7 +29,7 @@ public class MVMapListener implements Listener {
     public void mapInitialize(final MapInitializeEvent event) {
         for (final Player player : Bukkit.getOnlinePlayers()) {
             if ((player.getItemInHand().getType() == Material.MAP
-                    || player.getItemInHand().getType() == Material.EMPTY_MAP)
+                    || player.getItemInHand().getType() == Material.FILLED_MAP)
                     && player.getItemInHand().getDurability() == event.getMap().getId()) {
                 final Location playerLoc = player.getLocation();
                 final MapView map = event.getMap();

src/main/java/com/onarandombox/MultiverseCore/listeners/MVPlayerListener.java

@@ -7,10 +7,6 @@
 
 package com.onarandombox.MultiverseCore.listeners;
 
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.logging.Level;
-
 import com.dumptruckman.minecraft.util.Logging;
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVWorldManager;
@@ -33,6 +29,10 @@ import org.bukkit.event.player.PlayerQuitEvent;
 import org.bukkit.event.player.PlayerRespawnEvent;
 import org.bukkit.event.player.PlayerTeleportEvent;
 
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.logging.Level;
+
 /**
  * Multiverse's {@link Listener} for players.
  */
@@ -252,7 +252,7 @@ public class MVPlayerListener implements Listener {
 
         // REMEMBER! getTo MAY be NULL HERE!!!
         // If the player was actually outside of the portal, adjust the from location
-        if (event.getFrom().getWorld().getBlockAt(event.getFrom()).getType() != Material.PORTAL) {
+        if (event.getFrom().getWorld().getBlockAt(event.getFrom()).getType() != Material.NETHER_PORTAL) {
             Location newloc = this.plugin.getSafeTTeleporter().findPortalBlockNextTo(event.getFrom());
             // TODO: Fix this. Currently, we only check for PORTAL blocks. I'll have to figure out what
             // TODO: we want to do here.
@@ -304,16 +304,8 @@ public class MVPlayerListener implements Listener {
                     + "' was allowed to go to '" + event.getTo().getWorld().getName()
                     + "' because enforceaccess is off.");
         }
-        if (!plugin.getMVConfig().isUsingDefaultPortalSearch()) {
-            try {
-                Class.forName("org.bukkit.TravelAgent");
-                if (event.getPortalTravelAgent() != null) {
-                    event.getPortalTravelAgent().setSearchRadius(plugin.getMVConfig().getPortalSearchRadius());
-                }
-            } catch (ClassNotFoundException ignore) {
-                plugin.log(Level.FINE, "TravelAgent not available for PlayerPortalEvent for " + event.getPlayer().getName());
-            }
-
+        if (!plugin.getMVConfig().isUsingDefaultPortalSearch() && event.getPortalTravelAgent() != null) {
+            event.getPortalTravelAgent().setSearchRadius(plugin.getMVConfig().getPortalSearchRadius());
         }
     }
 

src/main/java/com/onarandombox/MultiverseCore/listeners/MVPortalListener.java

@@ -71,10 +71,10 @@ public class MVPortalListener implements Listener {
         if (event.getAction() != Action.RIGHT_CLICK_BLOCK) {
             return;
         }
-        if (event.getClickedBlock().getType() != Material.ENDER_PORTAL_FRAME) {
+        if (event.getClickedBlock().getType() != Material.END_PORTAL_FRAME) {
             return;
         }
-        if (event.getItem() == null || event.getItem().getType() != Material.EYE_OF_ENDER) {
+        if (event.getItem() == null || event.getItem().getType() != Material.ENDER_EYE) {
             return;
         }
         MultiverseWorld world = this.plugin.getMVWorldManager().getMVWorld(event.getPlayer().getWorld());

src/main/java/com/onarandombox/MultiverseCore/utils/BukkitTravelAgent.java

@@ -1,110 +0,0 @@
-package com.onarandombox.MultiverseCore.utils;
-
-import java.util.logging.Level;
-
-import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
-import com.onarandombox.MultiverseCore.destination.CannonDestination;
-import org.bukkit.Location;
-import org.bukkit.TravelAgent;
-import org.bukkit.event.player.PlayerPortalEvent;
-
-public class BukkitTravelAgent implements TravelAgent {
-    private final MVTravelAgent agent;
-
-    public BukkitTravelAgent(MVTravelAgent agent) {
-        this.agent = agent;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public BukkitTravelAgent setSearchRadius(int radius) {
-        return this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getSearchRadius() {
-        return 0;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public BukkitTravelAgent setCreationRadius(int radius) {
-        return this;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public int getCreationRadius() {
-        return 0;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean getCanCreatePortal() {
-        return false;
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public void setCanCreatePortal(boolean create) {
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Location findOrCreate(Location location) {
-        return this.getSafeLocation();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public Location findPortal(Location location) {
-        return this.getSafeLocation();
-    }
-
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public boolean createPortal(Location location) {
-        return false;
-    }
-
-    private Location getSafeLocation() {
-        // At this time, these can never use the velocity.
-        if (agent.destination instanceof CannonDestination) {
-            agent.core.log(Level.FINE, "Using Stock TP method. This cannon will have 0 velocity");
-        }
-        SafeTTeleporter teleporter = agent.core.getSafeTTeleporter();
-        Location newLoc = agent.destination.getLocation(agent.player);
-        if (agent.destination.useSafeTeleporter()) {
-            newLoc = teleporter.getSafeLocation(agent.player, agent.destination);
-        }
-        if (newLoc == null) {
-            return agent.player.getLocation();
-        }
-        return newLoc;
-
-    }
-
-    public void setPortalEventTravelAgent(PlayerPortalEvent event) {
-        event.setPortalTravelAgent(this);
-        event.useTravelAgent(true);
-    }
-}

src/main/java/com/onarandombox/MultiverseCore/utils/FileUtils.java

@@ -7,22 +7,16 @@
 
 package com.onarandombox.MultiverseCore.utils;
 
-import static java.nio.file.StandardCopyOption.COPY_ATTRIBUTES;
+import com.dumptruckman.minecraft.util.Logging;
 
 import java.io.File;
 import java.io.IOException;
-import java.nio.file.FileVisitResult;
 import java.nio.file.Files;
 import java.nio.file.Path;
-import java.nio.file.SimpleFileVisitor;
-import java.nio.file.attribute.BasicFileAttributes;
 import java.util.Comparator;
-import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.stream.Stream;
 
-import com.dumptruckman.minecraft.util.Logging;
-
 /**
  * File-utilities.
  */
@@ -75,42 +69,20 @@ public class FileUtils {
      * @return if it had success
      */
     public static boolean copyFolder(File source, File target, Logger log) {
-        Path sourceDir = source.toPath();
-        Path targetDir = target.toPath();
-
-        try {
-            Files.walkFileTree(sourceDir, new CopyDirFileVisitor(sourceDir, targetDir));
+        Path sourcePath = source.toPath();
+        Path destPath = target.toPath();
+        try (Stream<Path> files = Files.walk(source.toPath())) {
+            files.forEachOrdered(src -> {
+                try {
+                    Files.copy(src, sourcePath.resolve(destPath.relativize(src)));
+                } catch (IOException e) {
+                    log.warning(e.getMessage());
+                }
+            });
             return true;
         } catch (IOException e) {
-            log.log(Level.WARNING, "Unable to copy directory", e);
+            log.warning(e.getMessage());
             return false;
         }
     }
-
-    private static class CopyDirFileVisitor extends SimpleFileVisitor<Path> {
-
-        private final Path sourceDir;
-        private final Path targetDir;
-
-        private CopyDirFileVisitor(Path sourceDir, Path targetDir) {
-            this.sourceDir = sourceDir;
-            this.targetDir = targetDir;
-        }
-
-        @Override
-        public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs) throws IOException {
-            Path newDir = targetDir.resolve(sourceDir.relativize(dir));
-            if (!Files.isDirectory(newDir)) {
-                Files.createDirectory(newDir);
-            }
-            return FileVisitResult.CONTINUE;
-        }
-
-        @Override
-        public FileVisitResult visitFile(Path file, BasicFileAttributes attrs) throws IOException {
-            Path targetFile = targetDir.resolve(sourceDir.relativize(file));
-            Files.copy(file, targetFile, COPY_ATTRIBUTES);
-            return FileVisitResult.CONTINUE;
-        }
-    }
 }

src/main/java/com/onarandombox/MultiverseCore/utils/MVTravelAgent.java

@@ -9,19 +9,114 @@ package com.onarandombox.MultiverseCore.utils;
 
 import com.onarandombox.MultiverseCore.MultiverseCore;
 import com.onarandombox.MultiverseCore.api.MVDestination;
+import com.onarandombox.MultiverseCore.api.SafeTTeleporter;
+import com.onarandombox.MultiverseCore.destination.CannonDestination;
+import org.bukkit.Location;
+import org.bukkit.TravelAgent;
 import org.bukkit.entity.Player;
 
+import java.util.logging.Level;
+
 /**
- * The Multiverse TravelAgent.
+ * The Multiverse-{@link TravelAgent}.
  */
-public class MVTravelAgent {
-    protected MVDestination destination;
-    protected MultiverseCore core;
-    protected Player player;
+public class MVTravelAgent implements TravelAgent {
+    private MVDestination destination;
+    private MultiverseCore core;
+    private Player player;
 
     public MVTravelAgent(MultiverseCore multiverseCore, MVDestination d, Player p) {
         this.destination = d;
         this.core = multiverseCore;
         this.player = p;
     }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public TravelAgent setSearchRadius(int radius) {
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getSearchRadius() {
+        return 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public TravelAgent setCreationRadius(int radius) {
+        return this;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public int getCreationRadius() {
+        return 0;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean getCanCreatePortal() {
+        return false;
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public void setCanCreatePortal(boolean create) {
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Location findOrCreate(Location location) {
+        return this.getSafeLocation();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public Location findPortal(Location location) {
+        return this.getSafeLocation();
+    }
+
+    /**
+     * {@inheritDoc}
+     */
+    @Override
+    public boolean createPortal(Location location) {
+        return false;
+    }
+
+    private Location getSafeLocation() {
+        // At this time, these can never use the velocity.
+        if (this.destination instanceof CannonDestination) {
+            this.core.log(Level.FINE, "Using Stock TP method. This cannon will have 0 velocity");
+        }
+        SafeTTeleporter teleporter = this.core.getSafeTTeleporter();
+        Location newLoc = this.destination.getLocation(this.player);
+        if (this.destination.useSafeTeleporter()) {
+            newLoc = teleporter.getSafeLocation(this.player, this.destination);
+        }
+        if (newLoc == null) {
+            return this.player.getLocation();
+        }
+        return newLoc;
+
+    }
+
 }

src/main/java/com/onarandombox/MultiverseCore/utils/SimpleBlockSafety.java

@@ -14,9 +14,10 @@ import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.World;
 import org.bukkit.block.BlockFace;
+import org.bukkit.block.data.BlockData;
+import org.bukkit.block.data.type.Bed;
 import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Vehicle;
-import org.bukkit.material.Bed;
 
 import java.util.EnumSet;
 import java.util.Iterator;
@@ -151,12 +152,13 @@ public class SimpleBlockSafety implements BlockSafety {
      * @return The location of the other bed piece, or null if it was a jacked up bed.
      */
     private Location findOtherBedPiece(Location checkLoc) {
-        if (checkLoc.getBlock().getType() != Material.BED_BLOCK) {
+        BlockData data = checkLoc.getBlock().getBlockData();
+        if (!(data instanceof Bed)) {
             return null;
         }
-        // Construct a bed object at this location
-        final Bed b = new Bed(Material.BED_BLOCK, checkLoc.getBlock().getData());
-        if (b.isHeadOfBed()) {
+        Bed b = (Bed) data;
+
+        if (b.getPart() == Bed.Part.HEAD) {
             return checkLoc.getBlock().getRelative(b.getFacing().getOppositeFace()).getLocation();
         }
         // We shouldn't ever be looking at the foot, but here's the code for it.
@@ -209,7 +211,10 @@ public class SimpleBlockSafety implements BlockSafety {
     @Override
     public boolean isEntitiyOnTrack(Location l) {
         Material currentBlock = l.getBlock().getType();
-        return (currentBlock == Material.POWERED_RAIL || currentBlock == Material.DETECTOR_RAIL || currentBlock == Material.RAILS);
+        return (currentBlock == Material.POWERED_RAIL
+                || currentBlock == Material.DETECTOR_RAIL
+                || currentBlock == Material.RAIL
+                || currentBlock == Material.ACTIVATOR_RAIL);
     }
 
     /**

src/main/java/com/onarandombox/MultiverseCore/utils/SimpleSafeTTeleporter.java

@@ -292,19 +292,19 @@ public class SimpleSafeTTeleporter implements SafeTTeleporter {
     public Location findPortalBlockNextTo(Location l) {
         Block b = l.getWorld().getBlockAt(l);
         Location foundLocation = null;
-        if (b.getType() == Material.PORTAL) {
+        if (b.getType() == Material.NETHER_PORTAL) {
             return l;
         }
-        if (b.getRelative(BlockFace.NORTH).getType() == Material.PORTAL) {
+        if (b.getRelative(BlockFace.NORTH).getType() == Material.NETHER_PORTAL) {
             foundLocation = getCloserBlock(l, b.getRelative(BlockFace.NORTH).getLocation(), foundLocation);
         }
-        if (b.getRelative(BlockFace.SOUTH).getType() == Material.PORTAL) {
+        if (b.getRelative(BlockFace.SOUTH).getType() == Material.NETHER_PORTAL) {
             foundLocation = getCloserBlock(l, b.getRelative(BlockFace.SOUTH).getLocation(), foundLocation);
         }
-        if (b.getRelative(BlockFace.EAST).getType() == Material.PORTAL) {
+        if (b.getRelative(BlockFace.EAST).getType() == Material.NETHER_PORTAL) {
             foundLocation = getCloserBlock(l, b.getRelative(BlockFace.EAST).getLocation(), foundLocation);
         }
-        if (b.getRelative(BlockFace.WEST).getType() == Material.PORTAL) {
+        if (b.getRelative(BlockFace.WEST).getType() == Material.NETHER_PORTAL) {
             foundLocation = getCloserBlock(l, b.getRelative(BlockFace.WEST).getLocation(), foundLocation);
         }
         return foundLocation;

src/main/resources/plugin.yml

@@ -2,6 +2,7 @@ name: Multiverse-Core
 main: com.onarandombox.MultiverseCore.MultiverseCore
 authors: ['Rigby', 'fernferret', 'lithium3141', 'main--', 'dumptruckman']
 website: 'https://dev.bukkit.org/projects/multiverse-core'
+api-version: 1.13
 version: maven-version-number
 commands:
   mv:
@@ -232,4 +233,4 @@ commands:
   mvrules:
     description: Lists the gamerules.
     usage: |
-            /<command> [WORLD]
+            /<command> [WORLD]

src/test/java/com/onarandombox/MultiverseCore/TestWorldProperties.java

@@ -11,7 +11,6 @@ import com.onarandombox.MultiverseCore.api.MVWorldManager;
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.configuration.SpawnLocation;
 import com.onarandombox.MultiverseCore.listeners.MVAsyncPlayerChatListener;
-import com.onarandombox.MultiverseCore.utils.MockWorldFactory;
 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import com.onarandombox.MultiverseCore.utils.WorldManager;
 import org.bukkit.Bukkit;
@@ -91,8 +90,6 @@ public class TestWorldProperties {
         assertTrue(creator.setUp());
         core = creator.getCore();
         mockCommandSender = creator.getCommandSender();
-        MockWorldFactory.createWorldDirectory("world");
-        MockWorldFactory.createWorldDirectory("world_nether");
     }
 
     @After

src/test/java/com/onarandombox/MultiverseCore/TestWorldStuff.java

@@ -9,7 +9,6 @@ package com.onarandombox.MultiverseCore;
 
 import com.onarandombox.MultiverseCore.api.MultiverseWorld;
 import com.onarandombox.MultiverseCore.exceptions.PropertyDoesNotExistException;
-import com.onarandombox.MultiverseCore.utils.MockWorldFactory;
 import com.onarandombox.MultiverseCore.utils.TestInstanceCreator;
 import com.onarandombox.MultiverseCore.utils.WorldCreatorMatcher;
 import com.onarandombox.MultiverseCore.utils.WorldManager;
@@ -100,10 +99,6 @@ public class TestWorldStuff {
 
     @Test
     public void testWorldImport() {
-        MockWorldFactory.createWorldDirectory("world");
-        MockWorldFactory.createWorldDirectory("world_nether");
-        MockWorldFactory.createWorldDirectory("world_the_end");
-
         // Pull a core instance from the server.
         Plugin plugin = mockServer.getPluginManager().getPlugin("Multiverse-Core");
 
@@ -287,9 +282,6 @@ public class TestWorldStuff {
     }
 
     private void createInitialWorlds(Plugin plugin, Command command) {
-        MockWorldFactory.createWorldDirectory("world");
-        MockWorldFactory.createWorldDirectory("world_nether");
-        MockWorldFactory.createWorldDirectory("world_the_end");
         plugin.onCommand(mockCommandSender, command, "", new String[]{ "import", "world", "normal" });
         plugin.onCommand(mockCommandSender, command, "", new String[]{ "import", "world_nether", "nether" });
         plugin.onCommand(mockCommandSender, command, "", new String[]{ "import", "world_the_end", "end" });

src/test/java/com/onarandombox/MultiverseCore/utils/FileUtilsTest.java

@@ -1,48 +1,54 @@
 package com.onarandombox.MultiverseCore.utils;
 
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.nio.file.Files;
-import java.nio.file.Path;
-
 import com.dumptruckman.minecraft.util.Logging;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+
+import static org.junit.Assert.*;
+
 public class FileUtilsTest {
 
-    private Path tempDir;
-    private Path parentDir;
-    private Path parentDirFile;
-    private Path childDir;
-    private Path childDirFile;
-
+    private File parentDir;
+    private File parentDirFile;
+    private File childDir;
+    private File childDirFile;
+    private File dest;
 
     @Before
     public void setUp() throws Exception {
-        tempDir = Files.createTempDirectory("testingTempDir");
+        parentDir = Files.createTempDirectory("parentDir").toFile();
+        parentDirFile = new File(parentDir, "parentDirFile.txt");
+        parentDirFile.createNewFile();
+        childDir = Files.createTempDirectory(parentDir.toPath(), "childDir").toFile();
+        childDirFile = new File(childDir, "childDirFile.txt");
+        childDirFile.createNewFile();
+        dest = Files.createTempDirectory("dest").toFile();
 
-        parentDir = Files.createDirectory(tempDir.resolve("parentDir"));
-        parentDirFile = Files.createFile(parentDir.resolve("parentDirFile.txt"));
-
-        childDir = Files.createDirectory(parentDir.resolve("childDir"));
-        childDirFile = Files.createFile(childDir.resolve("childDirFile.txt"));
-
-        assertTrue(Files.isDirectory(parentDir));
-        assertTrue(Files.isRegularFile(parentDirFile));
-        assertTrue(Files.isDirectory(childDir));
-        assertTrue(Files.isRegularFile(childDirFile));
+        assertTrue(parentDir.exists());
+        assertTrue(parentDirFile.exists());
+        assertTrue(childDir.exists());
+        assertTrue(childDirFile.exists());
+        assertTrue(dest.exists());
     }
 
     @After
     public void tearDown() throws Exception {
         try {
-            org.apache.commons.io.FileUtils.deleteDirectory(tempDir.toFile());
+            org.apache.commons.io.FileUtils.deleteDirectory(parentDir);
         } catch (IOException e) {
-            if (Files.exists(tempDir)) {
+            if (parentDir.exists()) {
+                throw e;
+            }
+        }
+        try {
+            org.apache.commons.io.FileUtils.deleteDirectory(dest);
+        } catch (IOException e) {
+            if (parentDir.exists()) {
                 throw e;
             }
         }
@@ -50,70 +56,30 @@ public class FileUtilsTest {
 
     @Test
     public void deleteFolder() {
-        FileUtils.deleteFolder(parentDir.toFile());
-        assertFalse(Files.isDirectory(parentDir));
-        assertFalse(Files.isRegularFile(parentDirFile));
-        assertFalse(Files.isDirectory(childDir));
-        assertFalse(Files.isRegularFile(childDirFile));
+        FileUtils.deleteFolder(parentDir);
+        assertFalse(parentDir.exists());
+        assertFalse(parentDirFile.exists());
+        assertFalse(childDir.exists());
+        assertFalse(childDirFile.exists());
     }
 
     @Test
     public void deleteFolderContents() {
-        FileUtils.deleteFolderContents(parentDir.toFile());
-        assertTrue(Files.isDirectory(parentDir));
-        assertFalse(Files.isRegularFile(parentDirFile));
-        assertFalse(Files.isDirectory(childDir));
-        assertFalse(Files.isRegularFile(childDirFile));
+        FileUtils.deleteFolderContents(parentDir);
+        assertTrue(parentDir.exists());
+        assertFalse(parentDirFile.exists());
+        assertFalse(childDir.exists());
+        assertFalse(childDirFile.exists());
     }
 
     @Test
-    public void copyFolder() throws Exception {
-        Path targetDir = tempDir.resolve("target");
-        Path targetFile = targetDir.resolve("parentDirFile.txt");
-        Path targetChildDir = targetDir.resolve("childDir");
-        Path targetChildDirFile = targetChildDir.resolve("childDirFile.txt");
-
-        assertFalse(Files.isDirectory(targetDir));
-        assertFalse(Files.isRegularFile(targetFile));
-        assertFalse(Files.isDirectory(targetChildDir));
-        assertFalse(Files.isRegularFile(targetChildDirFile));
-
-        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), Logging.getLogger()));
-
-        assertTrue(Files.isDirectory(targetDir));
-        assertTrue(Files.isRegularFile(targetFile));
-        assertTrue(Files.isDirectory(targetChildDir));
-        assertTrue(Files.isRegularFile(targetChildDirFile));
+    public void copyFolder() {
+        File destFile = new File(dest, "parentDirFile.txt");
+        File destChildDir = new File(dest, "childDir");
+        File destChildDirFile = new File(destChildDir, "childDirFile.txt");
+        assertFalse(destFile.exists());
+        assertFalse(destChildDir.exists());
+        assertFalse(destChildDirFile.exists());
+        FileUtils.copyFolder(parentDir, dest, Logging.getLogger());
     }
-
-    @Test
-    public void copyFolder_intoExistingFolder() throws Exception {
-        Path targetDir = Files.createDirectory(tempDir.resolve("target"));
-        Path targetFile = targetDir.resolve("parentDirFile.txt");
-        Path targetChildDir = targetDir.resolve("childDir");
-        Path targetChildDirFile = targetChildDir.resolve("childDirFile.txt");
-
-        assertTrue(Files.isDirectory(targetDir));
-        assertFalse(Files.isRegularFile(targetFile));
-        assertFalse(Files.isDirectory(targetChildDir));
-        assertFalse(Files.isRegularFile(targetChildDirFile));
-
-        assertTrue(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), Logging.getLogger()));
-
-        assertTrue(Files.isDirectory(targetDir));
-        assertTrue(Files.isRegularFile(targetFile));
-        assertTrue(Files.isDirectory(targetChildDir));
-        assertTrue(Files.isRegularFile(targetChildDirFile));
-    }
-
-    @Test()
-    public void copyFolder_intoExistingFolder_whereFileExists() throws Exception {
-        Path targetDir = Files.createDirectory(tempDir.resolve("target"));
-        Path targetFile = Files.createFile(targetDir.resolve("parentDirFile.txt"));
-
-        assertTrue(Files.isDirectory(targetDir));
-        assertTrue(Files.isRegularFile(targetFile));
-
-        assertFalse(FileUtils.copyFolder(parentDir.toFile(), targetDir.toFile(), Logging.getLogger()));
-    }
-}
+}

src/test/java/com/onarandombox/MultiverseCore/utils/MockWorldFactory.java

@@ -18,7 +18,6 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
 
 import java.io.File;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -44,17 +43,7 @@ public class MockWorldFactory {
     private static void registerWorld(World world) {
         createdWorlds.put(world.getName(), world);
         worldUIDS.put(world.getUID(), world);
-        createWorldDirectory(world.getName());
-    }
-
-    public static void createWorldDirectory(String worldName) {
-        File worldFolder = new File(TestInstanceCreator.worldsDirectory, worldName);
-        worldFolder.mkdir();
-        try {
-            new File(worldFolder, "level.dat").createNewFile();
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
+        new File(TestInstanceCreator.worldsDirectory, world.getName()).mkdir();
     }
 
     private static World basics(String world, World.Environment env, WorldType type) {