Upstream/WorldBorder
1
0
Fork 0
mirror of https://github.com/Brettflan/WorldBorder.git synced 2024-11-26 03:55:57 +01:00
Code Issues Projects Releases Wiki Activity

Release 1.7.1; for real this time, without a nasty bug, and with wrapping value properly retained after running other commands such as radius or wshape

Browse Source
This commit is contained in:
Brettflan 2013-04-14 06:39:48 -05:00
parent 60c124643f
commit b074a34ee3
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/wimbli/WorldBorder/BorderData.java
View File

@ -61,7 +61,7 @@ public class BorderData
} }
public final void setData(double x, double z, int radiusX, int radiusZ, Boolean shapeRound) public final void setData(double x, double z, int radiusX, int radiusZ, Boolean shapeRound)
{ {
setData(x, z, radiusZ, radiusZ, shapeRound, false); setData(x, z, radiusX, radiusZ, shapeRound, false);
} }
public final void setData(double x, double z, int radius, Boolean shapeRound) public final void setData(double x, double z, int radius, Boolean shapeRound)
{ {

18
src/com/wimbli/WorldBorder/Config.java
View File

@ -61,13 +61,16 @@ public class Config
public static void setBorder(String world, int radiusX, int radiusZ, double x, double z, Boolean shapeRound) public static void setBorder(String world, int radiusX, int radiusZ, double x, double z, Boolean shapeRound)
{ {
setBorder(world, new BorderData(x, z, radiusX, radiusZ, shapeRound)); BorderData old = Border(world);
boolean oldWrap = (old == null) ? false : old.getWrapping();
setBorder(world, new BorderData(x, z, radiusX, radiusZ, shapeRound, oldWrap));
} }
public static void setBorder(String world, int radiusX, int radiusZ, double x, double z) public static void setBorder(String world, int radiusX, int radiusZ, double x, double z)
{ {
BorderData old = Border(world); BorderData old = Border(world);
Boolean oldShape = (old == null) ? null : old.getShape(); Boolean oldShape = (old == null) ? null : old.getShape();
setBorder(world, new BorderData(x, z, radiusX, radiusZ, oldShape)); boolean oldWrap = (old == null) ? false : old.getWrapping();
setBorder(world, new BorderData(x, z, radiusX, radiusZ, oldShape, oldWrap));
} }
@ -83,19 +86,24 @@ public class Config
// set border based on corner coordinates // set border based on corner coordinates
public static void setBorderCorners(String world, double x1, double z1, double x2, double z2, Boolean shapeRound) public static void setBorderCorners(String world, double x1, double z1, double x2, double z2, Boolean shapeRound, boolean wrap)
{ {
double radiusX = Math.abs(x1 - x2) / 2; double radiusX = Math.abs(x1 - x2) / 2;
double radiusZ = Math.abs(z1 - z2) / 2; double radiusZ = Math.abs(z1 - z2) / 2;
double x = ((x1 < x2) ? x1 : x2) + radiusX; double x = ((x1 < x2) ? x1 : x2) + radiusX;
double z = ((z1 < z2) ? z1 : z2) + radiusZ; double z = ((z1 < z2) ? z1 : z2) + radiusZ;
setBorder(world, new BorderData(x, z, (int)Math.round(radiusX), (int)Math.round(radiusZ), shapeRound)); setBorder(world, new BorderData(x, z, (int)Math.round(radiusX), (int)Math.round(radiusZ), shapeRound, wrap));
}
public static void setBorderCorners(String world, double x1, double z1, double x2, double z2, Boolean shapeRound)
{
setBorderCorners(world, x1, z1, x2, z2, shapeRound, false);
} }
public static void setBorderCorners(String world, double x1, double z1, double x2, double z2) public static void setBorderCorners(String world, double x1, double z1, double x2, double z2)
{ {
BorderData old = Border(world); BorderData old = Border(world);
Boolean oldShape = (old == null) ? null : old.getShape(); Boolean oldShape = (old == null) ? null : old.getShape();
setBorderCorners(world, x1, z1, x2, z2, oldShape); boolean oldWrap = (old == null) ? false : old.getWrapping();
setBorderCorners(world, x1, z1, x2, z2, oldShape, oldWrap);
} }