all of it moved and that's all you need to know

Niestrat99 · Mar 20, 2021 · 0abffbe · 0abffbe
1 parent d6b8e71
commit 0abffbe
Show file tree

Hide file tree

Showing 104 changed files with 85 additions and 71 deletions.
diff --git a/AdvancedTP-Bukkit/AdvancedTP-Bukkit.iml b/AdvancedTP-Bukkit/AdvancedTP-Bukkit.iml
diff --git a/AdvancedTP-Bukkit/dependency-reduced-pom.xml → ...eleport-Bukkit/dependency-reduced-pom.xml b/AdvancedTP-Bukkit/dependency-reduced-pom.xml → ...eleport-Bukkit/dependency-reduced-pom.xml
@@ -3,7 +3,7 @@
   <parent>
     <artifactId>AdvancedTeleport</artifactId>
     <groupId>io.github.niestrat99</groupId>
-    <version>v5.4.6-SNAPSHOT-2</version>
+    <version>v5.4.6-SNAPSHOT-3</version>
   </parent>
   <modelVersion>4.0.0</modelVersion>
   <artifactId>AdvancedTP-Bukkit</artifactId>

diff --git a/AdvancedTP-Bukkit/pom.xml → AdvancedTeleport-Bukkit/pom.xml b/AdvancedTP-Bukkit/pom.xml → AdvancedTeleport-Bukkit/pom.xml
@@ -5,12 +5,12 @@
     <parent>
         <artifactId>AdvancedTeleport</artifactId>
         <groupId>io.github.niestrat99</groupId>
-        <version>v5.4.6-SNAPSHOT-2</version>
+        <version>v5.4.6-SNAPSHOT-3</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
 
-    <artifactId>AdvancedTP-Bukkit</artifactId>
+    <artifactId>AdvancedTeleport-Bukkit</artifactId>
 
 
 </project>
