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

Don't fuck up road schematics, I guess

Browse Source
This commit is contained in:
Sauilitired 2019-01-22 21:32:24 +01:00
parent 344a2afeff
commit c96a1afaed
No known key found for this signature in database
GPG Key ID: C0207FF7EA146678
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/github/intellectualsites/plotsquared/plot/generator/HybridGen.java
View File

@ -16,9 +16,9 @@ public class HybridGen extends IndependentPlotGenerator {
} }
private void placeSchem(HybridPlotWorld world, ScopedLocalBlockQueue result, short relativeX, private void placeSchem(HybridPlotWorld world, ScopedLocalBlockQueue result, short relativeX,
short relativeZ, int x, int z) { short relativeZ, int x, int z, boolean isRoad) {
int minY; // Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT); int minY; // Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
if (Settings.Schematics.PASTE_ON_TOP) { if (isRoad || Settings.Schematics.PASTE_ON_TOP) {
minY = Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT); minY = Math.min(world.PLOT_HEIGHT, world.ROAD_HEIGHT);
} else { } else {
minY = 1; minY = 1;
@ -131,7 +131,7 @@ public class HybridGen extends IndependentPlotGenerator {
result.setBlock(x, y, z, hpw.ROAD_BLOCK.getBlock()); result.setBlock(x, y, z, hpw.ROAD_BLOCK.getBlock());
} }
if (hpw.ROAD_SCHEMATIC_ENABLED) { if (hpw.ROAD_SCHEMATIC_ENABLED) {
placeSchem(hpw, result, rx[x], rz[z], x, z); placeSchem(hpw, result, rx[x], rz[z], x, z, true);
} }
} }
} else if (wx[x]) { } else if (wx[x]) {
@ -142,7 +142,7 @@ public class HybridGen extends IndependentPlotGenerator {
result.setBlock(x, y, z, hpw.ROAD_BLOCK.getBlock()); result.setBlock(x, y, z, hpw.ROAD_BLOCK.getBlock());
} }
if (hpw.ROAD_SCHEMATIC_ENABLED) { if (hpw.ROAD_SCHEMATIC_ENABLED) {
placeSchem(hpw, result, rx[x], rz[z], x, z); placeSchem(hpw, result, rx[x], rz[z], x, z, true);
} }
} else { } else {
// wall // wall
@ -152,7 +152,7 @@ public class HybridGen extends IndependentPlotGenerator {
if (!hpw.ROAD_SCHEMATIC_ENABLED) { if (!hpw.ROAD_SCHEMATIC_ENABLED) {
result.setBlock(x, hpw.WALL_HEIGHT + 1, z, hpw.WALL_BLOCK.getBlock()); result.setBlock(x, hpw.WALL_HEIGHT + 1, z, hpw.WALL_BLOCK.getBlock());
} else { } else {
placeSchem(hpw, result, rx[x], rz[z], x, z); placeSchem(hpw, result, rx[x], rz[z], x, z, true);
} }
} }
} }
@ -164,7 +164,7 @@ public class HybridGen extends IndependentPlotGenerator {
result.setBlock(x, y, z, hpw.ROAD_BLOCK.getBlock()); result.setBlock(x, y, z, hpw.ROAD_BLOCK.getBlock());
} }
if (hpw.ROAD_SCHEMATIC_ENABLED) { if (hpw.ROAD_SCHEMATIC_ENABLED) {
placeSchem(hpw, result, rx[x], rz[z], x, z); placeSchem(hpw, result, rx[x], rz[z], x, z, true);
} }
} else if (wz[z]) { } else if (wz[z]) {
// wall // wall
@ -174,7 +174,7 @@ public class HybridGen extends IndependentPlotGenerator {
if (!hpw.ROAD_SCHEMATIC_ENABLED) { if (!hpw.ROAD_SCHEMATIC_ENABLED) {
result.setBlock(x, hpw.WALL_HEIGHT + 1, z, hpw.WALL_BLOCK.getBlock()); result.setBlock(x, hpw.WALL_HEIGHT + 1, z, hpw.WALL_BLOCK.getBlock());
} else { } else {
placeSchem(hpw, result, rx[x], rz[z], x, z); placeSchem(hpw, result, rx[x], rz[z], x, z, true);
} }
} else { } else {
// plot // plot
@ -183,7 +183,7 @@ public class HybridGen extends IndependentPlotGenerator {
} }
result.setBlock(x, hpw.PLOT_HEIGHT, z, hpw.TOP_BLOCK.getBlock()); result.setBlock(x, hpw.PLOT_HEIGHT, z, hpw.TOP_BLOCK.getBlock());
if (hpw.PLOT_SCHEMATIC) { if (hpw.PLOT_SCHEMATIC) {
placeSchem(hpw, result, rx[x], rz[z], x, z); placeSchem(hpw, result, rx[x], rz[z], x, z, false);
} }
} }
} }