From 91ec7450e7400953cc19e3912bce8a26e2d0a97b Mon Sep 17 00:00:00 2001
From: do-gamer <208613570+do-gamer@users.noreply.github.com>
Date: Thu, 29 Jan 2026 15:15:41 +0700
Subject: [PATCH 1/2] Stop attacking when moving to safety

---
 shared/src/main/java/eu/darkbot/shared/utils/SafetyFinder.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/shared/src/main/java/eu/darkbot/shared/utils/SafetyFinder.java b/shared/src/main/java/eu/darkbot/shared/utils/SafetyFinder.java
index ca4e93b..c42dd9e 100644
--- a/shared/src/main/java/eu/darkbot/shared/utils/SafetyFinder.java
+++ b/shared/src/main/java/eu/darkbot/shared/utils/SafetyFinder.java
@@ -340,6 +340,9 @@ protected void moveToSafety(SafetyInfo safety) {
                 || (movement.getDestination().distanceTo(safety) < safety.getRadius() && lastMoveTimer.isActive())) return;
 
         hero.setRunMode();
+        if (attacker.isAttacking()) {
+            attacker.stopAttack();
+        }
 
         double angle = safety.angleTo(hero) + Math.random() * 0.2 - 0.1;
         movement.moveTo(Location.of(safety, angle, -safety.getRadius() * (0.3 + (0.60 * Math.random())))); // 30%-90% radius

From 9fb1ed593be6f3da3aa4ff1e9326d13b4bb39799 Mon Sep 17 00:00:00 2001
From: do-gamer <208613570+do-gamer@users.noreply.github.com>
Date: Sun, 8 Feb 2026 21:44:42 +0700
Subject: [PATCH 2/2] Prevent stopping attack when escaping from sight if
 stopRunningNoSight enabled.

---
 shared/src/main/java/eu/darkbot/shared/utils/SafetyFinder.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/shared/src/main/java/eu/darkbot/shared/utils/SafetyFinder.java b/shared/src/main/java/eu/darkbot/shared/utils/SafetyFinder.java
index c42dd9e..0218c48 100644
--- a/shared/src/main/java/eu/darkbot/shared/utils/SafetyFinder.java
+++ b/shared/src/main/java/eu/darkbot/shared/utils/SafetyFinder.java
@@ -340,7 +340,7 @@ protected void moveToSafety(SafetyInfo safety) {
                 || (movement.getDestination().distanceTo(safety) < safety.getRadius() && lastMoveTimer.isActive())) return;
 
         hero.setRunMode();
-        if (attacker.isAttacking()) {
+        if (attacker.isAttacking() && !(escape == Escaping.SIGHT && stopRunningNoSight.getValue())) {
             attacker.stopAttack();
         }