Improve reliability of tree generator function (#2875)

* Improve reliability of tree generator function

* Reimplement TreePlanter using generator

Author: me4502

worldedit-core/src/main/java/com/sk89q/worldedit/command/tool/TreePlanter.java

@@ -23,10 +23,11 @@
 import com.sk89q.worldedit.LocalConfiguration;
 import com.sk89q.worldedit.LocalSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
+import com.sk89q.worldedit.WorldEditException;
 import com.sk89q.worldedit.entity.Player;
 import com.sk89q.worldedit.extension.platform.Actor;
 import com.sk89q.worldedit.extension.platform.Platform;
-import com.sk89q.worldedit.math.BlockVector3;
+import com.sk89q.worldedit.function.generator.TreeGenerator;
 import com.sk89q.worldedit.util.Direction;
 import com.sk89q.worldedit.util.Location;
 import com.sk89q.worldedit.util.formatting.text.TranslatableComponent;
@@ -55,21 +56,15 @@ public boolean actPrimary(Platform server, LocalConfiguration config, Player pla
 
         try (EditSession editSession = BlockTool.createEditSession(player, session, clicked)) {
             try {
-                boolean successful = false;
-
-                final BlockVector3 pos = clicked.toVector().add(0, 1, 0).toBlockPoint();
-                for (int i = 0; i < 10; i++) {
-                    if (player.getWorld().generateTree(treeType, editSession, pos)) {
-                        successful = true;
-                        break;
-                    }
-                }
+                boolean successful = new TreeGenerator(editSession, treeType).apply(clicked.toVector().toBlockPoint());
 
                 if (!successful) {
                     player.printError(TranslatableComponent.of("worldedit.tool.tree.obstructed"));
                 }
             } catch (MaxChangedBlocksException e) {
                 player.printError(TranslatableComponent.of("worldedit.tool.max-block-changes"));
+            } catch (WorldEditException ignored) {
+                // This should never happen
             } finally {
                 session.remember(editSession);
             }

worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/TreeGenerator.java

@@ -43,6 +43,16 @@ public TreeGenerator(EditSession editSession, TreeType treeType) {
 
     @Override
     public boolean apply(BlockVector3 position) throws WorldEditException {
-        return editSession.getWorld().generateTree(treeType, editSession, position);
+        boolean successful = false;
+
+        final BlockVector3 pos = position.add(0, 1, 0);
+        for (int i = 0; i < 10; i++) {
+            if (editSession.getWorld().generateTree(treeType, editSession, pos)) {
+                successful = true;
+                break;
+            }
+        }
+
+        return successful;
     }
 }