maj/Metropolis
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tweaked plot generation and checking again

Browse Source
This commit is contained in:
Tom Hicks
2012-03-06 00:59:35 -08:00
parent 0b51689f27
commit 3bff854de6
1 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Metropolis/src/main/java/com/majinnaibu/bukkitplugins/metropolis/MetropolisPlugin.java
View File

@@ -444,10 +444,13 @@ public class MetropolisPlugin extends JavaPlugin {
return; return;
} }
int roadWidth1 = roadWidth / 2;
int roadWidth2 = roadWidth - roadWidth1;
//North West Corner //North West Corner
if((roadMask & (ROAD_NORTH | ROAD_WEST)) != 0){ if((roadMask & (ROAD_NORTH | ROAD_WEST)) != 0){
for(x=plotCuboid.minX - roadWidth; x<plotCuboid.minX; x++){ for(x=plotCuboid.minX - roadWidth1; x<plotCuboid.minX; x++){
for(z=plotCuboid.minZ - roadWidth; z<plotCuboid.minZ; z++){ for(z=plotCuboid.minZ - roadWidth1; z<plotCuboid.minZ; z++){
setRoad(x, y, z); setRoad(x, y, z);
} }
} }
@@ -456,7 +459,7 @@ public class MetropolisPlugin extends JavaPlugin {
//North Strip //North Strip
if((roadMask & ROAD_NORTH) != 0){ if((roadMask & ROAD_NORTH) != 0){
for(x=plotCuboid.minX; x<=plotCuboid.maxX; x++){ for(x=plotCuboid.minX; x<=plotCuboid.maxX; x++){
for(z=plotCuboid.minZ - roadWidth; z<plotCuboid.minZ; z++){ for(z=plotCuboid.minZ - roadWidth1; z<plotCuboid.minZ; z++){
setRoad(x, y, z); setRoad(x, y, z);
} }
} }
@@ -464,8 +467,8 @@ public class MetropolisPlugin extends JavaPlugin {
//North East Corner //North East Corner
if((roadMask & (ROAD_NORTH | ROAD_EAST)) != 0){ if((roadMask & (ROAD_NORTH | ROAD_EAST)) != 0){
for(x=plotCuboid.maxX+1; x<=plotCuboid.maxX + roadWidth; x++){ for(x=plotCuboid.maxX+1; x<=plotCuboid.maxX + roadWidth2; x++){
for(z=plotCuboid.minZ - roadWidth; z<plotCuboid.minZ; z++){ for(z=plotCuboid.minZ - roadWidth1; z<plotCuboid.minZ; z++){
setRoad(x, y, z); setRoad(x, y, z);
} }
} }
@@ -473,7 +476,7 @@ public class MetropolisPlugin extends JavaPlugin {
//East Strip //East Strip
if((roadMask & ROAD_EAST) != 0){ if((roadMask & ROAD_EAST) != 0){
for(x=plotCuboid.maxX+1; x<=plotCuboid.maxX + roadWidth; x++){ for(x=plotCuboid.maxX+1; x<=plotCuboid.maxX + roadWidth2; x++){
for(z=plotCuboid.minZ; z<=plotCuboid.maxZ; z++){ for(z=plotCuboid.minZ; z<=plotCuboid.maxZ; z++){
setRoad(x, y, z); setRoad(x, y, z);
} }
@@ -482,8 +485,8 @@ public class MetropolisPlugin extends JavaPlugin {
//South East Corner //South East Corner
if((roadMask & (ROAD_SOUTH | ROAD_EAST)) != 0){ if((roadMask & (ROAD_SOUTH | ROAD_EAST)) != 0){
for(x=plotCuboid.maxX+1; x<=plotCuboid.maxX + roadWidth; x++){ for(x=plotCuboid.maxX+1; x<=plotCuboid.maxX + roadWidth2; x++){
for(z=plotCuboid.maxZ+1; z<=plotCuboid.maxZ + roadWidth; z++){ for(z=plotCuboid.maxZ+1; z<=plotCuboid.maxZ + roadWidth2; z++){
setRoad(x, y, z); setRoad(x, y, z);
} }
} }
@@ -492,7 +495,7 @@ public class MetropolisPlugin extends JavaPlugin {
//South Strip //South Strip
if((roadMask & ROAD_SOUTH) != 0){ if((roadMask & ROAD_SOUTH) != 0){
for(x=plotCuboid.minX; x<=plotCuboid.maxX; x++){ for(x=plotCuboid.minX; x<=plotCuboid.maxX; x++){
for(z=plotCuboid.maxZ+1; z<=plotCuboid.maxZ + roadWidth; z++){ for(z=plotCuboid.maxZ+1; z<=plotCuboid.maxZ + roadWidth2; z++){
setRoad(x, y, z); setRoad(x, y, z);
} }
} }
@@ -500,8 +503,8 @@ public class MetropolisPlugin extends JavaPlugin {
//South West Corner //South West Corner
if((roadMask & (ROAD_SOUTH | ROAD_WEST)) != 0){ if((roadMask & (ROAD_SOUTH | ROAD_WEST)) != 0){
for(x=plotCuboid.minX - roadWidth; x<plotCuboid.minX; x++){ for(x=plotCuboid.minX - roadWidth1; x<plotCuboid.minX; x++){
for(z=plotCuboid.maxZ+1; z<=plotCuboid.maxZ + roadWidth; z++){ for(z=plotCuboid.maxZ+1; z<=plotCuboid.maxZ + roadWidth2; z++){
setRoad(x, y, z); setRoad(x, y, z);
} }
} }
@@ -509,7 +512,7 @@ public class MetropolisPlugin extends JavaPlugin {
//West Strip //West Strip
if((roadMask & ROAD_WEST) != 0){ if((roadMask & ROAD_WEST) != 0){
for(x=plotCuboid.minX - roadWidth; x<plotCuboid.minX; x++){ for(x=plotCuboid.minX - roadWidth1; x<plotCuboid.minX; x++){
for(z=plotCuboid.minZ; z<=plotCuboid.maxZ; z++){ for(z=plotCuboid.minZ; z<=plotCuboid.maxZ; z++){
setRoad(x, y, z); setRoad(x, y, z);
} }
@@ -558,7 +561,7 @@ public class MetropolisPlugin extends JavaPlugin {
} }
public boolean isBlockOccupied(int row, int col){ public boolean isBlockOccupied(int row, int col){
Cuboid cuboid = new Cuboid(getPlotMin(row, col), getPlotMax(row, col)); Cuboid cuboid = new Cuboid(getGridMin(row, col), getGridMax(row, col));
for(Plot plot: _occupiedPlots){ for(Plot plot: _occupiedPlots){
if(plot.getCuboid().intersects(cuboid)){ if(plot.getCuboid().intersects(cuboid)){
return true; return true;
@@ -674,7 +677,7 @@ public class MetropolisPlugin extends JavaPlugin {
public BlockVector getPlotMax(int row, int col){ public BlockVector getPlotMax(int row, int col){
BlockVector gridMax = getGridMax(row, col); BlockVector gridMax = getGridMax(row, col);
return new BlockVector(gridMax.getBlockX() - roadWidth/2, gridMax.getBlockY(), gridMax.getBlockZ()-roadWidth/2); return new BlockVector(gridMax.getBlockX() - (int)Math.ceil(roadWidth/2.0f), gridMax.getBlockY(), gridMax.getBlockZ()-(int)Math.ceil(roadWidth/2.0f));
} }
public BlockVector getGridMax(int row, int col) { public BlockVector getGridMax(int row, int col) {