Fix imports

src/main/java/org/mvplugins/multiverse/core/api/SafeTTeleporter.java

@@ -1,89 +0,0 @@
-package org.mvplugins.multiverse.core.api;
-
-import java.util.concurrent.CompletableFuture;
-
-import co.aikar.commands.BukkitCommandIssuer;
-import org.bukkit.Location;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Entity;
-import org.jvnet.hk2.annotations.Contract;
-
-import org.mvplugins.multiverse.core.destination.ParsedDestination;
-import org.mvplugins.multiverse.core.teleportation.TeleportResult;
-
-/**
- * Used to safely teleport people.
- */
-@Deprecated
-@Contract
-public interface SafeTTeleporter extends Teleporter {
-
-    /**
-     * Gets the next safe location around the given location.
-     * @param l A {@link Location}.
-     * @return A safe {@link Location}.
-     */
-    Location getSafeLocation(Location l);
-
-    /**
-     * Gets the next safe location around the given location.
-     * @param l A {@link Location}.
-     * @param tolerance The tolerance.
-     * @param radius The radius.
-     * @return A safe {@link Location}.
-     */
-    Location getSafeLocation(Location l, int tolerance, int radius);
-
-    /**
-     * Safely teleport the entity to the MVDestination. This will perform checks to see if the place is safe, and if
-     * it's not, will adjust the final destination accordingly.
-     *
-     * @param teleporter    Person who performed the teleport command.
-     * @param teleportee    Entity to teleport
-     * @param destination   Destination to teleport them to
-     * @return true for success, false for failure
-     */
-    @Deprecated
-    TeleportResult safelyTeleport(BukkitCommandIssuer teleporter, Entity teleportee, ParsedDestination<?> destination);
-
-    /**
-     * Safely teleport the entity to the MVDestination. This will perform checks to see if the place is safe, and if
-     * it's not, will adjust the final destination accordingly.
-     *
-     * @param teleporter    Person who performed the teleport command.
-     * @param teleportee    Entity to teleport
-     * @param destination   Destination to teleport them to
-     * @return true for success, false for failure
-     */
-    CompletableFuture<TeleportResult> safelyTeleportAsync(BukkitCommandIssuer teleporter, Entity teleportee, ParsedDestination<?> destination);
-
-    /**
-     * Safely teleport the entity to the Location. This may perform checks to
-     * see if the place is safe, and if
-     * it's not, will adjust the final destination accordingly.
-     *
-     * @param teleporter Person who issued the teleport command.
-     * @param teleportee Entity to teleport.
-     * @param location   Location to teleport them to.
-     * @param safely     Should the destination be checked for safety before teleport?
-     * @return true for success, false for failure.
-     */
-    TeleportResult safelyTeleport(CommandSender teleporter, Entity teleportee, Location location,
-            boolean safely);
-
-    /**
-     * Returns a safe location for the entity to spawn at.
-     *
-     * @param entity        The entity to spawn
-     * @param destination   The MVDestination to take the entity to.
-     * @return A new location to spawn the entity at.
-     */
-    Location getSafeLocation(Entity entity, DestinationInstance destination);
-
-    /**
-     * Finds a portal-block next to the specified {@link Location}.
-     * @param l The {@link Location}
-     * @return The next portal-block's {@link Location}.
-     */
-    Location findPortalBlockNextTo(Location l);
-}

src/main/java/org/mvplugins/multiverse/core/api/Teleporter.java

@@ -1,35 +0,0 @@
-package org.mvplugins.multiverse.core.api;
-
-import java.util.concurrent.CompletableFuture;
-
-import co.aikar.commands.BukkitCommandIssuer;
-import org.bukkit.entity.Entity;
-import org.jvnet.hk2.annotations.Contract;
-
-import org.mvplugins.multiverse.core.destination.ParsedDestination;
-import org.mvplugins.multiverse.core.teleportation.TeleportResult;
-
-@Deprecated
-@Contract
-public interface Teleporter {
-    /**
-     * Teleport the entity to the Multiverse Destination.
-     *
-     * @param teleporter    Person who performed the teleport command.
-     * @param teleportee    Entity to teleport
-     * @param destination   Destination to teleport them to
-     * @return true for success, false for failure
-     */
-    @Deprecated
-    TeleportResult teleport(BukkitCommandIssuer teleporter, Entity teleportee, ParsedDestination<?> destination);
-
-    /**
-     * Teleport the entity to the Multiverse Destination.
-     *
-     * @param teleporter    Person who performed the teleport command.
-     * @param teleportee    Entity to teleport
-     * @param destination   Destination to teleport them to
-     * @return true for success, false for failure
-     */
-    CompletableFuture<TeleportResult> teleportAsync(BukkitCommandIssuer teleporter, Entity teleportee, ParsedDestination<?> destination);
-}

