From d104da907f5509421eff30b0851641a7529f3ce7 Mon Sep 17 00:00:00 2001 From: Sekwah Date: Wed, 23 Sep 2020 10:06:05 +0100 Subject: [PATCH] Changed for better support for paperspigot --- .../bukkit/AdvancedPortalsCommand.java | 1 - .../bukkit/listeners/Listeners.java | 12 ++++-------- .../bukkit/listeners/PluginMessageReceiver.java | 15 +++++---------- 3 files changed, 9 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsCommand.java b/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsCommand.java index b3d76b0..9f47b1e 100644 --- a/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsCommand.java +++ b/src/main/java/com/sekwah/advancedportals/bukkit/AdvancedPortalsCommand.java @@ -54,7 +54,6 @@ public class AdvancedPortalsCommand implements CommandExecutor, TabCompleter { @SuppressWarnings("deprecation") @Override public boolean onCommand(CommandSender sender, Command cmd, String command, String[] args) { - // System.out.printf("%s %s %s %s%n", sender, cmd, command, args ); ConfigAccessor config = new ConfigAccessor(plugin, "config.yml"); ConfigAccessor portalConfig = new ConfigAccessor(plugin, "portals.yml"); if (!(sender instanceof Player)) { diff --git a/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java b/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java index 13a41cb..5abd2bd 100644 --- a/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java +++ b/src/main/java/com/sekwah/advancedportals/bukkit/listeners/Listeners.java @@ -95,14 +95,10 @@ public class Listeners implements Listener { String uuid = player.getUniqueId().toString(); - /*if (plugin.PlayerDestiMap.containsKey(uuid)) { - plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> { - Destination.warp(player, plugin.PlayerDestiMap.get(uuid), false, true); - plugin.PlayerDestiMap.remove(uuid); - - }, 1L); - - }*/ + if (plugin.PlayerDestiMap.containsKey(uuid)) { + Destination.warp(player, plugin.PlayerDestiMap.get(uuid), false, true); + plugin.PlayerDestiMap.remove(uuid); + } } @EventHandler(priority = EventPriority.HIGHEST, ignoreCancelled = true) diff --git a/src/main/java/com/sekwah/advancedportals/bukkit/listeners/PluginMessageReceiver.java b/src/main/java/com/sekwah/advancedportals/bukkit/listeners/PluginMessageReceiver.java index 62f7cb4..934d101 100644 --- a/src/main/java/com/sekwah/advancedportals/bukkit/listeners/PluginMessageReceiver.java +++ b/src/main/java/com/sekwah/advancedportals/bukkit/listeners/PluginMessageReceiver.java @@ -35,23 +35,18 @@ public class PluginMessageReceiver implements PluginMessageListener { Player targetPlayer = this.plugin.getServer().getPlayer(UUID.fromString(bungeeUUID)); - - Player finalTargetPlayer = targetPlayer; - Destination.warp(finalTargetPlayer, targetDestination, false, true); - - /*if (targetPlayer != null) { - Player finalTargetPlayer = targetPlayer; - Destination.warp(finalTargetPlayer, targetDestination, false, true); + if (targetPlayer != null) { + Destination.warp(targetPlayer, targetDestination, false, true); } else { plugin.PlayerDestiMap.put(bungeeUUID, targetDestination); plugin.getServer().getScheduler().scheduleSyncDelayedTask(plugin, () -> - plugin.PlayerDestiMap.remove(bungeeUUID), - 20L*10 + plugin.PlayerDestiMap.remove(bungeeUUID), + 20L * 10 ); - }*/ + } } }