From 25ed9d279821e074467b0a81822fc7d9eca570b5 Mon Sep 17 00:00:00 2001 From: dordsor21 Date: Wed, 23 Jan 2019 12:23:05 +0000 Subject: [PATCH] Fix road schematic pasting height --- .../plotsquared/plot/generator/HybridPlotManager.java | 7 +------ .../plotsquared/plot/generator/HybridUtils.java | 8 +------- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java index 071af627c..1f6429dbd 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridPlotManager.java @@ -79,12 +79,7 @@ public class HybridPlotManager extends ClassicPlotManager { private void createSchemAbs(HybridPlotWorld hpw, LocalBlockQueue queue, Location pos1, Location pos2, boolean clear) { int size = hpw.SIZE; - int minY; - if (Settings.Schematics.PASTE_ON_TOP) { - minY = Math.min(hpw.PLOT_HEIGHT, hpw.ROAD_HEIGHT); - } else { - minY = 1; - } + int minY = Math.min(hpw.PLOT_HEIGHT, hpw.ROAD_HEIGHT); for (int x = pos1.getX(); x <= pos2.getX(); x++) { short absX = (short) ((x - hpw.ROAD_OFFSET_X) % size); if (absX < 0) { diff --git a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java index 80b8b0f99..4d46205ad 100644 --- a/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java +++ b/Core/src/main/java/com/github/intellectualsites/plotsquared/plot/generator/HybridUtils.java @@ -2,7 +2,6 @@ package com.github.intellectualsites.plotsquared.plot.generator; import com.github.intellectualsites.plotsquared.plot.PlotSquared; import com.github.intellectualsites.plotsquared.plot.config.C; -import com.github.intellectualsites.plotsquared.plot.config.Settings; import com.github.intellectualsites.plotsquared.plot.flag.FlagManager; import com.github.intellectualsites.plotsquared.plot.flag.Flags; import com.github.intellectualsites.plotsquared.plot.listener.WEExtent; @@ -348,12 +347,7 @@ public abstract class HybridUtils { } if (condition) { BaseBlock[] blocks = plotWorld.G_SCH.get(MathMan.pair(absX, absZ)); - int minY; - if (Settings.Schematics.PASTE_ON_TOP) { - minY = Math.min(plotWorld.PLOT_HEIGHT, plotWorld.ROAD_HEIGHT); - } else { - minY = 1; - } + int minY = Math.min(plotWorld.PLOT_HEIGHT, plotWorld.ROAD_HEIGHT); int maxY = Math.max(extend, blocks.length); if (blocks != null) { for (int y = 0; y < maxY; y++) {