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

Fixed some plot calculations because roads are outside of plots now.

Browse Source
This commit is contained in:
Tom Hicks
2012-03-05 16:10:01 -08:00
parent d5cd43e469
commit 3588ca0a2e
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -65,7 +65,11 @@ public class MetropolisPlugin extends JavaPlugin {
int size = 1; int size = 1;
private int plotSizeX = 24; private int plotSizeX = 24;
private int plotSizeY = 256;
private int plotSizeZ = 24; private int plotSizeZ = 24;
private int gridSizeX = 28;
private int gridSizeY = 256;
private int gridSizeZ = 28;
private int roadWidth = 4; private int roadWidth = 4;
private int roadLevel = 62; private int roadLevel = 62;
private int spaceAboveRoad = 2; private int spaceAboveRoad = 2;
@@ -187,6 +191,10 @@ public class MetropolisPlugin extends JavaPlugin {
throw new RuntimeException(String.format("The world %s does not exist", worldName)); throw new RuntimeException(String.format("The world %s does not exist", worldName));
} }
gridSizeX = plotSizeX + roadWidth;
gridSizeY = world.getMaxHeight();
gridSizeZ = plotSizeZ + roadWidth;
regionManager = worldGuard.getRegionManager(world); regionManager = worldGuard.getRegionManager(world);
if(regionManager == null){ if(regionManager == null){
throw new RuntimeException("WorldGuard regions don't seem to be enabled."); throw new RuntimeException("WorldGuard regions don't seem to be enabled.");
@@ -638,23 +646,39 @@ public class MetropolisPlugin extends JavaPlugin {
} }
public BlockVector getPlotMin(int row, int col){ public BlockVector getPlotMin(int row, int col){
return new BlockVector(col * plotSizeX, 0, row * plotSizeZ); BlockVector gridMin = getGridMin(row, col);
return new BlockVector(gridMin.getBlockX() + roadWidth/2, gridMin.getBlockY(), gridMin.getBlockZ() + roadWidth/2);
}
public BlockVector getGridMin(int row, int col){
int level = 0;
return new BlockVector(col * gridSizeX, level * gridSizeY, row * gridSizeZ);
} }
public BlockVector getPlotMax(int row, int col){ public BlockVector getPlotMax(int row, int col){
return new BlockVector(col * plotSizeX + plotSizeX-1, 128, row * plotSizeZ + plotSizeZ-1); BlockVector gridMax = getGridMax(row, col);
return new BlockVector(gridMax.getBlockX() - roadWidth/2, gridMax.getBlockY(), gridMax.getBlockZ()-roadWidth/2);
}
public BlockVector getGridMax(int row, int col) {
int level = 0;
return new BlockVector((col+1) * gridSizeX - 1, (level+1) * gridSizeY - 1, (row+1) * gridSizeZ - 1);
} }
private int getPlotXFromMin(Cuboid cuboid) { private int getPlotXFromMin(Cuboid cuboid) {
int minX = cuboid.getMin().getBlockX() - roadWidth/2; int minX = cuboid.getMin().getBlockX() - roadWidth/2;
return minX/plotSizeX; return minX/gridSizeX;
} }
private int getPlotZFromMin(Cuboid cuboid) { private int getPlotZFromMin(Cuboid cuboid) {
int minZ = cuboid.getMin().getBlockZ() - roadWidth/2; int minZ = cuboid.getMin().getBlockZ() - roadWidth/2;
return minZ/plotSizeZ; return minZ/gridSizeZ;
} }
private void setHomeOccupied(String owner, BlockVector minimumPoint, BlockVector maximumPoint) { private void setHomeOccupied(String owner, BlockVector minimumPoint, BlockVector maximumPoint) {