From a5fc964910562679429b045636f3d1e1e312bea6 Mon Sep 17 00:00:00 2001
From: do-gamer <208613570+do-gamer@users.noreply.github.com>
Date: Fri, 23 Jan 2026 21:50:25 +0700
Subject: [PATCH 1/2] Fixes issue with CBS when run mode is NEVER

---
 .../com/github/manolo8/darkbot/modules/utils/SafetyFinder.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/com/github/manolo8/darkbot/modules/utils/SafetyFinder.java b/src/main/java/com/github/manolo8/darkbot/modules/utils/SafetyFinder.java
index d84ade972..f53d6f8ad 100644
--- a/src/main/java/com/github/manolo8/darkbot/modules/utils/SafetyFinder.java
+++ b/src/main/java/com/github/manolo8/darkbot/modules/utils/SafetyFinder.java
@@ -40,6 +40,9 @@ public enum Escaping {
         ENEMY, SIGHT, REPAIR, REFRESH, WAITING, NONE;
         boolean canUse(SafetyInfo safety) {
             if (safety.type == SafetyInfo.Type.CBS) {
+                if (safety.runMode == SafetyInfo.RunMode.NEVER) {
+                    return false;
+                }
                 BattleStation cbs = ((BattleStation) safety.entity);
                 // Ignore enemy CBS, and if set to ALLY only, ignore empty meteorites (hull = 0)
                 if (cbs.info.isEnemy() || (cbs.hullId == 0 && safety.cbsMode == SafetyInfo.CbsMode.ALLY)) return false;

From 3eb782a9efbf3b98cddd97f287446a1512d3b467 Mon Sep 17 00:00:00 2001
From: do-gamer <208613570+do-gamer@users.noreply.github.com>
Date: Sat, 24 Jan 2026 13:23:22 +0700
Subject: [PATCH 2/2] move code to beginning of the method

---
 .../github/manolo8/darkbot/modules/utils/SafetyFinder.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/github/manolo8/darkbot/modules/utils/SafetyFinder.java b/src/main/java/com/github/manolo8/darkbot/modules/utils/SafetyFinder.java
index f53d6f8ad..07319f92a 100644
--- a/src/main/java/com/github/manolo8/darkbot/modules/utils/SafetyFinder.java
+++ b/src/main/java/com/github/manolo8/darkbot/modules/utils/SafetyFinder.java
@@ -39,10 +39,10 @@ public class SafetyFinder {
     public enum Escaping {
         ENEMY, SIGHT, REPAIR, REFRESH, WAITING, NONE;
         boolean canUse(SafetyInfo safety) {
+            if (safety.runMode == SafetyInfo.RunMode.NEVER) {
+                return false; // Never use this safety
+            }
             if (safety.type == SafetyInfo.Type.CBS) {
-                if (safety.runMode == SafetyInfo.RunMode.NEVER) {
-                    return false;
-                }
                 BattleStation cbs = ((BattleStation) safety.entity);
                 // Ignore enemy CBS, and if set to ALLY only, ignore empty meteorites (hull = 0)
                 if (cbs.info.isEnemy() || (cbs.hullId == 0 && safety.cbsMode == SafetyInfo.CbsMode.ALLY)) return false;