diff --git a/...iestrat99/advancedteleport/CoreClass.java → ...iestrat99/advancedteleport/CoreClass.java b/...iestrat99/advancedteleport/CoreClass.java → ...iestrat99/advancedteleport/CoreClass.java
diff --git a/.../niestrat99/advancedteleport/Metrics.java → .../niestrat99/advancedteleport/Metrics.java b/.../niestrat99/advancedteleport/Metrics.java → .../niestrat99/advancedteleport/Metrics.java
diff --git a/...rat99/advancedteleport/UpdateChecker.java → ...rat99/advancedteleport/UpdateChecker.java b/...rat99/advancedteleport/UpdateChecker.java → ...rat99/advancedteleport/UpdateChecker.java
diff --git a/...trat99/advancedteleport/api/ATPlayer.java → ...trat99/advancedteleport/api/ATPlayer.java b/...trat99/advancedteleport/api/ATPlayer.java → ...trat99/advancedteleport/api/ATPlayer.java
@@ -36,6 +36,10 @@ public class ATPlayer {
 
     private static final HashMap<String, ATPlayer> players = new HashMap<>();
 
+    /**
+     *
+     * @param player
+     */
     public ATPlayer(Player player) {
         this(player.getUniqueId(), player.getName());
     }
@@ -114,9 +118,10 @@ public void setTeleportationEnabled(boolean teleportationEnabled, SQLManager.SQL
      */
 
     /**
+     * Checks to see if this player has blocked a specified player.
      *
-     * @param otherPlayer
-     * @return
+     * @param otherPlayer The player that this one theoretically blocked.
+     * @return true is otherPlayer is blocked, false if otherwise.
      */
     public boolean hasBlocked(OfflinePlayer otherPlayer) {
         return blockedUsers.containsKey(otherPlayer.getUniqueId());

diff --git a/...trat99/advancedteleport/api/BackInfo.java → ...trat99/advancedteleport/api/BackInfo.java b/...trat99/advancedteleport/api/BackInfo.java → ...trat99/advancedteleport/api/BackInfo.java
diff --git a/...rat99/advancedteleport/api/BlockInfo.java → ...rat99/advancedteleport/api/BlockInfo.java b/...rat99/advancedteleport/api/BlockInfo.java → ...rat99/advancedteleport/api/BlockInfo.java
diff --git a/...niestrat99/advancedteleport/api/Home.java → ...niestrat99/advancedteleport/api/Home.java b/...niestrat99/advancedteleport/api/Home.java → ...niestrat99/advancedteleport/api/Home.java
diff --git a/...niestrat99/advancedteleport/api/Warp.java → ...niestrat99/advancedteleport/api/Warp.java b/...niestrat99/advancedteleport/api/Warp.java → ...niestrat99/advancedteleport/api/Warp.java
@@ -70,6 +70,7 @@ public static HashMap<String, Warp> getWarps() {
     }
 
     public void delete(SQLManager.SQLCallback<Boolean> callback) {
+        warps.remove(name);
         WarpSQLManager.get().removeWarp(name, callback);
     }
 }
diff --git a/...dteleport/api/events/ATTeleportEvent.java → ...dteleport/api/events/ATTeleportEvent.java b/...dteleport/api/events/ATTeleportEvent.java → ...dteleport/api/events/ATTeleportEvent.java
diff --git a/.../advancedteleport/commands/ATCommand.java → .../advancedteleport/commands/ATCommand.java b/.../advancedteleport/commands/ATCommand.java → .../advancedteleport/commands/ATCommand.java
diff --git a/...ncedteleport/commands/AsyncATCommand.java → ...ncedteleport/commands/AsyncATCommand.java b/...ncedteleport/commands/AsyncATCommand.java → ...ncedteleport/commands/AsyncATCommand.java
diff --git a/...t99/advancedteleport/commands/AtHelp.java → ...t99/advancedteleport/commands/AtHelp.java b/...t99/advancedteleport/commands/AtHelp.java → ...t99/advancedteleport/commands/AtHelp.java
diff --git a/...t99/advancedteleport/commands/AtInfo.java → ...t99/advancedteleport/commands/AtInfo.java b/...t99/advancedteleport/commands/AtInfo.java → ...t99/advancedteleport/commands/AtInfo.java
diff --git a/...9/advancedteleport/commands/AtReload.java → ...9/advancedteleport/commands/AtReload.java b/...9/advancedteleport/commands/AtReload.java → ...9/advancedteleport/commands/AtReload.java
diff --git a/...edteleport/commands/core/HelpCommand.java → ...edteleport/commands/core/HelpCommand.java b/...edteleport/commands/core/HelpCommand.java → ...edteleport/commands/core/HelpCommand.java
diff --git a/...edteleport/commands/core/InfoCommand.java → ...edteleport/commands/core/InfoCommand.java b/...edteleport/commands/core/InfoCommand.java → ...edteleport/commands/core/InfoCommand.java
diff --git a/...rt/commands/home/AbstractHomeCommand.java → ...rt/commands/home/AbstractHomeCommand.java b/...rt/commands/home/AbstractHomeCommand.java → ...rt/commands/home/AbstractHomeCommand.java
diff --git a/...vancedteleport/commands/home/DelHome.java → ...vancedteleport/commands/home/DelHome.java b/...vancedteleport/commands/home/DelHome.java → ...vancedteleport/commands/home/DelHome.java
diff --git a/...edteleport/commands/home/HomeCommand.java → ...edteleport/commands/home/HomeCommand.java b/...edteleport/commands/home/HomeCommand.java → ...edteleport/commands/home/HomeCommand.java
diff --git a/...dteleport/commands/home/HomesCommand.java → ...dteleport/commands/home/HomesCommand.java b/...dteleport/commands/home/HomesCommand.java → ...dteleport/commands/home/HomesCommand.java
diff --git a/...leport/commands/home/MoveHomeCommand.java → ...leport/commands/home/MoveHomeCommand.java b/...leport/commands/home/MoveHomeCommand.java → ...leport/commands/home/MoveHomeCommand.java
diff --git a/...eleport/commands/home/SetHomeCommand.java → ...eleport/commands/home/SetHomeCommand.java b/...eleport/commands/home/SetHomeCommand.java → ...eleport/commands/home/SetHomeCommand.java
diff --git a/...ort/commands/home/SetMainHomeCommand.java → ...ort/commands/home/SetMainHomeCommand.java b/...ort/commands/home/SetMainHomeCommand.java → ...ort/commands/home/SetMainHomeCommand.java
diff --git a/...ncedteleport/commands/spawn/SetSpawn.java → ...ncedteleport/commands/spawn/SetSpawn.java b/...ncedteleport/commands/spawn/SetSpawn.java → ...ncedteleport/commands/spawn/SetSpawn.java
diff --git a/...teleport/commands/spawn/SpawnCommand.java → ...teleport/commands/spawn/SpawnCommand.java b/...teleport/commands/spawn/SpawnCommand.java → ...teleport/commands/spawn/SpawnCommand.java
diff --git a/...ancedteleport/commands/teleport/Back.java → ...ancedteleport/commands/teleport/Back.java b/...ancedteleport/commands/teleport/Back.java → ...ancedteleport/commands/teleport/Back.java
diff --git a/...dteleport/commands/teleport/ToggleTP.java → ...dteleport/commands/teleport/ToggleTP.java b/...dteleport/commands/teleport/ToggleTP.java → ...dteleport/commands/teleport/ToggleTP.java
diff --git a/...ncedteleport/commands/teleport/TpAll.java → ...ncedteleport/commands/teleport/TpAll.java b/...ncedteleport/commands/teleport/TpAll.java → ...ncedteleport/commands/teleport/TpAll.java
diff --git a/...ort/commands/teleport/TpBlockCommand.java → ...ort/commands/teleport/TpBlockCommand.java b/...ort/commands/teleport/TpBlockCommand.java → ...ort/commands/teleport/TpBlockCommand.java
diff --git a/...dteleport/commands/teleport/TpCancel.java → ...dteleport/commands/teleport/TpCancel.java b/...dteleport/commands/teleport/TpCancel.java → ...dteleport/commands/teleport/TpCancel.java
diff --git a/...port/commands/teleport/TpHereOffline.java → ...port/commands/teleport/TpHereOffline.java b/...port/commands/teleport/TpHereOffline.java → ...port/commands/teleport/TpHereOffline.java
diff --git a/...cedteleport/commands/teleport/TpList.java → ...cedteleport/commands/teleport/TpList.java b/...cedteleport/commands/teleport/TpList.java → ...cedteleport/commands/teleport/TpList.java
diff --git a/...ncedteleport/commands/teleport/TpLoc.java → ...ncedteleport/commands/teleport/TpLoc.java b/...ncedteleport/commands/teleport/TpLoc.java → ...ncedteleport/commands/teleport/TpLoc.java
diff --git a/...ancedteleport/commands/teleport/TpNo.java → ...ancedteleport/commands/teleport/TpNo.java b/...ancedteleport/commands/teleport/TpNo.java → ...ancedteleport/commands/teleport/TpNo.java
diff --git a/...ncedteleport/commands/teleport/TpOff.java → ...ncedteleport/commands/teleport/TpOff.java b/...ncedteleport/commands/teleport/TpOff.java → ...ncedteleport/commands/teleport/TpOff.java
diff --git a/...teleport/commands/teleport/TpOffline.java → ...teleport/commands/teleport/TpOffline.java b/...teleport/commands/teleport/TpOffline.java → ...teleport/commands/teleport/TpOffline.java
diff --git a/...ancedteleport/commands/teleport/TpOn.java → ...ancedteleport/commands/teleport/TpOn.java b/...ancedteleport/commands/teleport/TpOn.java → ...ancedteleport/commands/teleport/TpOn.java
diff --git a/...teleport/commands/teleport/TpUnblock.java → ...teleport/commands/teleport/TpUnblock.java b/...teleport/commands/teleport/TpUnblock.java → ...teleport/commands/teleport/TpUnblock.java
diff --git a/...ncedteleport/commands/teleport/TpYes.java → ...ncedteleport/commands/teleport/TpYes.java b/...ncedteleport/commands/teleport/TpYes.java → ...ncedteleport/commands/teleport/TpYes.java
diff --git a/...vancedteleport/commands/teleport/Tpa.java → ...vancedteleport/commands/teleport/Tpa.java b/...vancedteleport/commands/teleport/Tpa.java → ...vancedteleport/commands/teleport/Tpa.java
@@ -58,7 +58,9 @@ public boolean onCommand(CommandSender sender, Command command, String label, St
                                 BukkitRunnable run = new BukkitRunnable() {
                                     @Override
                                     public void run() {
-                                        CustomMessages.sendMessage(sender, "Error.requestExpired", "{player}", target.getName());
+                                        if (NewConfig.get().NOTIFY_ON_EXPIRE.get()) {
+                                            CustomMessages.sendMessage(sender, "Error.requestExpired", "{player}", target.getName());
+                                        }
                                         TPRequest.removeRequest(TPRequest.getRequestByReqAndResponder(target, player));
                                     }
                                 };

diff --git a/...edteleport/commands/teleport/TpaHere.java → ...edteleport/commands/teleport/TpaHere.java b/...edteleport/commands/teleport/TpaHere.java → ...edteleport/commands/teleport/TpaHere.java
@@ -55,7 +55,9 @@ public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command
                                 BukkitRunnable run = new BukkitRunnable() {
                                     @Override
                                     public void run() {
-                                        CustomMessages.sendMessage(sender, "Error.requestExpired", "{player}", target.getName());
+                                        if (NewConfig.get().NOTIFY_ON_EXPIRE.get()) {
+                                            CustomMessages.sendMessage(sender, "Error.requestExpired", "{player}", target.getName());
+                                        }
                                         TPRequest.removeRequest(TPRequest.getRequestByReqAndResponder(target, player));
                                     }
                                 };

diff --git a/...vancedteleport/commands/teleport/Tpo.java → ...vancedteleport/commands/teleport/Tpo.java b/...vancedteleport/commands/teleport/Tpo.java → ...vancedteleport/commands/teleport/Tpo.java
diff --git a/...edteleport/commands/teleport/TpoHere.java → ...edteleport/commands/teleport/TpoHere.java b/...edteleport/commands/teleport/TpoHere.java → ...edteleport/commands/teleport/TpoHere.java
diff --git a/...vancedteleport/commands/teleport/Tpr.java → ...vancedteleport/commands/teleport/Tpr.java b/...vancedteleport/commands/teleport/Tpr.java → ...vancedteleport/commands/teleport/Tpr.java
diff --git a/...rt/commands/warp/AbstractWarpCommand.java → ...rt/commands/warp/AbstractWarpCommand.java b/...rt/commands/warp/AbstractWarpCommand.java → ...rt/commands/warp/AbstractWarpCommand.java
diff --git a/...port/commands/warp/DeleteWarpCommand.java → ...port/commands/warp/DeleteWarpCommand.java b/...port/commands/warp/DeleteWarpCommand.java → ...port/commands/warp/DeleteWarpCommand.java
diff --git a/...leport/commands/warp/MoveWarpCommand.java → ...leport/commands/warp/MoveWarpCommand.java b/...leport/commands/warp/MoveWarpCommand.java → ...leport/commands/warp/MoveWarpCommand.java
diff --git a/...eleport/commands/warp/SetWarpCommand.java → ...eleport/commands/warp/SetWarpCommand.java b/...eleport/commands/warp/SetWarpCommand.java → ...eleport/commands/warp/SetWarpCommand.java
@@ -1,7 +1,7 @@
 package io.github.niestrat99.advancedteleport.commands.warp;
 
 import io.github.niestrat99.advancedteleport.api.Warp;
-import io.github.niestrat99.advancedteleport.commands.AsyncATCommand;
+import io.github.niestrat99.advancedteleport.commands.ATCommand;
 import io.github.niestrat99.advancedteleport.config.CustomMessages;
 import io.github.niestrat99.advancedteleport.sql.WarpSQLManager;
 import org.bukkit.Location;
@@ -13,7 +13,7 @@
 
 import java.util.List;
 
-public class SetWarpCommand extends AbstractWarpCommand implements AsyncATCommand {
+public class SetWarpCommand extends AbstractWarpCommand implements ATCommand {
 
     @Override
     public boolean onCommand(@NotNull CommandSender sender, @NotNull Command command, @NotNull String label, @NotNull String[] args) {

diff --git a/...edteleport/commands/warp/WarpCommand.java → ...edteleport/commands/warp/WarpCommand.java b/...edteleport/commands/warp/WarpCommand.java → ...edteleport/commands/warp/WarpCommand.java
diff --git a/...dteleport/commands/warp/WarpsCommand.java → ...dteleport/commands/warp/WarpsCommand.java b/...dteleport/commands/warp/WarpsCommand.java → ...dteleport/commands/warp/WarpsCommand.java
diff --git a/...vancedteleport/config/CustomMessages.java → ...vancedteleport/config/CustomMessages.java b/...vancedteleport/config/CustomMessages.java → ...vancedteleport/config/CustomMessages.java
@@ -18,11 +18,13 @@ public class CustomMessages extends CMFile {
 
     public static File ConfigFile = new File(CoreClass.getInstance().getDataFolder(),"custom-messages.yml");
     public static CustomMessages config;
+    private static HashMap<CommandSender, BukkitRunnable> titleManager;
 
     public CustomMessages(Plugin plugin) {
         super(plugin, "custom-messages");
         setDescription(null);
         config = this;
+        titleManager = new HashMap<>();
     }
 
     public void loadDefaults() {
@@ -44,6 +46,10 @@ public void loadDefaults() {
         addDefault("Teleport.eventBeforeTPMovementAllowed" , "&b↑ &8» &7Teleporting in &b{countdown} seconds&7!");
         addDefault("Teleport.eventTeleport" , "&b↑ &8» &7Teleporting...");
         addDefault("Teleport.eventMovement" , "&b↑ &8» &7Teleport has been cancelled due to movement.");
+        addDefault("Teleport.eventMovement_title.length", 60);
+        addDefault("Teleport.eventMovement_title.fade-in", 0);
+        addDefault("Teleport.eventMovement_title.fade-out", 10);
+        addDefault("Teleport.eventMovement_title.0", "&e&l! &c&lCancelled &e&l!");
         addDefault("Teleport.teleportingToSpawn", "&b↑ &8» &7Teleporting you to spawn!");
         addDefault("Teleport.teleporting", "&b↑ &8» &7Teleporting to &b{player}&7!");
         addDefault("Teleport.teleportingToHome", "&b↑ &8» &7Teleporting to &b{home}&7!");
@@ -90,34 +96,34 @@ public void loadDefaults() {
         addDefault("Error.noBedHomeOther", "&b↑ &8» &b{player} &7doesn't have a bed spawn set!");
         addDefault("Error.reachedHomeLimit", "&b↑ &8» &7You can't set any more homes!");
         addDefault("Error.homeAlreadySet", "&b↑ &8» &7You already have a home called &b{home}&7!");
-        config.addDefault("Error.noWarpInput", "&b↑ &8» &7You have to include the warp's name!");
-        config.addDefault("Error.noSuchWarp", "&b↑ &8» &7That warp doesn't exist!");
-        config.addDefault("Error.noSuchWorld", "&b↑ &8» &7That world doesn't exist!");
-        config.addDefault("Error.noLocation", "&b↑ &8» &7You don't have any location to teleport back to!");
-        config.addDefault("Error.notAPlayer", "&b↑ &8» &7You must be a player to run this command!");
+        addDefault("Error.noWarpInput", "&b↑ &8» &7You have to include the warp's name!");
+        addDefault("Error.noSuchWarp", "&b↑ &8» &7That warp doesn't exist!");
+        addDefault("Error.noSuchWorld", "&b↑ &8» &7That world doesn't exist!");
+        addDefault("Error.noLocation", "&b↑ &8» &7You don't have any location to teleport back to!");
+        addDefault("Error.notAPlayer", "&b↑ &8» &7You must be a player to run this command!");
         config.addDefault("Error.noHomes", "&b↑ &8» &7You haven't got any homes!");
         config.addDefault("Error.noHomesOtherPlayer", "&b↑ &8» &b{player} &7hasn't got any homes!");
         config.addDefault("Error.tooFarAway", "&b↑ &8» &7The teleport destination is too far away so you can not teleport there!");
         config.addDefault("Error.noRequestsSent", "&b↑ &8» &7Couldn't send a request to anyone :(");
         config.addDefault("Error.onCountdown","&b↑ &8» &7You can't use this command whilst waiting to teleport!");
         config.addDefault("Error.noPermissionWarp", "&b↑ &8» &7You can't warp to &b{warp}&7!");
-        config.addDefault("Error.cantTPToWorld", "&b↑ &8» &7You can't randomly teleport in that world!");
+        addDefault("Error.cantTPToWorld", "&b↑ &8» &7You can't randomly teleport in that world!");
        // config.addDefault("Error.invalidName", "&cHomes and warps may only have letters and numbers in the names!");
-        config.addDefault("Error.cantTPToWorldLim", "&b↑ &8» &7You can't teleport to &b{world}&7!");
-        config.addDefault("Error.tooFewArguments", "&b↑ &8» &7Too few arguments!");
-        config.addDefault("Error.invalidArgs", "&b↑ &8» &7Invalid arguments!");
-        config.addDefault("Error.cantTPToPlayer", "&b↑ &8» &7You can't request a teleportation to &b{player}&7!");
-        config.addDefault("Error.noWarps", "&b↑ &8» &7There are no warps as of currently!");
-        config.addDefault("Error.noAccessHome", "&b↑ &8» &7You cannot access &b{home}&7 as of currently!");
-        config.addDefault("Error.moveHomeFail", "&b↑ &8» &7The home has been moved but the data has not been stored successfully. The plugin will try to fix this itself.");
-        config.addDefault("Error.setMainHomeFail", "&b↑ &8» &7The main home has been set but the data has not been stored successfully. The plugin will try to fix this itself.");
-        config.addDefault("Error.deleteHomeFail", "&b↑ &8» &7The home has been deleted but the data has not been stored successfully. The plugin will try to fix this itself.");
-        config.addDefault("Error.setHomeFail", "&b↑ &8» &7The home has been set but the data has not been stored successfully. The plugin will try to fix this itself.");
-        config.addDefault("Error.deleteWarpFail", "&b↑ &8» &7The warp has been set but the data has not been stored successfully. The plugin will try to fix this itself.");
-        config.addDefault("Error.homesNotLoaded", "&b↑ &8» &7Homes for this player haven't loaded yet, please wait a little bit (even just a second) before trying this again!");
-        config.addDefault("Error.noOfflineLocation", "&b↑ &8» &7No offline location was found for &b{player}&7!");
-        config.addDefault("Error.failedOfflineTeleport", "&b↑ &8» &7Failed to teleport to offline player &b{player}&7!");
-        config.addDefault("Error.failedOfflineTeleportHere", "&b↑ &8» &7Failed to teleport offline player &b{player} &7 to your location!");
+        addDefault("Error.cantTPToWorldLim", "&b↑ &8» &7You can't teleport to &b{world}&7!");
+        addDefault("Error.tooFewArguments", "&b↑ &8» &7Too few arguments!");
+        addDefault("Error.invalidArgs", "&b↑ &8» &7Invalid arguments!");
+        addDefault("Error.cantTPToPlayer", "&b↑ &8» &7You can't request a teleportation to &b{player}&7!");
+        addDefault("Error.noWarps", "&b↑ &8» &7There are no warps as of currently!");
+        addDefault("Error.noAccessHome", "&b↑ &8» &7You cannot access &b{home}&7 as of currently!");
+        addDefault("Error.moveHomeFail", "&b↑ &8» &7The home has been moved but the data has not been stored successfully. The plugin will try to fix this itself.");
+        addDefault("Error.setMainHomeFail", "&b↑ &8» &7The main home has been set but the data has not been stored successfully. The plugin will try to fix this itself.");
+        addDefault("Error.deleteHomeFail", "&b↑ &8» &7The home has been deleted but the data has not been stored successfully. The plugin will try to fix this itself.");
+        addDefault("Error.setHomeFail", "&b↑ &8» &7The home has been set but the data has not been stored successfully. The plugin will try to fix this itself.");
+        addDefault("Error.deleteWarpFail", "&b↑ &8» &7The warp has been set but the data has not been stored successfully. The plugin will try to fix this itself.");
+        addDefault("Error.homesNotLoaded", "&b↑ &8» &7Homes for this player haven't loaded yet, please wait a little bit (even just a second) before trying this again!");
+        addDefault("Error.noOfflineLocation", "&b↑ &8» &7No offline location was found for &b{player}&7!");
+        addDefault("Error.failedOfflineTeleport", "&b↑ &8» &7Failed to teleport to offline player &b{player}&7!");
+        addDefault("Error.failedOfflineTeleportHere", "&b↑ &8» &7Failed to teleport offline player &b{player} &7 to your location!");
         addDefault("Error.alreadySearching", "&b↑ &8» &7Already searching for a location to teleport to!");
 
         config.addDefault("Info.tpOff", "&b↑ &8» &7Successfully disabled teleport requests!");
@@ -152,6 +158,7 @@ public void loadDefaults() {
         config.addDefault("Info.multipleRequestDeny", "&b↑ &8» &7You have multiple teleport requests pending! Click one of the following to deny:");
         config.addDefault("Info.requestDeclined", "&b↑ &8» &7You've declined the teleport request!");
         config.addDefault("Info.requestDeclinedResponder", "&b↑ &8» &b{player} &7has declined your teleport request!");
+        config.addDefault("Info.requestDisplaced", "&b↑ &8» &7Your request has been cancelled because &b{player} &7got another request!");
 
         config.addDefault("Info.deletedHome", "&b↑ &8» &7Successfully deleted the home &b{home}&7!");
         config.addDefault("Info.deletedHomeOther", "&b↑ &8» &7Successfully deleted the home &b{home} &7for &b{player}&7!");
@@ -289,15 +296,15 @@ public static void sendMessage(CommandSender sender, String path, String... plac
                     titleInfo[2] = titles.getInt("fade-out");
                 }
 
-                new BukkitRunnable() {
+                BukkitRunnable runnable = new BukkitRunnable() {
 
                     private int current = 0;
                     private String previousTitle = null;
                     private String previousSubtitle = null;
 
                     @Override
                     public void run() {
-                        if (current == titleInfo[1]) {
+                        if (current == titleInfo[1] || titleManager.get(player) != this) {
                             cancel();
                             return;
                         }
@@ -318,7 +325,9 @@ public void run() {
 
                         current++;
                     }
-                }.runTaskTimer(CoreClass.getInstance(), 1, 1);
+                };
+                titleManager.put(player, runnable);
+                runnable.runTaskTimer(CoreClass.getInstance(), 1, 1);
             }
         }
         if (config.getConfig().get(path) instanceof List) {

diff --git a/...estrat99/advancedteleport/config/GUI.java → ...estrat99/advancedteleport/config/GUI.java b/...estrat99/advancedteleport/config/GUI.java → ...estrat99/advancedteleport/config/GUI.java