Improved spawnpoint obstruction check

JellyLabScripts · Dec 22, 2023 · dcf9a37 · dcf9a37
1 parent 3a27226
commit dcf9a37
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/src/main/java/com/jelly/farmhelperv2/feature/impl/PestsDestroyer.java b/src/main/java/com/jelly/farmhelperv2/feature/impl/PestsDestroyer.java
@@ -401,11 +401,13 @@ public void onTickExecute(TickEvent.ClientTickEvent event) {
                         Multithreading.schedule(() -> {
                             mc.thePlayer.sendChatMessage("/warp garden");
                             Multithreading.schedule(() -> {
-                                if (PlayerUtils.isStandingOnSpawnPoint() && hasBlockAboveThePlayer()) {
+                                if (!BlockUtils.canFlyHigher(5)) {
                                     LogUtils.sendError("[Pests Destroyer] Your spawnpoint is obstructed! Make sure there is no block above your spawnpoint!");
                                     stop();
-                                } else
+                                } else {
                                     state = States.GET_LOCATION;
+                                    LogUtils.sendDebug("[Pests Destroyer] Spawnpoint is not obstructed");
+                                }
                             }, (long) (600 + Math.random() * 300), TimeUnit.MILLISECONDS);
                         }, (long) (600 + Math.random() * 300), TimeUnit.MILLISECONDS);
                         return;

diff --git a/src/main/java/com/jelly/farmhelperv2/util/BlockUtils.java b/src/main/java/com/jelly/farmhelperv2/util/BlockUtils.java
@@ -330,6 +330,22 @@ public static boolean canWalkThroughDoor(BlockPos blockPos, Direction direction)
         return canWalkThroughDoorWithDirection(direction, playerFacing, doorFacing, standingOnDoor);
     }
 
+    public static boolean canFlyHigher(int distance) {
+        AxisAlignedBB playerAABB = mc.thePlayer.getEntityBoundingBox();
+        Vec3[] corners = {
+                new Vec3(playerAABB.minX + 0.0001, playerAABB.minY + mc.thePlayer.height, playerAABB.minZ + 0.0001),
+                new Vec3(playerAABB.minX + 0.0001, playerAABB.minY + mc.thePlayer.height, playerAABB.maxZ - 0.0001),
+                new Vec3(playerAABB.maxX - 0.0001, playerAABB.minY + mc.thePlayer.height, playerAABB.minZ + 0.0001),
+                new Vec3(playerAABB.maxX - 0.0001, playerAABB.minY + mc.thePlayer.height, playerAABB.maxZ - 0.0001)
+        };
+        for (Vec3 corner : corners) {
+            if (mc.theWorld.rayTraceBlocks(corner, corner.addVector(0, distance, 0)) != null) {
+                return false;
+            }
+        }
+        return true;
+    }
+
     public static BlockPos getBlockPosLookingAt() {
         MovingObjectPosition mop = mc.thePlayer.rayTrace(5, 1);
         if (mop == null)