From 321a39f12176832795409908914156228badc746 Mon Sep 17 00:00:00 2001
From: Hannes Greule <SirYwell@users.noreply.github.com>
Date: Tue, 7 Feb 2023 23:07:57 +0100
Subject: [PATCH] Remove PlayerMoveEvent listener and deprecate MovableTool
 (#2083)

Remove PlayerMoveEventListener and deprecate MovableTool
---
 .../bukkit/listener/BrushListener.java        | 21 -------------------
 .../core/command/tool/MovableTool.java        |  8 +++++++
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/listener/BrushListener.java b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/listener/BrushListener.java
index 38764c77c..3c7d96170 100644
--- a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/listener/BrushListener.java
+++ b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/listener/BrushListener.java
@@ -1,6 +1,5 @@
 package com.fastasyncworldedit.bukkit.listener;
 
-import com.fastasyncworldedit.core.command.tool.MovableTool;
 import com.fastasyncworldedit.core.command.tool.ResettableTool;
 import com.fastasyncworldedit.core.command.tool.scroll.ScrollTool;
 import com.sk89q.worldedit.LocalSession;
@@ -8,7 +7,6 @@ import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.BukkitPlayer;
 import com.sk89q.worldedit.command.tool.Tool;
 import org.bukkit.Bukkit;
-import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
@@ -16,7 +14,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.block.Action;
 import org.bukkit.event.player.PlayerInteractEvent;
 import org.bukkit.event.player.PlayerItemHeldEvent;
-import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.plugin.Plugin;
 
 public class BrushListener implements Listener {
@@ -49,24 +46,6 @@ public class BrushListener implements Listener {
         }
     }
 
-    @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    public void onPlayerMove(PlayerMoveEvent event) {
-        Location from = event.getFrom();
-        Location to = event.getTo();
-        if ((from.getYaw() != to.getYaw() && from.getPitch() != to.getPitch()) || from.getBlockX() != to.getBlockX() || from.getBlockZ() != to
-                .getBlockZ() || from.getBlockY() != to.getBlockY()) {
-            Player bukkitPlayer = event.getPlayer();
-            com.sk89q.worldedit.entity.Player player = BukkitAdapter.adapt(bukkitPlayer);
-            LocalSession session = player.getSession();
-            Tool tool = session.getTool(player);
-            if (tool != null) {
-                if (tool instanceof MovableTool) {
-                    ((MovableTool) tool).move(player);
-                }
-            }
-        }
-    }
-
     @EventHandler(priority = EventPriority.LOWEST)
     public void onPlayerInteract(final PlayerInteractEvent event) {
         Player bukkitPlayer = event.getPlayer();
diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/MovableTool.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/MovableTool.java
index a5b58fb93..d38db7dca 100644
--- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/MovableTool.java
+++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/command/tool/MovableTool.java
@@ -2,8 +2,16 @@ package com.fastasyncworldedit.core.command.tool;
 
 import com.sk89q.worldedit.entity.Player;
 
+/**
+ * @deprecated This interface has no functionality anymore
+ */
+@Deprecated(forRemoval = true, since = "TODO")
 public interface MovableTool {
 
+    /**
+     * @deprecated This interface has no functionality anymore
+     */
+    @Deprecated(forRemoval = true, since = "TODO")
     boolean move(Player player);
 
 }