Clamp Y coordinates during selection

worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/ImmutableVirtualWorld.java

@@ -37,7 +37,7 @@ public abstract class ImmutableVirtualWorld implements VirtualWorld {
     }
 
     @Override
-    public boolean setBlock(BlockVector3 position, BlockStateHolder block, boolean notifyAndLight) throws WorldEditException {
+    public <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 position, B block, boolean notifyAndLight) throws WorldEditException {
         return setBlock(position, block);
     }
 
@@ -72,7 +72,7 @@ public abstract class ImmutableVirtualWorld implements VirtualWorld {
     }
 
     @Override
-    public boolean setBlock(BlockVector3 pt, BlockStateHolder block) throws WorldEditException {
+    public <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 pt, B block) throws WorldEditException {
         return unsupported();
     }
 

worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/VirtualWorld.java

@@ -25,7 +25,7 @@ public interface VirtualWorld extends SimpleWorld, Closeable {
     int getMaxY();
 
     @Override
-    boolean setBlock(BlockVector3 pt, BlockStateHolder block) throws WorldEditException;
+    <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 pt, B block) throws WorldEditException;
 
     Player getPlayer();
 

worldedit-core/src/main/java/com/boydti/fawe/object/brush/visualization/cfi/HeightMapMCAGenerator.java

@@ -718,7 +718,7 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr
     }
 
     @Override
-    public boolean setBlock(BlockVector3 position, BlockStateHolder block) throws WorldEditException {
+    public <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 position, B block) throws WorldEditException {
         return setBlock(position.getBlockX(), position.getBlockY(), position.getBlockZ(), block);
     }
 
@@ -951,7 +951,7 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr
     }
 
     @Override
-    public boolean setBlock(int x, int y, int z, BlockStateHolder block) throws WorldEditException {
+    public <B extends BlockStateHolder<B>> boolean setBlock(int x, int y, int z, B block) throws WorldEditException {
         return this.setBlock(x, y, z, block.getOrdinalChar());
     }
 
@@ -979,7 +979,7 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr
         return heights.getByte(index) & 0xFF;
     }
 
-    public void setFloor(int x, int z, BlockStateHolder block) {
+    public <B extends BlockStateHolder<B>> void setFloor(int x, int z, B block) {
         int index = z * getWidth() + x;
         floor.setInt(index, block.getOrdinalChar());
     }
@@ -1914,7 +1914,7 @@ public class HeightMapMCAGenerator extends MCAWriter implements StreamChange, Dr
     }
 
     @Override
-    public boolean setBlock(BlockVector3 position, BlockStateHolder block, boolean notifyAndLight) throws WorldEditException {
+    public <B extends BlockStateHolder<B>> boolean setBlock(BlockVector3 position, B block, boolean notifyAndLight) throws WorldEditException {
         return setBlock(position, block);
     }
 

worldedit-core/src/main/java/com/sk89q/worldedit/command/SelectionCommands.java

@@ -120,9 +120,9 @@ public class SelectionCommands {
                          BlockVector3 coordinates) throws WorldEditException {
         Location pos;
         if (coordinates != null) {
-            pos = new Location(world, coordinates.toVector3());
+            pos = new Location(world, coordinates.toVector3().clampY(0, world.getMaxY()));
         } else if (actor instanceof Locatable) {
-            pos = ((Locatable) actor).getBlockLocation();
+            pos = ((Locatable) actor).getBlockLocation().clampY(0, world.getMaxY());
         } else {
             actor.printError(TranslatableComponent.of("worldedit.pos.console-require-coords"));
             return;
@@ -149,9 +149,9 @@ public class SelectionCommands {
                          BlockVector3 coordinates) throws WorldEditException {
         Location pos;
         if (coordinates != null) {
-            pos = new Location(world, coordinates.toVector3());
+            pos = new Location(world, coordinates.toVector3().clampY(0, world.getMaxY()));
         } else if (actor instanceof Locatable) {
-            pos = ((Locatable) actor).getBlockLocation();
+            pos = ((Locatable) actor).getBlockLocation().clampY(0, world.getMaxY());
         } else {
             actor.printError(TranslatableComponent.of("worldedit.pos.console-require-coords"));
             return;
@@ -523,16 +523,14 @@ public class SelectionCommands {
     @CommandPermissions("worldedit.analysis.distr")
     public void distr(Actor actor, World world, LocalSession session,
                       @Switch(name = 'c', desc = "Get the distribution of the clipboard instead")
-                              boolean clipboardDistr,
+                          boolean clipboardDistr,
                       @Switch(name = 'd', desc = "Separate blocks by state")
-                              boolean separateStates,
+                          boolean separateStates,
                       @ArgFlag(name = 'p', desc = "Gets page from a previous distribution.", def = "")
-                              Integer page) throws WorldEditException {
+                          Integer page) throws WorldEditException {
         List<Countable<BlockState>> distribution;
 
-        Region region;
         if (page == null) {
-            Extent extent;
             if (clipboardDistr) {
                 Clipboard clipboard = session.getClipboard().getClipboard(); // throws if missing
                 BlockDistributionCounter count = new BlockDistributionCounter(clipboard, separateStates);
@@ -541,8 +539,7 @@ public class SelectionCommands {
                 distribution = count.getDistribution();
             } else {
                 try (EditSession editSession = session.createEditSession(actor)) {
-                    distribution = editSession
+                    distribution = editSession.getBlockDistribution(session.getSelection(world), separateStates);
-                        .getBlockDistribution(session.getSelection(world), separateStates);
                 }
             }
             session.setLastDistribution(distribution);
@@ -554,6 +551,7 @@ public class SelectionCommands {
                 return;
             }
         }
+
         if (distribution.isEmpty()) {  // *Should* always be false
             actor.printError(TranslatableComponent.of("worldedit.distr.no-blocks"));
             return;

worldedit-core/src/main/java/com/sk89q/worldedit/extension/platform/PlatformManager.java

@@ -406,7 +406,6 @@ public class PlatformManager {
         // making changes to the world
         Player player = createProxyActor(event.getPlayer());
         LocalSession session = worldEdit.getSessionManager().get(player);
-
         VirtualWorld virtual = session.getVirtualWorld();
         if (virtual != null) {
             virtual.handlePlayerInput(player,  event);
@@ -416,7 +415,6 @@ public class PlatformManager {
         try {
             switch (event.getInputType()) {
                 case PRIMARY: {
-
                     Tool tool = session.getTool(player);
                     if (tool instanceof DoubleActionTraceTool && tool.canUse(player)) {
                         player.runAsyncIfFree(() -> reset((DoubleActionTraceTool) tool).actSecondary(queryCapability(Capability.WORLD_EDITING),