Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Core: Updated to 11.1.7

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/ceb8d561b44579118b109a9ff71ba415df53bbdc)
This commit is contained in:
Hondacrx
2025-08-18 14:47:48 -04:00
parent 5f6329665a
commit ebd9c9e636
35 changed files with 1824 additions and 1603 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Conditions/ConditionManager.cs
+23 -1
View File
@@ -2145,7 +2145,29 @@ namespace Game
for (var i = 0; i < condition.ItemID.Length; ++i)
{
if (condition.ItemID[i] != 0)
results[i] = player.GetItemCount(condition.ItemID[i], condition.ItemFlags != 0) >= condition.ItemCount[i];
{
ItemSearchLocation where = ItemSearchLocation.Equipment;
if ((condition.ItemFlags & 1) != 0) // include banks
where |= ItemSearchLocation.Bank | ItemSearchLocation.ReagentBank | ItemSearchLocation.AccountBank;
if ((condition.ItemFlags & 2) == 0) // ignore inventory
where |= ItemSearchLocation.Inventory;
uint foundCount = 0;
results[i] = !player.ForEachItem(where, item =>
{
if (item.GetEntry() == condition.ItemID[i])
{
foundCount += item.GetCount();
if (foundCount >= condition.ItemCount[i])
return false;
}
return true;
});
if (!results[i] && condition.ItemCount[i] == 1 && Global.DB2Mgr.IsToyItem(condition.ItemID[i]))
results[i] = player.GetSession().GetCollectionMgr().HasToy(condition.ItemID[i]);
}
}
if (!PlayerConditionLogic(condition.ItemLogic, results))