MoveToTravelTargetAction prevent delay when in combat

src/factory/PlayerbotFactory.cpp

@@ -164,33 +164,22 @@ void PlayerbotFactory::Init()
         {
             continue;
         }
-        
         ItemTemplate const* proto = sObjectMgr->GetItemTemplate(gemId);
-        if (!proto)
-        {
-            continue;
-        }
-        
+
         if (proto->ItemLevel < 60)
-        {
             continue;
-        }
-        
+
         if (proto->Flags & ITEM_FLAG_UNIQUE_EQUIPPABLE)
         {
             continue;
         }
-        
         if (sRandomItemMgr->IsTestItem(gemId))
-        {
-           continue;
-        }
-            
-        if (!sGemPropertiesStore.LookupEntry(proto->GemProperties))
+            continue;
+
+        if (!proto || !sGemPropertiesStore.LookupEntry(proto->GemProperties))
         {
             continue;
         }
-        
         // LOG_INFO("playerbots", "Add {} to enchantment gems", gemId);
         enchantGemIdCache.push_back(gemId);
     }

src/strategy/actions/MoveToTravelTargetAction.cpp

@@ -18,7 +18,7 @@ bool MoveToTravelTargetAction::Execute(Event event)
     WorldLocation location = *target->getPosition();
 
     Group* group = bot->GetGroup();
-    if (group && !urand(0, 1) && bot == botAI->GetGroupMaster())
+    if (group && !urand(0, 1) && bot == botAI->GetGroupMaster() && !bot->IsInCombat())
     {
         for (GroupReference* ref = group->GetFirstMember(); ref; ref = ref->next())
         {