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

Merge pull request #58 from Kagamul/master

Browse Source 
fixes #57
This commit is contained in:
Brett Flannigan 2016-02-25 22:52:33 -06:00
commit c5df3417c8
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -321,7 +321,33 @@ public class BorderData
private double getSafeY(World world, int X, int Y, int Z, boolean flying) private double getSafeY(World world, int X, int Y, int Z, boolean flying)
{ {
// artificial height limit of 127 added for Nether worlds since CraftBukkit still incorrectly returns 255 for their max height, leading to players sent to the "roof" of the Nether // artificial height limit of 127 added for Nether worlds since CraftBukkit still incorrectly returns 255 for their max height, leading to players sent to the "roof" of the Nether
final int limTop = (world.getEnvironment() == World.Environment.NETHER) ? 125 : world.getMaxHeight() - 2; final boolean isNether = world.getEnvironment() == World.Environment.NETHER;
int limTop = isNether ? 125 : world.getMaxHeight() - 2;
final int highestBlockBoundary = Math.min(world.getHighestBlockYAt(X, Z) + 1, limTop);
// if Y is larger than the world can be and user can fly, return Y - Unless we are in the Nether, we might not want players on the roof
if (flying && Y > limTop && !isNether)
return (double) Y;
// make sure Y values are within the boundaries of the world.
if (Y > limTop)
{
if (isNether)
Y = limTop; // because of the roof, the nether can not rely on highestBlockBoundary, so limTop has to be used
else
{
if (flying)
Y = limTop;
else
Y = highestBlockBoundary; // there will never be a save block to stand on for Y values > highestBlockBoundary
}
}
if (Y < limBot)
Y = limBot;
// for non Nether worlds we don't need to check upwards to the world-limit, it is enough to check up to the highestBlockBoundary, unless player is flying
if (!isNether && !flying)
limTop = highestBlockBoundary;
// Expanding Y search method adapted from Acru's code in the Nether plugin // Expanding Y search method adapted from Acru's code in the Nether plugin
for(int y1 = Y, y2 = Y; (y1 > limBot) || (y2 < limTop); y1--, y2++){ for(int y1 = Y, y2 = Y; (y1 > limBot) || (y2 < limTop); y1--, y2++){