From 0d851002f2330b7896857c15233d864a3a244203 Mon Sep 17 00:00:00 2001
From: Yunfan Li <lyf_liyunfan@sina.com>
Date: Thu, 24 Aug 2023 22:05:16 +0800
Subject: [PATCH] drink & food noncombat only

---
 src/strategy/actions/NonCombatActions.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/strategy/actions/NonCombatActions.cpp b/src/strategy/actions/NonCombatActions.cpp
index 44b2ef54..ab0882d2 100644
--- a/src/strategy/actions/NonCombatActions.cpp
+++ b/src/strategy/actions/NonCombatActions.cpp
@@ -60,7 +60,7 @@ bool DrinkAction::isUseful()
 
 bool DrinkAction::isPossible()
 {
-    return sPlayerbotAIConfig->freeFood || UseItemAction::isPossible();
+    return !bot->IsInCombat() && (sPlayerbotAIConfig->freeFood || UseItemAction::isPossible());
 }
 
 bool EatAction::Execute(Event event)
@@ -112,5 +112,5 @@ bool EatAction::isUseful()
 
 bool EatAction::isPossible()
 {
-    return sPlayerbotAIConfig->freeFood || UseItemAction::isPossible();
+    return !bot->IsInCombat() && (sPlayerbotAIConfig->freeFood || UseItemAction::isPossible());
 }