src/main/java/org/mvplugins/multiverse/core/commands/DeleteCommand.java

@@ -24,7 +24,9 @@ import org.mvplugins.multiverse.core.commandtools.flags.CommandFlag;
 import org.mvplugins.multiverse.core.commandtools.flags.ParsedCommandFlags;
 import org.mvplugins.multiverse.core.commandtools.queue.QueuedCommand;
 import org.mvplugins.multiverse.core.utils.MVCorei18n;
+import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
 import org.mvplugins.multiverse.core.world.WorldManager;
+import org.mvplugins.multiverse.core.world.helpers.PlayerWorldTeleporter;
 
 @Service
 @CommandAlias("mv")

src/main/java/org/mvplugins/multiverse/core/commands/RegenCommand.java

@@ -29,6 +29,7 @@ import org.mvplugins.multiverse.core.commandtools.queue.QueuedCommand;
 import org.mvplugins.multiverse.core.utils.MVCorei18n;
 import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
 import org.mvplugins.multiverse.core.world.WorldManager;
+import org.mvplugins.multiverse.core.world.helpers.PlayerWorldTeleporter;
 import org.mvplugins.multiverse.core.world.options.RegenWorldOptions;
 
 @Service

src/main/java/org/mvplugins/multiverse/core/commands/RemoveCommand.java

@@ -23,6 +23,7 @@ import org.mvplugins.multiverse.core.commandtools.flags.CommandFlag;
 import org.mvplugins.multiverse.core.commandtools.flags.ParsedCommandFlags;
 import org.mvplugins.multiverse.core.utils.MVCorei18n;
 import org.mvplugins.multiverse.core.world.WorldManager;
+import org.mvplugins.multiverse.core.world.helpers.PlayerWorldTeleporter;
 
 @Service
 @CommandAlias("mv")

src/main/java/org/mvplugins/multiverse/core/commands/UnloadCommand.java

@@ -22,6 +22,7 @@ import org.mvplugins.multiverse.core.commandtools.flags.ParsedCommandFlags;
 import org.mvplugins.multiverse.core.utils.MVCorei18n;
 import org.mvplugins.multiverse.core.world.LoadedMultiverseWorld;
 import org.mvplugins.multiverse.core.world.WorldManager;
+import org.mvplugins.multiverse.core.world.helpers.PlayerWorldTeleporter;
 import org.mvplugins.multiverse.core.world.options.UnloadWorldOptions;
 
 @Service

src/main/java/org/mvplugins/multiverse/core/event/MVTeleportEvent.java

@@ -14,8 +14,8 @@ import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import org.mvplugins.multiverse.core.api.SafeTTeleporter;
 import org.mvplugins.multiverse.core.destination.ParsedDestination;
+import org.mvplugins.multiverse.core.teleportation.AsyncSafetyTeleporter;
 
 /**
  * Event that gets called when a player use the /mvtp command.
@@ -89,8 +89,8 @@ public class MVTeleportEvent extends Event implements Cancellable {
     }
 
     /**
-     * Looks if this {@link MVTeleportEvent} is using the {@link SafeTTeleporter}.
+     * Looks if this {@link MVTeleportEvent} is using the {@link AsyncSafetyTeleporter}.
-     * @return True if this {@link MVTeleportEvent} is using the {@link SafeTTeleporter}.
+     * @return True if this {@link MVTeleportEvent} is using the {@link AsyncSafetyTeleporter}.
      */
     public boolean isUsingSafeTTeleporter() {
         return useSafeTeleport;

src/main/java/org/mvplugins/multiverse/core/teleportation/TeleportResultOld.java

@@ -1,39 +0,0 @@
-/******************************************************************************
- * Multiverse 2 Copyright (c) the Multiverse Team 2011.                       *
- * Multiverse 2 is licensed under the BSD License.                            *
- * For more information please check the README.md file included              *
- * with this project.                                                         *
- ******************************************************************************/
-
-package org.mvplugins.multiverse.core.teleportation;
-
-/**
- * An enum containing possible teleport-results.
- */
-@Deprecated
-public enum TeleportResultOld {
-    /**
-     * Insufficient permissions.
-     */
-    FAIL_PERMISSION,
-    /**
-     * The teleport was unsafe.
-     */
-    FAIL_UNSAFE,
-    /**
-     * The player was to poor.
-     */
-    FAIL_TOO_POOR,
-    /**
-     * The teleport was invalid.
-     */
-    FAIL_INVALID,
-    /**
-     * Unknown reason.
-     */
-    FAIL_OTHER,
-    /**
-     * The player was successfully teleported.
-     */
-    SUCCESS
-}