Upstream/WorldBorder-Updated-Fork
1
0
Fork 0
mirror of https://github.com/PryPurity/WorldBorder.git synced 2024-11-13 10:14:07 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated to 1.16.5, pulled commits, updated the height issue. No longer get teleported back to spawn.

Browse Source
This commit is contained in:
PryPurity 2021-03-24 17:35:52 -05:00
parent d84af3f2c5
commit ffcf3ab5f8
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -386,8 +386,13 @@ public class BorderData {
// check if a particular spot consists of 2 breathable blocks over something relatively solid
private boolean isSafeSpot(World world, int X, int Y, int Z, boolean flying) {
boolean safe = safeOpenBlocks.contains(world.getBlockAt(X, Y, Z).getType()) // target block open and safe
&& safeOpenBlocks.contains(world.getBlockAt(X, Y + 1, Z).getType()); // above target block open and safe
boolean safe =
// target block open and safe or is above maximum Y coordinate
(Y == world.getMaxHeight()
|| (safeOpenBlocks.contains(world.getBlockAt(X, Y, Z).getType())
// above target block open and safe or is above maximum Y coordinate
&& (Y + 1 == world.getMaxHeight()
|| safeOpenBlocks.contains(world.getBlockAt(X, Y + 1, Z).getType()))));
if (!safe || flying)
return safe;
@ -402,7 +407,7 @@ public class BorderData {
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
final boolean isNether = world.getEnvironment() == World.Environment.NETHER;
int limTop = isNether ? 125 : world.getMaxHeight() - 2;
int limTop = isNether ? 125 : world.getMaxHeight();
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
@ -425,7 +430,7 @@ public class BorderData {
// 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;
limTop = highestBlockBoundary + 1;
// 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++) {
@ -436,7 +441,7 @@ public class BorderData {
}
// Look above.
if (y2 < limTop && y2 != y1) {
if (y2 <= limTop && y2 != y1) {
if (isSafeSpot(world, X, y2, Z, flying))
return y2;
}

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

@ -7,7 +7,6 @@ main: com.wimbli.WorldBorder.WorldBorder
softdepend:
- dynmap
- Multiverse-Core
- Hyperverse
commands:
wborder:
description: Primary command for WorldBorder.