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

Fixes #577

Browse Source
This commit is contained in:
boy0001
2015-09-01 08:51:51 +10:00
parent 9accbd5ea7
commit 29da0da8bb
16 changed files with 93 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/intellectualcrafters/plot/generator/SquarePlotManager.java
View File

@ -27,7 +27,7 @@ public abstract class SquarePlotManager extends GridPlotManager {
final int pz = plotid.y;
final int x = dpw.ROAD_OFFSET_X + (px * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH)) - ((int) Math.floor(dpw.ROAD_WIDTH / 2)) - 1;
final int z = dpw.ROAD_OFFSET_Z + (pz * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH)) - ((int) Math.floor(dpw.ROAD_WIDTH / 2)) - 1;
return new Location(plotworld.worldname, x, 255, z);
return new Location(plotworld.worldname, x, Math.min(plotworld.MAX_BUILD_HEIGHT, 255), z);
}
@Override
@ -178,6 +178,6 @@ public abstract class SquarePlotManager extends GridPlotManager {
final int pz = plotid.y;
final int x = dpw.ROAD_OFFSET_X + (px * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH)) - dpw.PLOT_WIDTH - ((int) Math.floor(dpw.ROAD_WIDTH / 2)) - 1;
final int z = dpw.ROAD_OFFSET_Z + (pz * (dpw.ROAD_WIDTH + dpw.PLOT_WIDTH)) - dpw.PLOT_WIDTH - ((int) Math.floor(dpw.ROAD_WIDTH / 2)) - 1;
return new Location(plotworld.worldname, x, 1, z);
return new Location(plotworld.worldname, x, plotworld.MIN_BUILD_HEIGHT, z);
}
}

4
src/main/java/com/intellectualcrafters/plot/object/Plot.java
View File

@ -718,7 +718,7 @@ public class Plot {
* Get the biome (String)
*/
public String getBiome() {
final Location loc = getBottom().add(1, 0, 1);
final Location loc = getBottom();
return BlockManager.manager.getBiome(loc.getWorld(), loc.getX(), loc.getZ());
}
@ -735,7 +735,7 @@ public class Plot {
* @return
*/
public Location getBottom() {
return MainUtil.getPlotBottomLoc(world, id);
return MainUtil.getPlotBottomLoc(world, id).add(1, 0, 1);
}
/**

4
src/main/java/com/intellectualcrafters/plot/object/PlotWorld.java
View File

@ -61,6 +61,7 @@ public abstract class PlotWorld {
public final static boolean WORLD_BORDER_DEFAULT = false;
public final static int MAX_PLOT_MEMBERS_DEFAULT = 128;
public final static int MAX_BUILD_HEIGHT_DEFAULT = 256;
public final static int MIN_BUILD_HEIGHT_DEFAULT = 1;
public final static PlotGamemode GAMEMODE_DEFAULT = PlotGamemode.CREATIVE;
// are plot clusters enabled
// require claim in cluster
@ -97,6 +98,7 @@ public abstract class PlotWorld {
public boolean HOME_ALLOW_NONMEMBER;
public PlotLoc DEFAULT_HOME;
public int MAX_BUILD_HEIGHT;
public int MIN_BUILD_HEIGHT;
public PlotGamemode GAMEMODE = PlotGamemode.CREATIVE;
public PlotWorld(final String worldname) {
@ -154,6 +156,7 @@ public abstract class PlotWorld {
this.PLOT_CHAT = config.getBoolean("chat.enabled");
this.WORLD_BORDER = config.getBoolean("world.border");
this.MAX_BUILD_HEIGHT = config.getInt("world.max_height");
this.MIN_BUILD_HEIGHT = config.getInt("min.max_height");
switch (config.getString("world.gamemode").toLowerCase()) {
case "survival":
@ -260,6 +263,7 @@ public abstract class PlotWorld {
options.put("home.default", "side");
options.put("home.allow-nonmembers", false);
options.put("world.max_height", PlotWorld.MAX_BUILD_HEIGHT_DEFAULT);
options.put("world.min_height", PlotWorld.MIN_BUILD_HEIGHT_DEFAULT);
options.put("world.gamemode", PlotWorld.GAMEMODE_DEFAULT.name().toLowerCase());
if (Settings.ENABLE_CLUSTERS && (this.TYPE != 0)) {

17
src/main/java/com/intellectualcrafters/plot/object/RegionWrapper.java
View File

@ -3,6 +3,8 @@ package com.intellectualcrafters.plot.object;
public class RegionWrapper {
public final int minX;
public final int maxX;
public final int minY;
public final int maxY;
public final int minZ;
public final int maxZ;
@ -11,6 +13,21 @@ public class RegionWrapper {
this.minX = minX;
this.maxZ = maxZ;
this.minZ = minZ;
this.minY = 0;
this.maxY = 256;
}
public RegionWrapper(final int minX, final int maxX, final int minY, final int maxY, final int minZ, final int maxZ) {
this.maxX = maxX;
this.minX = minX;
this.maxZ = maxZ;
this.minZ = minZ;
this.minY = minY;
this.maxY = maxY;
}
public boolean isIn(final int x, final int y, final int z) {
return ((x >= this.minX) && (x <= this.maxX) && (z >= this.minZ) && (z <= this.maxZ) && (y >= this.minY) && (y <= this.maxY));
}
public boolean isIn(final int x, final int z) {

2
src/main/java/com/intellectualcrafters/plot/util/BO3Handler.java
View File

@ -46,7 +46,7 @@ public class BO3Handler {
return false;
}
String alias = plot.toString();
Location pos1 = plot.getBottom().add(1, 0, 1);
Location pos1 = plot.getBottom();
Location pos2 = plot.getTop();
ClassicPlotWorld cpw = (ClassicPlotWorld) plotworld;
int height = cpw.PLOT_HEIGHT;

8
src/main/java/com/intellectualcrafters/plot/util/MainUtil.java
View File

@ -1076,7 +1076,7 @@ public class MainUtil {
return false;
}
long start = System.currentTimeMillis();
ChunkManager.manager.clearAllEntities(plot.getBottom().add(1, 0, 1), plot.getTop());
ChunkManager.manager.clearAllEntities(plot.getBottom(), plot.getTop());
if (isDelete) {
removeSign(plot);
}
@ -1200,7 +1200,7 @@ public class MainUtil {
}
public static void setBiome(final Plot plot, final String biome, final Runnable whenDone) {
Location pos1 = plot.getBottom().add(1, 0, 1);
Location pos1 = plot.getBottom();
Location pos2 = plot.getTop();
ChunkManager.chunkTask(pos1, pos2, new RunnableVal<int[]>() {
@Override
@ -1348,7 +1348,11 @@ public class MainUtil {
* @param id
*
* @return Location bottom of mega plot
*
* @deprecated Incorrect offset / legacy / use plot.getBottom()
*
*/
@Deprecated
public static Location getPlotBottomLoc(final String world, PlotId id) {
final Plot plot = PS.get().getPlot(world, id);
if (plot != null) {

2
src/main/java/com/intellectualcrafters/plot/util/SchematicHandler.java
View File

@ -164,7 +164,7 @@ public abstract class SchematicHandler {
// Validate dimensions
Location bottom = plot.getBottom();
Location top = plot.getTop();
if (top.getX() - bottom.getX() < WIDTH || top.getZ() - bottom.getZ() < LENGTH || HEIGHT > 256) {
if (top.getX() - bottom.getX() + 1 < WIDTH || top.getZ() - bottom.getZ() + 1 < LENGTH || HEIGHT > 256) {
PS.debug("Schematic is too large");
TaskManager.runTask(whenDone);
return;