Fix safelogin for 1.18 and above by using worldProvider minHeight (#4715)

Pirgosth · web-flow · commit 739600eb0572 · 2021-12-26T23:56:03.000Z
diff --git a/Essentials/src/main/java/com/earth2me/essentials/utils/LocationUtil.java b/Essentials/src/main/java/com/earth2me/essentials/utils/LocationUtil.java
@@ -266,6 +266,7 @@ public static boolean shouldFly(IEssentials ess, final Location loc) {
         int y = (int) Math.round(loc.getY());
         final int z = loc.getBlockZ();
         int count = 0;
+        // Check whether more than 2 unsafe block are below player.
         while (LocationUtil.isBlockUnsafe(ess, world, x, y, z) && y >= ess.getWorldInfoProvider().getMinHeight(world)) {
             y--;
             count++;
@@ -274,7 +275,8 @@ public static boolean shouldFly(IEssentials ess, final Location loc) {
             }
         }
 
-        return y < 0;
+        // If not then check if player is in the void
+        return y < ess.getWorldInfoProvider().getMinHeight(world);
     }
 
     public static class Vector3D {

Original file line number	Diff line number	Diff line change
`@@ -266,6 +266,7 @@ public static boolean shouldFly(IEssentials ess, final Location loc) {`
`266`	`266`	`int y = (int) Math.round(loc.getY());`
`267`	`267`	`final int z = loc.getBlockZ();`
`268`	`268`	`int count = 0;`
	`269`	`+ // Check whether more than 2 unsafe block are below player.`
`269`	`270`	`while (LocationUtil.isBlockUnsafe(ess, world, x, y, z) && y >= ess.getWorldInfoProvider().getMinHeight(world)) {`
`270`	`271`	`y--;`
`271`	`272`	`count++;`
`@@ -274,7 +275,8 @@ public static boolean shouldFly(IEssentials ess, final Location loc) {`
`274`	`275`	`}`
`275`	`276`	`}`
`276`	`277`
`277`		`- return y < 0;`
	`278`	`+ // If not then check if player is in the void`
	`279`	`+ return y < ess.getWorldInfoProvider().getMinHeight(world);`
`278`	`280`	`}`
`279`	`281`
`280`	`282`	`public static class Vector3D {`