Skip to content

Fix: /back onto nether roof exploit when destination is unsafe. #6602

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MidSpike wants to merge 1 commit into
base: 2.x
Choose a base branch
from
+10 −0
Open

Fix: /back onto nether roof exploit when destination is unsafe. #6602

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions Essentials/src/main/java/com/earth2me/essentials/utils/LocationUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,13 @@ public static boolean isBlockOutsideWorldBorder(final World world, final int x,
return x < x1 || x > x2 || z < z1 || z > z2;
}

public static boolean isAboveNetherRoof(final World world, final int x, final int y, final int z) {
if (world.getEnvironment() != World.Environment.NETHER) {
return false;
}
return y >= world.getHighestBlockYAt(x, z);
}

public static int getXInsideWorldBorder(final World world, final int x) {
final Location center = world.getWorldBorder().getCenter();
final int radius = (int) world.getWorldBorder().getSize() / 2;
Expand Down Expand Up @@ -277,6 +284,9 @@ public static Location getSafeDestination(IEssentials ess, final Location loc) t
}
}
}
if (isAboveNetherRoof(world, x, y, z)) {
y = world.getHighestBlockYAt(x, z) - 1;
}
return new Location(world, x + 0.5, y, z + 0.5, loc.getYaw(), loc.getPitch());
}

Expand Down