From 5fdb60f85de5d65eb9da4b0ff211826883efd596 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Fri, 21 Dec 2018 13:39:20 +0000 Subject: [PATCH] Default plot height is at sea level (62) --- .../plot/generator/AugmentedUtils.java | 2 +- .../plot/generator/ClassicPlotWorld.java | 20 +++++++++---------- .../plotsquared/plot/object/Plot.java | 6 +++--- .../plotsquared/plot/object/PlotArea.java | 2 +- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java index bf4199469..1d18cbdcd 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/AugmentedUtils.java @@ -81,7 +81,7 @@ public class AugmentedUtils { primaryMask = queue; } LocalBlockQueue secondaryMask; - PlotBlock air = PlotBlock.get((short) 0, (byte) 0); + PlotBlock air = StringPlotBlock.EVERYTHING; if (area.TERRAIN == 2) { PlotManager manager = area.getPlotManager(); final boolean[][] canPlace = new boolean[16][16]; diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java index 8a0c14a99..197384eaf 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/ClassicPlotWorld.java @@ -10,21 +10,21 @@ import com.github.intellectualsites.plotsquared.plot.util.StringMan; public abstract class ClassicPlotWorld extends SquarePlotWorld { - public int ROAD_HEIGHT = 64; - public int PLOT_HEIGHT = 64; - public int WALL_HEIGHT = 64; + public int ROAD_HEIGHT = 62; + public int PLOT_HEIGHT = 62; + public int WALL_HEIGHT = 62; public BlockBucket MAIN_BLOCK = BlockBucket.withSingle(PlotBlock.get("stone")); - // new PlotBlock[] {PlotBlock.get("stone")}; - public BlockBucket TOP_BLOCK = BlockBucket.withSingle(PlotBlock.get("grass")); - //new PlotBlock[] {PlotBlock.get("grass")}; + // new PlotBlock[] {PlotBlock.get("stone")}; + public BlockBucket TOP_BLOCK = BlockBucket.withSingle(PlotBlock.get("grass_block")); + //new PlotBlock[] {PlotBlock.get("grass")}; public BlockBucket WALL_BLOCK = BlockBucket.withSingle(PlotBlock.get("stone_slab")); - // PlotBlock.get((short) 44, (byte) 0); + // PlotBlock.get((short) 44, (byte) 0); public BlockBucket CLAIMED_WALL_BLOCK = BlockBucket.withSingle(PlotBlock.get("sandstone_slab")); - // PlotBlock.get((short) 44, (byte) 1); + // PlotBlock.get((short) 44, (byte) 1); public BlockBucket WALL_FILLING = BlockBucket.withSingle(PlotBlock.get("stone")); - //PlotBlock.get((short) 1, (byte) 0); + //PlotBlock.get((short) 1, (byte) 0); public BlockBucket ROAD_BLOCK = BlockBucket.withSingle(PlotBlock.get("quartz_block")); - // PlotBlock.get((short) 155, (byte) 0); + // PlotBlock.get((short) 155, (byte) 0); public boolean PLOT_BEDROCK = true; public ClassicPlotWorld(String worldName, String id, IndependentPlotGenerator generator, diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java index 6b7c60889..46d869575 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/Plot.java @@ -1169,7 +1169,7 @@ public class Plot { if (!isLoaded()) return loc; int y = - isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), loc.getX(), loc.getZ()) : 64; + isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), loc.getX(), loc.getZ()) : 62; if (area.ALLOW_SIGNS) { y = Math.max(y, getManager().getSignLoc(area, this).getY()); } @@ -1182,7 +1182,7 @@ public class Plot { int x = (largest.maxX >> 1) - (largest.minX >> 1) + largest.minX; int z = largest.minZ - 1; PlotManager manager = getManager(); - int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), x, z) : 64; + int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(getWorldName(), x, z) : 62; if (area.ALLOW_SIGNS && (y <= 0 || y >= 255)) { y = Math.max(y, manager.getSignLoc(area, this).getY() - 1); } @@ -1258,7 +1258,7 @@ public class Plot { x = bot.getX() + loc.x; z = bot.getZ() + loc.z; } - int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(plot.getWorldName(), x, z) : 64; + int y = isLoaded() ? WorldUtil.IMP.getHighestBlock(plot.getWorldName(), x, z) : 62; return new Location(plot.getWorldName(), x, y + 1, z); } // Side diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java index 224dd0a1c..a8e1a3bb4 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/object/PlotArea.java @@ -955,7 +955,7 @@ public abstract class PlotArea { public void addCluster(PlotCluster plotCluster) { if (this.clusters == null) { - this.clusters = new QuadMap(Integer.MAX_VALUE, 0, 0, 64) { + this.clusters = new QuadMap(Integer.MAX_VALUE, 0, 0, 62) { @Override public RegionWrapper getRegion(PlotCluster value) { return new RegionWrapper(value.getP1().x, value.getP2().x, value.getP1().y, value.getP2().y);