Only try to loot quest objects if has items or not used

playerbot/LootObjectStack.cpp

@@ -259,7 +259,15 @@ bool LootObject::IsLootPossible(Player* bot)
                 {
                     if (go->ActivateToQuest(bot))
                     {
-                        return true;
+                        bool hasQuestItems = false;
+                        for (auto& entry : GAI_VALUE2(std::list<uint32>, "entry loot list", -go->GetEntry()))
+                        {
+                            if (IsNeededForQuest(bot, entry))
+                            {
+                                hasQuestItems = true;
+                            }
+                        }
+                        return hasQuestItems || go->GetLootState() != GO_READY;
                     }
                 }
             }

playerbot/strategy/actions/LootAction.cpp

@@ -12,6 +12,7 @@
 #include "playerbot/strategy/values/LootStrategyValue.h"
 #include "playerbot/strategy/values/ItemUsageValue.h"
 #include "playerbot/ServerFacade.h"
+#include "playerbot/strategy/values/SharedValueContext.h"
 
 
 using namespace ai;
@@ -127,11 +128,12 @@ bool OpenLootAction::DoLoot(LootObject& lootObject)
     {
         // herb-like quest objects
         bool isForQuest = false;
-        if (sObjectMgr.IsGameObjectForQuests(lootObject.guid.GetEntry()))
+        if (go && sObjectMgr.IsGameObjectForQuests(lootObject.guid.GetEntry()))
         {
             if (go->ActivateToQuest(bot))
             {
-                isForQuest = true;
+                std::list<uint32> lootItems = GAI_VALUE2(std::list<uint32>, "entry loot list", -go->GetEntry());
+                isForQuest = !lootItems.empty() || go->GetLootState() != GO_READY;
             }
         }
 

playerbot/strategy/values/LootValues.cpp

@@ -175,16 +175,14 @@ std::list<uint32> EntryLootListValue::Calculate()
 
 	std::list<uint32> items;
 
-	LootTemplateAccess const* lTemplateA;
-
-	if (entry > 0)
-		lTemplateA = DropMapValue::GetLootTemplate(ObjectGuid(HIGHGUID_UNIT, entry, uint32(1)), LOOT_CORPSE);
-	else
-		lTemplateA = DropMapValue::GetLootTemplate(ObjectGuid(HIGHGUID_GAMEOBJECT, entry, uint32(1)), LOOT_CORPSE);
-
-	if (lTemplateA)
-		for (LootStoreItem const& lItem : lTemplateA->Entries)
-			items.push_back(lItem.itemid);
+	DropMap* dropMap = GAI_VALUE(DropMap*, "drop map");
+	for (auto it = dropMap->begin(); it != dropMap->end(); ++it)
+	{
+		if (it->second == entry)
+		{
+			items.push_back(it->first);
+		}
+	}
 
 	return items;
 }