Upstream
/
WorldBorder
mirror of https://github.com/Brettflan/WorldBorder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix bugs with config implementation

This commit is contained in:
spaceFountain 2015-02-26 09:45:48 -05:00
parent 3265545dd2
commit 741308239a
2 changed files with 26 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/com/wimbli/WorldBorder/BorderData.java
View File

@ -279,20 +279,20 @@ public class BorderData
double originalY = yLoc;
yLoc = getSafeY(loc.getWorld(), ixLoc, Location.locToBlock(yLoc), izLoc, flying);
int searchArea = Config.getSearchArea();
if (yLoc == -1)
{
for (int cX = ixLoc - searchArea; cX <= ixLoc + searchArea; ++cX)
{
for (int cZ = izLoc - searchArea; cZ <= izLoc + searchArea; ++cZ)
{
int searchArea = Config.getSearchArea();
for (int cX = ixLoc - searchArea; cX <= ixLoc + searchArea; ++cX) {
for (int cZ = izLoc - searchArea; cZ <= izLoc + searchArea; ++cZ) {
if (cX == ixLoc && cZ == izLoc)
return null;
continue; // Skips the block that was already checked
if (insideBorder(new CoordXZ(cX, cZ)))
continue;
ixLoc = cX;
izLoc = cZ;
if (insideBorder(new CoordXZ(ixLoc, izLoc)))
continue;
// Make sure the chunk we're checking in is actually loaded
tChunk = loc.getWorld().getChunkAt(CoordXZ.blockToChunk(ixLoc), CoordXZ.blockToChunk(izLoc));
@ -300,20 +300,27 @@ public class BorderData
tChunk.load();
yLoc = getSafeY(loc.getWorld(), ixLoc, Location.locToBlock(yLoc), izLoc, flying);
if (yLoc != -1)
if (yLoc != -1) {
xLoc = cX;
zLoc = cZ;
ixLoc = Location.locToBlock(xLoc);
izLoc = Location.locToBlock(zLoc);
break;
}
}
if (yLoc != -1)
break;
}
if (!Config.getFixTpTarget())
ixLoc = Location.locToBlock(xLoc);
izLoc = Location.locToBlock(zLoc);
loc.getWorld().getBlockAt(ixLoc, Location.locToBlock(originalY) - 1, izLoc).setType(Material.STONE);
loc.getWorld().getBlockAt(ixLoc, Location.locToBlock(originalY), izLoc).setType(Material.AIR);
loc.getWorld().getBlockAt(ixLoc, Location.locToBlock(originalY) + 1, izLoc).setType(Material.AIR);
return new Location(loc.getWorld(), Math.floor(xLoc) + 0.5, originalY, Math.floor(zLoc) + 0.5, loc.getYaw(), loc.getPitch());
if (yLoc == -1)
{
if (Config.getFixTpTarget()) {
loc.getWorld().getBlockAt(ixLoc, Location.locToBlock(originalY) - 1, izLoc).setType(Material.STONE);
loc.getWorld().getBlockAt(ixLoc, Location.locToBlock(originalY), izLoc).setType(Material.AIR);
loc.getWorld().getBlockAt(ixLoc, Location.locToBlock(originalY) + 1, izLoc).setType(Material.AIR);
return new Location(loc.getWorld(), Math.floor(xLoc) + 0.5, originalY, Math.floor(zLoc) + 0.5, loc.getYaw(), loc.getPitch());
}
return null;
}
return new Location(loc.getWorld(), Math.floor(xLoc) + 0.5, yLoc, Math.floor(zLoc) + 0.5, loc.getYaw(), loc.getPitch());
}
return new Location(loc.getWorld(), Math.floor(xLoc) + 0.5, yLoc, Math.floor(zLoc) + 0.5, loc.getYaw(), loc.getPitch());

2
src/main/resources/plugin.yml
View File

@ -1,7 +1,7 @@
name: WorldBorder
author: Brettflan
description: Efficient, feature-rich plugin for limiting the size of your worlds.
version: 1.8.1
version: 1.8.2
main: com.wimbli.WorldBorder.WorldBorder
softdepend:
- dynmap