From a8346fd5ea0973a21c8c1844f038d8064f8d4625 Mon Sep 17 00:00:00 2001
From: Raycoms <ray.neiheiser@gmail.com>
Date: Mon, 2 Dec 2024 13:55:55 +0100
Subject: [PATCH] hotfix 10498

---
 .../workers/guard/AbstractEntityAIGuard.java   | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/minecolonies/core/entity/ai/workers/guard/AbstractEntityAIGuard.java b/src/main/java/com/minecolonies/core/entity/ai/workers/guard/AbstractEntityAIGuard.java
index c7f21ad1d43..3f201d91e46 100755
--- a/src/main/java/com/minecolonies/core/entity/ai/workers/guard/AbstractEntityAIGuard.java
+++ b/src/main/java/com/minecolonies/core/entity/ai/workers/guard/AbstractEntityAIGuard.java
@@ -521,7 +521,7 @@ public IAIState patrol()
 
                 if (currentPatrolPoint != null)
                 {
-                    setNextPatrolTargetAndMove(currentPatrolPoint);
+                    setNextPatrolTarget(currentPatrolPoint);
                 }
             }
         }
@@ -562,11 +562,11 @@ public IAIState patrolMine()
                     final MinerLevel level = buildingMiner.getFirstModuleOccurance(MinerLevelManagementModule.class).getCurrentLevel();
                     if (level == null)
                     {
-                        setNextPatrolTargetAndMove(buildingMiner.getPosition());
+                        setNextPatrolTarget(buildingMiner.getPosition());
                     }
                     else
                     {
-                        setNextPatrolTargetAndMove(level.getRandomCompletedNode(buildingMiner));
+                        setNextPatrolTarget(level.getRandomCompletedNode(buildingMiner));
                     }
                 }
                 else
@@ -589,7 +589,7 @@ public IAIState patrolMine()
      */
     public void setNextPatrolTargetAndMove(final BlockPos target)
     {
-        currentPatrolPoint = target;
+        setNextPatrolTarget(target);
         registerTarget(new AIOneTimeEventTarget(() ->
         {
             if (getState() == CombatAIStates.NO_TARGET)
@@ -600,6 +600,16 @@ public void setNextPatrolTargetAndMove(final BlockPos target)
         }));
     }
 
+    /**
+     * Sets the next patrol target.
+     *
+     * @param target the next patrol target.
+     */
+    private void setNextPatrolTarget(final BlockPos target)
+    {
+        currentPatrolPoint = target;
+    }
+
     /**
      * Check if the worker has the required tool to fight.
      *