EpicKnarvik97/PlotSquared
EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-21 20:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Address comments

Browse Source
This commit is contained in:
dordsor21 2022-10-12 16:55:44 +01:00
parent f387bcaa77
commit eef6dc41ca
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Core/src/main/java/com/plotsquared/core/generator/HybridPlotWorld.java
View File

@ -285,7 +285,8 @@ public class HybridPlotWorld extends ClassicPlotWorld {
// SCHEM_Y should be normalised to the plot "start" height // SCHEM_Y should be normalised to the plot "start" height
if (schematic3 != null) { if (schematic3 != null) {
if ((plotSchemHeight = maxSchematicHeight = schematic3.getClipboard().getDimensions().getY()) == worldGenHeight) { plotSchemHeight = maxSchematicHeight = schematic3.getClipboard().getDimensions().getY();
if (maxSchematicHeight == worldGenHeight) {
SCHEM_Y = getMinGenHeight(); SCHEM_Y = getMinGenHeight();
plotY = 0; plotY = 0;
} else if (!Settings.Schematics.PASTE_ON_TOP) { } else if (!Settings.Schematics.PASTE_ON_TOP) {
@ -297,10 +298,9 @@ public class HybridPlotWorld extends ClassicPlotWorld {
int roadSchemHeight; int roadSchemHeight;
if (schematic1 != null) { if (schematic1 != null) {
if ((maxSchematicHeight = Math.max( roadSchemHeight = schematic1.getClipboard().getDimensions().getY();
(roadSchemHeight = schematic1.getClipboard().getDimensions().getY()), maxSchematicHeight = Math.max(roadSchemHeight, maxSchematicHeight);
maxSchematicHeight if (maxSchematicHeight == worldGenHeight) {
)) == worldGenHeight) {
SCHEM_Y = getMinGenHeight(); SCHEM_Y = getMinGenHeight();
roadY = 0; // Road is the lowest schematic roadY = 0; // Road is the lowest schematic
if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldGenHeight) { if (schematic3 != null && schematic3.getClipboard().getDimensions().getY() != worldGenHeight) {
@ -506,12 +506,12 @@ public class HybridPlotWorld extends ClassicPlotWorld {
if (y >= height) { if (y >= height) {
if (y > lastOverlayHeightError) { if (y > lastOverlayHeightError) {
lastOverlayHeightError = y; lastOverlayHeightError = y;
LOGGER.error(String.format( LOGGER.error(
"Error adding overlay block in world %s. `y > height`. y=%s, height=%s", "Error adding overlay block in world {}. `y > height`. y={}, height={}",
getWorldName(), getWorldName(),
y, y,
height height
)); );
} }
return; return;
} }