Upstream/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2024-11-12 10:24:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixed road schematics if data set in plotworld

Browse Source
This commit is contained in:
boy0001 2015-02-02 20:06:37 +11:00
parent 20a4dec7fe
commit eb5ae0ec3c
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPlotWorld.java
View File

@ -217,6 +217,8 @@ public class HybridPlotWorld extends PlotWorld {
PlotMain.sendConsoleSenderMessage(C.PREFIX.s() + "&3 - schematic: &7false"); PlotMain.sendConsoleSenderMessage(C.PREFIX.s() + "&3 - schematic: &7false");
return; return;
} }
// Do not populate road if using schematic population
this.ROAD_BLOCK = new PlotBlock(this.ROAD_BLOCK.id, (byte) 0);
DataCollection[] blocks1 = schem1.getBlockCollection(); DataCollection[] blocks1 = schem1.getBlockCollection();
DataCollection[] blocks2 = schem2.getBlockCollection(); DataCollection[] blocks2 = schem2.getBlockCollection();

1
PlotSquared/src/main/java/com/intellectualcrafters/plot/generator/HybridPop.java
View File

@ -135,7 +135,6 @@ public class HybridPop extends BlockPopulator {
HybridPlotManager manager = (HybridPlotManager) PlotMain.getPlotManager(w); HybridPlotManager manager = (HybridPlotManager) PlotMain.getPlotManager(w);
RegionWrapper plot = manager.CURRENT_PLOT_CLEAR; RegionWrapper plot = manager.CURRENT_PLOT_CLEAR;
if (plot != null) { if (plot != null) {
short sx = (short) ((X) % this.size); short sx = (short) ((X) % this.size);
short sz = (short) ((Z) % this.size); short sz = (short) ((Z) % this.size);