EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-06-29 04:04:43 +02:00
Code Issues Projects Releases Wiki Activity

Fixed a couple issues related to world generation / clearing

Browse Source 
- Fixed competition of multiple augmented populators if there are
several augmented plot clusters of specific terrain type
- Fixed fastmode clearing sometimes doing strange things if chunks
connected to the road have not previously been generated
- Fixed fastmode clearing not setting block data correctly on unloaded
chunks under specific conditions.
This commit is contained in:
boy0001
2015-07-26 00:43:19 +10:00
parent 00ab472ba6
commit 7db9c0b9a2
3 changed files with 203 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/com/intellectualcrafters/plot/generator/AugmentedPopulator.java
View File

@ -120,6 +120,21 @@ public class AugmentedPopulator extends BlockPopulator {
@Override
public void populate(final World world, final Random rand, final Chunk chunk) {
final int cx = chunk.getX();
final int cz = chunk.getZ();
final int bx = cx << 4;
final int bz = cz << 4;
final int tx = bx + 15;
final int tz = bz + 15;
final boolean inX1 = ((bx >= this.bx) && (bx <= this.tx));
final boolean inX2 = ((tx >= this.bx) && (tx <= this.tx));
final boolean inZ1 = ((bz >= this.bz) && (bz <= this.tz));
final boolean inZ2 = ((tz >= this.bz) && (tz <= this.tz));
final boolean inX = inX1 || inX2;
final boolean inZ = inZ1 || inZ2;
if (!inX || !inZ) {
return;
}
if (this.plotworld.TERRAIN == 3) {
int X = chunk.getX() << 4;
int Z = chunk.getZ() << 4;
@ -170,44 +185,29 @@ public class AugmentedPopulator extends BlockPopulator {
}
return;
}
final int X = chunk.getX();
final int Z = chunk.getZ();
final int x = X << 4;
final int z = Z << 4;
final int x2 = x + 15;
final int z2 = z + 15;
final boolean inX1 = ((x >= this.bx) && (x <= this.tx));
final boolean inX2 = ((x2 >= this.bx) && (x2 <= this.tx));
final boolean inZ1 = ((z >= this.bz) && (z <= this.tz));
final boolean inZ2 = ((z2 >= this.bz) && (z2 <= this.tz));
final boolean inX = inX1 || inX2;
final boolean inZ = inZ1 || inZ2;
if (!inX || !inZ) {
return;
}
final boolean check;
check = !inX1 || !inX2 || !inZ1 || !inZ2;
if (this.plotworld.TERRAIN > 1) {
final PlotId plot1 = this.manager.getPlotIdAbs(this.plotworld, x, 0, z);
final PlotId plot2 = this.manager.getPlotIdAbs(this.plotworld, x2, 0, z2);
final PlotId plot1 = this.manager.getPlotIdAbs(this.plotworld, bx, 0, bz);
final PlotId plot2 = this.manager.getPlotIdAbs(this.plotworld, tx, 0, tz);
if ((plot1 != null) && (plot2 != null) && plot1.equals(plot2)) {
return;
}
}
if (this.o) {
populateBlocks(world, rand, X, Z, x, z, check);
populateBlocks(world, rand, cx, cz, bx, bz, check);
} else {
TaskManager.runTaskLater(new Runnable() {
@Override
public void run() {
populateBiome(world, x, z);
populateBiome(world, bx, bz);
}
}, 20 + rand.nextInt(10));
TaskManager.runTaskLater(new Runnable() {
@Override
public void run() {
chunk.load(true);
populateBlocks(world, rand, X, Z, x, z, check);
populateBlocks(world, rand, cx, cz, bx, bz, check);
}
}, 40 + rand.nextInt(40));
}