From 00b13399d178f82ad573207c405523205c23b530 Mon Sep 17 00:00:00 2001
From: SirYwell <hannesgreule@outlook.de>
Date: Wed, 8 Mar 2023 20:04:29 +0100
Subject: [PATCH] Improve block tracing performance

---
 .../fawe/v1_20_R1/PaperweightFaweAdapter.java    |  1 +
 .../bukkit/util/FoliaTaskManager.java            |  1 -
 .../core/wrappers/AsyncPlayer.java               | 16 ++++++----------
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R1/PaperweightFaweAdapter.java b/worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R1/PaperweightFaweAdapter.java
index 04d116d97..ffe067ec9 100644
--- a/worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R1/PaperweightFaweAdapter.java
+++ b/worldedit-bukkit/adapters/adapter-1_20/src/main/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_20_R1/PaperweightFaweAdapter.java
@@ -243,6 +243,7 @@ public final class PaperweightFaweAdapter extends FaweAdapter<net.minecraft.nbt.
         final ServerLevel handle = getServerLevel(location.getWorld());
         LevelChunk chunk;
         if (Fawe.isTickThread()) {
+            // TODO check if is owned by this thread, else synchronize
             chunk = handle.getChunk(x >> 4, z >> 4);
         } else {
             chunk = TaskManager.taskManager().syncAt(() -> handle.getChunk(x >> 4, z >> 4), BukkitAdapter.adapt(location));
diff --git a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/util/FoliaTaskManager.java b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/util/FoliaTaskManager.java
index f35a51bf5..ce90ad2b9 100644
--- a/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/util/FoliaTaskManager.java
+++ b/worldedit-bukkit/src/main/java/com/fastasyncworldedit/bukkit/util/FoliaTaskManager.java
@@ -3,7 +3,6 @@ package com.fastasyncworldedit.bukkit.util;
 import com.fastasyncworldedit.core.util.TaskManager;
 import com.sk89q.worldedit.bukkit.BukkitAdapter;
 import com.sk89q.worldedit.bukkit.WorldEditPlugin;
-import com.sk89q.worldedit.entity.Entity;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.util.Location;
 import org.bukkit.Bukkit;
diff --git a/worldedit-core/src/main/java/com/fastasyncworldedit/core/wrappers/AsyncPlayer.java b/worldedit-core/src/main/java/com/fastasyncworldedit/core/wrappers/AsyncPlayer.java
index 5baff8236..be5b4b544 100644
--- a/worldedit-core/src/main/java/com/fastasyncworldedit/core/wrappers/AsyncPlayer.java
+++ b/worldedit-core/src/main/java/com/fastasyncworldedit/core/wrappers/AsyncPlayer.java
@@ -10,6 +10,7 @@ import com.sk89q.worldedit.WorldEdit;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.PlayerProxy;
 import com.sk89q.worldedit.extent.Extent;
+import com.sk89q.worldedit.function.mask.Mask;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.math.Vector3;
 import com.sk89q.worldedit.util.Direction;
@@ -17,6 +18,7 @@ import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.TargetBlock;
 import com.sk89q.worldedit.world.World;
 import com.sk89q.worldedit.world.block.BlockTypes;
+import org.jetbrains.annotations.Nullable;
 
 public class AsyncPlayer extends PlayerProxy {
 
@@ -177,19 +179,13 @@ public class AsyncPlayer extends PlayerProxy {
     }
 
     @Override
-    public Location getBlockTrace(int range, boolean useLastBlock) {
-        return TaskManager.taskManager().sync(() -> {
-            TargetBlock tb = new TargetBlock(AsyncPlayer.this, range, 0.2D);
-            return useLastBlock ? tb.getAnyTargetBlock() : tb.getTargetBlock();
-        });
+    public Location getBlockTrace(final int range, final boolean useLastBlock, @Nullable final Mask stopMask) {
+        return TaskManager.taskManager().syncAt(() -> super.getBlockTrace(range, useLastBlock, stopMask), getLocation());
     }
 
     @Override
-    public Location getBlockTraceFace(int range, boolean useLastBlock) {
-        return TaskManager.taskManager().sync(() -> {
-            TargetBlock tb = new TargetBlock(AsyncPlayer.this, range, 0.2D);
-            return useLastBlock ? tb.getAnyTargetBlockFace() : tb.getTargetBlockFace();
-        });
+    public Location getBlockTraceFace(final int range, final boolean useLastBlock, @Nullable final Mask stopMask) {
+        return TaskManager.taskManager().syncAt(() -> super.getBlockTraceFace(range, useLastBlock, stopMask), getLocation());
     }
 
     @Override