fix 10517 (#10521)

Fix clearing trying to reach unreachable places
ldtteam · Dec 9, 2024 · e187d0c · e187d0c
1 parent 30d6fd5
commit e187d0c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/main/java/com/minecolonies/core/entity/ai/workers/AbstractEntityAIInteract.java b/src/main/java/com/minecolonies/core/entity/ai/workers/AbstractEntityAIInteract.java
@@ -140,7 +140,7 @@ protected final boolean mineBlock(@NotNull final BlockPos blockToMine)
      * @param safeStand   the block we want to stand on to do that
      * @return true once we're done
      */
-    protected boolean mineBlock(@NotNull final BlockPos blockToMine, @NotNull final BlockPos safeStand)
+    protected boolean mineBlock(@NotNull final BlockPos blockToMine, @Nullable final BlockPos safeStand)
     {
         return mineBlock(blockToMine, safeStand, true, true, null);
     }
@@ -158,7 +158,7 @@ protected boolean mineBlock(@NotNull final BlockPos blockToMine, @NotNull final
      */
     protected final boolean mineBlock(
       @NotNull final BlockPos blockToMine,
-      @NotNull final BlockPos safeStand,
+      @Nullable final BlockPos safeStand,
       final boolean damageTool,
       final boolean getDrops,
       final Runnable blockBreakAction)
@@ -287,7 +287,7 @@ protected void triggerMinedBlock(@NotNull final BlockPos position, @NotNull fina
      * @param safeStand   a safe stand to mine from (empty Block!)
      * @return true if you should wait
      */
-    private boolean checkMiningLocation(@NotNull final BlockPos blockToMine, @NotNull final BlockPos safeStand)
+    private boolean checkMiningLocation(@NotNull final BlockPos blockToMine, @Nullable final BlockPos safeStand)
     {
         final BlockState curBlock = world.getBlockState(blockToMine);
 
@@ -297,7 +297,7 @@ private boolean checkMiningLocation(@NotNull final BlockPos blockToMine, @NotNul
             return true;
         }
 
-        if (walkToBlock(safeStand) && MathUtils.twoDimDistance(worker.blockPosition(), safeStand) > MIN_WORKING_RANGE)
+        if (safeStand != null && walkToBlock(safeStand) && MathUtils.twoDimDistance(worker.blockPosition(), safeStand) > MIN_WORKING_RANGE)
         {
             return true;
         }

diff --git a/src/main/java/com/minecolonies/core/entity/ai/workers/AbstractEntityAIStructure.java b/src/main/java/com/minecolonies/core/entity/ai/workers/AbstractEntityAIStructure.java
@@ -460,7 +460,6 @@ protected IAIState structureStep()
 
         if (result.getBlockResult().getResult() == BlockPlacementResult.Result.FINISHED)
         {
-
             building.nextStage();
             if (!goToNextStage(result))
             {
@@ -671,7 +670,7 @@ public IAIState doMining()
             return getState();
         }
 
-        if (!mineBlock(blockToMine, getCurrentWorkingPosition()))
+        if (!mineBlock(blockToMine, null))
         {
             worker.swing(InteractionHand.MAIN_HAND);
             return getState();