Upstream
/
WorldBorder
mirror of https://github.com/Brettflan/WorldBorder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

minor cleanup

This commit is contained in:
Brettflan 2018-09-16 09:39:27 -05:00
parent e5feeb1b75
commit 1d35e59c0e
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/com/wimbli/WorldBorder/WorldFileData.java
View File

@ -127,22 +127,23 @@ public class WorldFileData
CoordXZ region = new CoordXZ(CoordXZ.chunkToRegion(x), CoordXZ.chunkToRegion(z)); CoordXZ region = new CoordXZ(CoordXZ.chunkToRegion(x), CoordXZ.chunkToRegion(z));
List<Boolean> regionChunks = this.getRegionData(region); List<Boolean> regionChunks = this.getRegionData(region);
// Bukkit.getLogger().info("x: "+x+" z: "+z+" offset: "+coordToRegionOffset(x, z)); // Bukkit.getLogger().info("x: "+x+" z: "+z+" offset: "+coordToRegionOffset(x, z));
return regionChunks.get(coordToRegionOffset(x, z)).booleanValue(); return regionChunks.get(coordToRegionOffset(x, z));
} }
// Find out if the chunk at the given coordinates has been fully generated. // Find out if the chunk at the given coordinates has been fully generated.
// Minecraft only fully generates a chunk when adjacent chunks are also loaded. // Minecraft only fully generates a chunk when adjacent chunks are also loaded.
public boolean isChunkFullyGenerated(int x, int z) public boolean isChunkFullyGenerated(int x, int z)
{ // if all adjacent chunks exist, it should be a safe enough bet that this one is fully generated { // if all adjacent chunks exist, it should be a safe enough bet that this one is fully generated
// For 1.13+, due to world gen changes, this is now effectively a 3 chunk radius requirement vs a 1 chunk radius // For 1.13+, due to world gen changes, this is now effectively a 3 chunk radius requirement vs a 1 chunk radius
for (int xx = x-3; xx <= x+3; xx++) { for (int xx = x-3; xx <= x+3; xx++)
for (int zz = z-3; zz <= z+3; zz++) { {
if (!doesChunkExist(xx, zz)) { for (int zz = z-3; zz <= z+3; zz++)
return false; {
} if (!doesChunkExist(xx, zz))
} return false;
} }
return true; }
return true;
} }
// Method to let us know a chunk has been generated, to update our region map. // Method to let us know a chunk has been generated, to update our region map.
@ -202,14 +203,13 @@ public class WorldFileData
counter++; counter++;
} }
// Read timestamps // Read timestamps
for (int j = 0; j < 1024; j++) for (int j = 0; j < 1024; j++)
{ {
// if timestamp is zero, it is protochunk (ignore it) // if timestamp is zero, it is protochunk (ignore it)
if ((regionData.readInt() == 0) && data.get(j)) { if ((regionData.readInt() == 0) && data.get(j))
data.set(j, false); data.set(j, false);
} counter++;
counter++; }
}
regionData.close(); regionData.close();
} }
catch (FileNotFoundException ex) catch (FileNotFoundException ex)