Fix compiling

IntellectualSites · Dec 3, 2023 · 84c5692 · 84c5692
1 parent dea40d1
commit 84c5692
Showing 1 changed file with 23 additions and 64 deletions.
diff --git a/...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_19_R3/PaperweightFaweAdapter.java b/...in/java/com/sk89q/worldedit/bukkit/adapter/impl/fawe/v1_19_R3/PaperweightFaweAdapter.java
@@ -527,70 +527,6 @@ public org.bukkit.inventory.ItemStack adapt(BaseItemStack baseItemStack) {
         return CraftItemStack.asCraftMirror(stack);
     }
 
-    @Override
-    public boolean generateTree(
-            TreeGenerator.TreeType treeType, EditSession editSession, BlockVector3 blockVector3,
-            org.bukkit.World bukkitWorld
-    ) {
-        TreeType bukkitType = BukkitWorld.toBukkitTreeType(treeType);
-        if (bukkitType == TreeType.CHORUS_PLANT) {
-            blockVector3 = blockVector3.add(
-                    0,
-                    1,
-                    0
-            ); // bukkit skips the feature gen which does this offset normally, so we have to add it back
-        }
-        ServerLevel serverLevel = ((CraftWorld) bukkitWorld).getHandle();
-        final BlockVector3 finalBlockVector = blockVector3;
-        // Sync to main thread to ensure no clashes occur
-        Map<BlockPos, CraftBlockState> placed = TaskManager.taskManager().sync(() -> {
-            if (this.parent.isFolia()) {
-                try {
-                    var data = currentWorldData.invoke(serverLevel);
-                    captureBlockStates.setBoolean(data, true);
-                    captureTreeGeneration.setBoolean(data, true);
-                    try {
-                        if (!bukkitWorld.generateTree(BukkitAdapter.adapt(bukkitWorld, finalBlockVector), bukkitType)) {
-                            return null;
-                        }
-                        return ImmutableMap.copyOf((Map<BlockPos, CraftBlockState>) capturedBlockStates.get(data));
-                    } finally {
-                        captureBlockStates.setBoolean(data, false);
-                        captureTreeGeneration.setBoolean(data, false);
-                        ((Map<BlockPos, CraftBlockState>) capturedBlockStates.get(data)).clear();
-                    }
-                } catch (Throwable e) {
-                    throw new RuntimeException(e);
-                }
-            } else {
-                serverLevel.captureTreeGeneration = true;
-                serverLevel.captureBlockStates = true;
-                try {
-                    if (!bukkitWorld.generateTree(BukkitAdapter.adapt(bukkitWorld, finalBlockVector), bukkitType)) {
-                        return null;
-                    }
-                    return ImmutableMap.copyOf(serverLevel.capturedBlockStates);
-                } finally {
-                    serverLevel.captureBlockStates = false;
-                    serverLevel.captureTreeGeneration = false;
-                    serverLevel.capturedBlockStates.clear();
-                }
-            }
-        });
-        if (placed == null || placed.isEmpty()) {
-            return false;
-        }
-        for (CraftBlockState craftBlockState : placed.values()) {
-            if (craftBlockState == null || craftBlockState.getType() == Material.AIR) {
-                continue;
-            }
-            editSession.setBlock(craftBlockState.getX(), craftBlockState.getY(), craftBlockState.getZ(),
-                    BukkitAdapter.adapt(((org.bukkit.block.BlockState) craftBlockState).getBlockData())
-            );
-        }
-        return true;
-    }
-
     @Override
     public BaseItemStack adapt(org.bukkit.inventory.ItemStack itemStack) {
         final ItemStack nmsStack = CraftItemStack.asNMSCopy(itemStack);
@@ -692,4 +628,27 @@ private boolean wasAccessibleSinceLastSave(ChunkHolder holder) {
         return true;
     }
 
+    @Override
+    protected void preCaptureStates(final ServerLevel serverLevel) {
+        serverLevel.captureTreeGeneration = true;
+        serverLevel.captureBlockStates = true;
+    }
+
+    @Override
+    protected List<org.bukkit.block.BlockState> getCapturedBlockStatesCopy(final ServerLevel serverLevel) {
+        return new ArrayList<>(serverLevel.capturedBlockStates.values());
+    }
+
+    @Override
+    protected void postCaptureBlockStates(final ServerLevel serverLevel) {
+        serverLevel.captureBlockStates = false;
+        serverLevel.captureTreeGeneration = false;
+        serverLevel.capturedBlockStates.clear();
+    }
+
+    @Override
+    protected ServerLevel getServerLevel(final World world) {
+        return ((CraftWorld) world).getHandle();
+    }
+
 }