Upstream/WorldBorder
1
0
Fork 0
mirror of https://github.com/Brettflan/WorldBorder.git synced 2024-11-25 19:45:56 +01:00
Code Issues Projects Releases Wiki Activity

Implemented world wrapping capability

Browse Source
This commit is contained in:
Nikita Pekin 2013-04-03 16:19:51 -04:00
parent 8006e1f0fd
commit d6bea2b616
2 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -200,14 +200,28 @@ public class BorderData
// square border // square border
if (!round) if (!round)
{ {
if (xLoc <= minX) if (Config.isWrapping())
xLoc = minX + Config.KnockBack(); {
else if (xLoc >= maxX) if (xLoc <= minX)
xLoc = maxX - Config.KnockBack(); xLoc = maxX - Config.KnockBack();
if (zLoc <= minZ) else if (xLoc >= maxX)
zLoc = minZ + Config.KnockBack(); xLoc = minX + Config.KnockBack();
else if (zLoc >= maxZ) if (zLoc <= minZ)
zLoc = maxZ - Config.KnockBack(); zLoc = maxZ - Config.KnockBack();
else if (zLoc >= maxZ)
zLoc = minZ + Config.KnockBack();
}
else
{
if (xLoc <= minX)
xLoc = minX + Config.KnockBack();
else if (xLoc >= maxX)
xLoc = maxX - Config.KnockBack();
if (zLoc <= minZ)
zLoc = minZ + Config.KnockBack();
else if (zLoc >= maxZ)
zLoc = maxZ - Config.KnockBack();
}
} }
// round border // round border
@ -222,8 +236,14 @@ public class BorderData
double dU = Math.sqrt(dX *dX + dZ * dZ); //distance of the untransformed point from the center double dU = Math.sqrt(dX *dX + dZ * dZ); //distance of the untransformed point from the center
double dT = Math.sqrt(dX *dX / radiusXSquared + dZ * dZ / radiusZSquared); //distance of the transformed point from the center double dT = Math.sqrt(dX *dX / radiusXSquared + dZ * dZ / radiusZSquared); //distance of the transformed point from the center
double f = (1 / dT - Config.KnockBack() / dU); //"correction" factor for the distances double f = (1 / dT - Config.KnockBack() / dU); //"correction" factor for the distances
xLoc = x + dX * f; if (Config.isWrapping())
zLoc = z + dZ * f; {
xLoc = x - dX * f;
zLoc = z - dZ * f;
} else {
xLoc = x + dX * f;
zLoc = z + dZ * f;
}
} }
int ixLoc = Location.locToBlock(xLoc); int ixLoc = Location.locToBlock(xLoc);
@ -320,4 +340,4 @@ public class BorderData
{ {
return (((int)(this.x * 10) << 4) + (int)this.z + (this.radiusX << 2) + (this.radiusZ << 3)); return (((int)(this.x * 10) << 4) + (int)this.z + (this.radiusX << 2) + (this.radiusZ << 3));
} }
} }

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

@ -29,7 +29,7 @@ public class Config
public static WorldTrimTask trimTask; public static WorldTrimTask trimTask;
private static Set<String> bypassPlayers = Collections.synchronizedSet(new LinkedHashSet<String>()); private static Set<String> bypassPlayers = Collections.synchronizedSet(new LinkedHashSet<String>());
private static Runtime rt = Runtime.getRuntime(); private static Runtime rt = Runtime.getRuntime();
// actual configuration values which can be changed // actual configuration values which can be changed
private static boolean shapeRound = true; private static boolean shapeRound = true;
private static Map<String, BorderData> borders = Collections.synchronizedMap(new LinkedHashMap<String, BorderData>()); private static Map<String, BorderData> borders = Collections.synchronizedMap(new LinkedHashMap<String, BorderData>());
@ -40,6 +40,7 @@ public class Config
private static boolean whooshEffect = false; private static boolean whooshEffect = false;
private static boolean dynmapEnable = true; private static boolean dynmapEnable = true;
private static String dynmapMessage; private static String dynmapMessage;
private static boolean isWrapping = false;
// for monitoring plugin efficiency // for monitoring plugin efficiency
// public static long timeUsed = 0; // public static long timeUsed = 0;
@ -303,6 +304,9 @@ public class Config
LogConfig("Border-checking timed task stopped."); LogConfig("Border-checking timed task stopped.");
} }
public static boolean isWrapping() {
retirn isWrapping;
}
public static void StopFillTask() public static void StopFillTask()
{ {
@ -382,7 +386,7 @@ public class Config
} }
private static final int currentCfgVersion = 6; private static final int currentCfgVersion = 7;
public static void load(WorldBorder master, boolean logIt) public static void load(WorldBorder master, boolean logIt)
{ // load config from file { // load config from file
@ -401,6 +405,7 @@ public class Config
timerTicks = cfg.getInt("timer-delay-ticks", 5); timerTicks = cfg.getInt("timer-delay-ticks", 5);
dynmapEnable = cfg.getBoolean("dynmap-border-enabled", true); dynmapEnable = cfg.getBoolean("dynmap-border-enabled", true);
dynmapMessage = cfg.getString("dynmap-border-message", "The border of the world."); dynmapMessage = cfg.getString("dynmap-border-message", "The border of the world.");
isWrapping = cfg.getBoolean("wrapping-world", false);
LogConfig("Using " + (ShapeName()) + " border, knockback of " + knockBack + " blocks, and timer delay of " + timerTicks + "."); LogConfig("Using " + (ShapeName()) + " border, knockback of " + knockBack + " blocks, and timer delay of " + timerTicks + ".");
StartBorderTimer(); StartBorderTimer();
@ -483,6 +488,7 @@ public class Config
cfg.set("timer-delay-ticks", timerTicks); cfg.set("timer-delay-ticks", timerTicks);
cfg.set("dynmap-border-enabled", dynmapEnable); cfg.set("dynmap-border-enabled", dynmapEnable);
cfg.set("dynmap-border-message", dynmapMessage); cfg.set("dynmap-border-message", dynmapMessage);
cfg.set("wrapping-world", isWrapping);
cfg.set("worlds", null); cfg.set("worlds", null);
Iterator world = borders.entrySet().iterator(); Iterator world = borders.entrySet().iterator();