From 761ef634daa738e1ced04d55b35b7e40df933691 Mon Sep 17 00:00:00 2001
From: kadeshar <kadeshar@gmail.com>
Date: Mon, 14 Jul 2025 19:27:16 +0200
Subject: [PATCH] - Fixed loot trigger to respect stay strategy (#1437)

---
 src/strategy/triggers/LootTriggers.cpp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/strategy/triggers/LootTriggers.cpp b/src/strategy/triggers/LootTriggers.cpp
index eed1a3ec..4ecf00ff 100644
--- a/src/strategy/triggers/LootTriggers.cpp
+++ b/src/strategy/triggers/LootTriggers.cpp
@@ -11,11 +11,21 @@
 
 bool LootAvailableTrigger::IsActive()
 {
+    bool distanceCheck = false;
+    if (botAI->HasStrategy("stay", BOT_STATE_NON_COMBAT))
+    {
+        distanceCheck =
+            sServerFacade->IsDistanceLessOrEqualThan(AI_VALUE2(float, "distance", "loot target"), CONTACT_DISTANCE);
+    }
+    else
+    {
+        distanceCheck = sServerFacade->IsDistanceLessOrEqualThan(AI_VALUE2(float, "distance", "loot target"),
+                                                                 INTERACTION_DISTANCE - 2.0f);
+    }
+
+    // if loot target if empty, always pass distance check
     return AI_VALUE(bool, "has available loot") &&
-            // if loot target if empty, always pass distance check
-           (sServerFacade->IsDistanceLessOrEqualThan(AI_VALUE2(float, "distance", "loot target"),
-                                                     INTERACTION_DISTANCE - 2.0f) ||
-            AI_VALUE(GuidVector, "all targets").empty());
+        (distanceCheck || AI_VALUE(GuidVector, "all targets").empty());
 }
 
 bool FarFromCurrentLootTrigger::IsActive()