diff --git a/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlayerListener.java b/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlayerListener.java index 7d075345e..4d0cfadf9 100644 --- a/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlayerListener.java +++ b/src/main/java/com/sk89q/worldedit/bukkit/WorldEditPlayerListener.java @@ -70,6 +70,9 @@ public class WorldEditPlayerListener extends PlayerListener { */ @Override public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) { + if (event.isCancelled()) + return; + String[] split = event.getMessage().split(" "); if (plugin.getWorldEdit().handleCommand(wrapPlayer(event.getPlayer()), split)) { @@ -84,14 +87,16 @@ public class WorldEditPlayerListener extends PlayerListener { */ @Override public void onPlayerInteract(PlayerInteractEvent event) { + if (event.isCancelled()) + return; if (event.getAction() == Action.LEFT_CLICK_BLOCK) { LocalWorld world = new BukkitWorld(event.getClickedBlock().getWorld()); WorldVector pos = new WorldVector(world, event.getClickedBlock().getX(), event.getClickedBlock().getY(), event.getClickedBlock().getZ()); LocalPlayer player = wrapPlayer(event.getPlayer()); - + if (plugin.getWorldEdit().handleBlockLeftClick(player, pos)) { - event.setCancelled(true); + event.setCancelled(true); } if (plugin.getWorldEdit().handleArmSwing(wrapPlayer(event.getPlayer()))) {