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

)
EssentialsX · Dec 26, 2021 · 739600e · 739600e
1 parent 5f98d3f
commit 739600e
Showing 1 changed file with 3 additions and 1 deletion.
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 {