Fix gravity brush itself, not EditSession

worldedit-core/src/main/java/com/sk89q/worldedit/EditSession.java

@@ -565,12 +565,12 @@ public class EditSession implements Extent, AutoCloseable {
 
     @Override
     public BlockState getBlock(BlockVector3 position) {
-        return bypassNone.getBlock(position);
+        return world.getBlock(position);
     }
 
     @Override
     public BaseBlock getFullBlock(BlockVector3 position) {
-        return bypassNone.getFullBlock(position);
+        return world.getFullBlock(position);
     }
 
     /**

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

@@ -23,12 +23,13 @@ import com.sk89q.worldedit.EditSession;
 import com.sk89q.worldedit.MaxChangedBlocksException;
 import com.sk89q.worldedit.function.pattern.Pattern;
 import com.sk89q.worldedit.math.BlockVector3;
-import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.util.LocatedBlock;
+import com.sk89q.worldedit.util.collection.LocatedBlockList;
+import com.sk89q.worldedit.world.block.BaseBlock;
 import com.sk89q.worldedit.world.block.BlockTypes;
 
-import java.util.ArrayList;
+import java.util.LinkedHashSet;
-import java.util.Collections;
+import java.util.Set;
-import java.util.List;
 
 public class GravityBrush implements Brush {
 
@@ -40,28 +41,45 @@ public class GravityBrush implements Brush {
 
     @Override
     public void build(EditSession editSession, BlockVector3 position, Pattern pattern, double size) throws MaxChangedBlocksException {
-        final double startY = fullHeight ? editSession.getWorld().getMaxY() : position.getBlockY() + size;
+        double yMax = fullHeight ? editSession.getWorld().getMaxY() : position.getY() + size;
-        for (double x = position.getBlockX() + size; x > position.getBlockX() - size; --x) {
+        LocatedBlockList column = new LocatedBlockList();
-            for (double z = position.getBlockZ() + size; z > position.getBlockZ() - size; --z) {
+        Set<BlockVector3> removedBlocks = new LinkedHashSet<>();
-                double y = startY;
+        for (double x = position.getX() - size; x <= position.getX() + size; x++) {
-                final List<BlockState> blockTypes = new ArrayList<>();
+            for (double z = position.getZ() - size; z <= position.getZ() + size; z++) {
-                for (; y > position.getBlockY() - size; --y) {
+                for (double y = position.getY() - size; y <= yMax; y++) {
-                    final BlockVector3 pt = BlockVector3.at(x, y, z);
+                    BlockVector3 newPos = BlockVector3.at(x, y - 1, z);
-                    final BlockState block = editSession.getBlock(pt);
-                    if (!block.getBlockType().getMaterial().isAir()) {
-                        blockTypes.add(block);
-                        editSession.setBlock(pt, BlockTypes.AIR.getDefaultState());
-                    }
-                }
                     BlockVector3 pt = BlockVector3.at(x, y, z);
-                Collections.reverse(blockTypes);
+
-                for (int i = 0; i < blockTypes.size();) {
+                    BaseBlock block = editSession.getFullBlock(pt);
-                    if (editSession.getBlock(pt).getBlockType().getMaterial().isAir()) {
+
-                        editSession.setBlock(pt, blockTypes.get(i++));
+                    if (block.getBlockType().getMaterial().isAir()) {
+                        continue;
                     }
-                    pt = pt.add(0, 1, 0);
+
+                    if (!removedBlocks.remove(newPos)) {
+                        // we have not moved the block below this one.
+                        // is it free in the edit session?
+                        if (!editSession.getBlock(newPos).getBlockType().getMaterial().isAir()) {
+                            // no -- do not move this block
+                            continue;
                         }
                     }
+
+                    column.add(newPos, block);
+                    removedBlocks.add(pt);
+                }
+
+                for (LocatedBlock block : column) {
+                    editSession.setBlock(block.getLocation(), block.getBlock());
+                }
+
+                for (BlockVector3 removedBlock : removedBlocks) {
+                    editSession.setBlock(removedBlock, BlockTypes.AIR.getDefaultState());
+                }
+
+                column.clear();
+                removedBlocks.clear();
+            }
         }
     }