Improve queued-teleport controller

DreamPoland · Oct 5, 2024 · ccc3901 · ccc3901
1 parent 45185d7
commit ccc3901
Showing 1 changed file with 24 additions and 0 deletions.
diff --git a/...bukkit/src/main/java/cc/dreamcode/utilities/bukkit/teleport/QueuedTeleportController.java b/...bukkit/src/main/java/cc/dreamcode/utilities/bukkit/teleport/QueuedTeleportController.java
@@ -5,6 +5,7 @@
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
 
 @RequiredArgsConstructor
 public class QueuedTeleportController implements Listener {
@@ -25,9 +26,32 @@ public void onPlayerMove(PlayerMoveEvent e) {
         }
 
         if (e.getFrom().getBlockX() != e.getTo().getBlockX() ||
+                e.getFrom().getBlockY() != e.getTo().getBlockY() ||
                 e.getFrom().getBlockZ() != e.getTo().getBlockZ()) {
             queuedTeleport.getMovedNotice().accept(player);
             this.queuedTeleportCache.remove(player.getUniqueId());
         }
     }
+
+    @EventHandler
+    public void onPlayerTeleport(PlayerTeleportEvent event) {
+        if (event.getCause().equals(PlayerTeleportEvent.TeleportCause.PLUGIN) ||
+                event.getCause().equals(PlayerTeleportEvent.TeleportCause.UNKNOWN)) {
+            return;
+        }
+
+        final Player player = event.getPlayer();
+
+        if (!this.queuedTeleportCache.isQueued(player.getUniqueId())) {
+            return;
+        }
+
+        final QueuedTeleport queuedTeleport = this.queuedTeleportCache.get(player.getUniqueId());
+        if (!queuedTeleport.isCancelOnMove()) {
+            return;
+        }
+
+        queuedTeleport.getMovedNotice().accept(player);
+        this.queuedTeleportCache.remove(player.getUniqueId());
+    }
 }