From 1fa0777d3b69a2ebb145abb7ab8d85bcda53606d Mon Sep 17 00:00:00 2001
From: IronApollo <zknownone@gmail.com>
Date: Tue, 8 Sep 2020 19:17:28 -0400
Subject: [PATCH] Fix erosion and pull brushes

Fixes #559
---
 .../com/boydti/fawe/object/brush/ErodeBrush.java     |  4 ++--
 .../com/boydti/fawe/object/brush/RaiseBrush.java     |  2 +-
 .../com/sk89q/worldedit/command/BrushCommands.java   | 12 ++++++------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/ErodeBrush.java b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/ErodeBrush.java
index 05929172a..9176c8b23 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/ErodeBrush.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/ErodeBrush.java
@@ -91,7 +91,7 @@ public class ErodeBrush implements Brush {
                 int x2y2 = x2 + z * z;
                 for (int y = -brushSize, rely = 0; y <= brushSize; y++, rely++) {
                     int cube = x2y2 + y * y;
-                    target.setBlock(x, y, z, current.getBlock(relx, rely, relz));
+                    target.setBlock(relx, rely, relz, current.getBlock(relx, rely, relz));
                     if (cube >= brushSizeSquared) {
                         continue;
                     }
@@ -136,7 +136,7 @@ public class ErodeBrush implements Brush {
                 int x2y2 = x2 + z * z;
                 for (int y = -brushSize, rely = 0; y <= brushSize; y++, rely++) {
                     int cube = x2y2 + y * y;
-                    target.setBlock(x, y, z, current.getBlock(relx, rely, relz));
+                    target.setBlock(relx, rely, relz, current.getBlock(relx, rely, relz));
                     if (cube >= brushSizeSquared) {
                         continue;
                     }
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/RaiseBrush.java b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/RaiseBrush.java
index dffcb29e3..be85c9da6 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/object/brush/RaiseBrush.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/object/brush/RaiseBrush.java
@@ -5,6 +5,6 @@ public class RaiseBrush extends ErodeBrush {
         this(6, 0, 1, 1);
     }
     public RaiseBrush(int erodeFaces, int erodeRec, int fillFaces, int fillRec) {
-        super(2, 1, 5, 1);
+        super(erodeFaces, erodeRec, fillFaces, fillRec);
     }
 }
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
index dc80efb52..4221717ce 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/BrushCommands.java
@@ -182,9 +182,9 @@ public class BrushCommands {
     public void erodeBrush(InjectedValueAccess context, @Arg(desc = "The radius for eroding",
                                                              def = "5") Expression radius,
         @Arg(desc = "erodeFaces",
-             def = "6") int erodefaces, @Arg(desc = "erodeRec",
-                                             def = "0") int erodeRec, @Arg(desc = "fillFaces",
-                                                                           def = "1") int fillFaces,
+             def = "2") int erodefaces, @Arg(desc = "erodeRec",
+                                             def = "1") int erodeRec, @Arg(desc = "fillFaces",
+                                                                           def = "5") int fillFaces,
         @Arg(desc = "fillRec",
              def = "1") int fillRec) throws WorldEditException {
         worldEdit.checkMaxBrushRadius(radius);
@@ -197,10 +197,10 @@ public class BrushCommands {
     public void pullBrush(InjectedValueAccess context,
         @Arg(desc = "The radius to sample for blending",
              def = "5") Expression radius, @Arg(desc = "erodeFaces",
-                                                def = "2") int erodefaces, @Arg(desc = "erodeRec",
-                                                                                def = "1")
+                                                def = "6") int erodefaces, @Arg(desc = "erodeRec",
+                                                                                def = "0")
         int erodeRec, @Arg(desc = "fillFaces",
-                           def = "5") int fillFaces, @Arg(desc = "fillRec",
+                           def = "1") int fillFaces, @Arg(desc = "fillRec",
                                                           def = "1") int fillRec)
         throws WorldEditException {
         worldEdit.checkMaxBrushRadius(radius);