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

Core/Quests: Fixed gameobject sparkle state for lootable quest items by moving ItemAddedQuestCheck/ItemRemovedQuestCheck after item is added/removed

Browse Source 
Port From (https://github.com/TrinityCore/TrinityCore/commit/b1a1e552d2acb394ad0d0a2544aeef6ad93ca4fb)
This commit is contained in:
hondacrx
2022-02-22 19:39:43 -05:00
parent 92d3c34752
commit 8ba914cb61
2 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Items.cs
+24 -19
View File
@@ -1305,16 +1305,16 @@ namespace Game.Entities
Item item = Item.CreateItem(itemId, count, context, this); Item item = Item.CreateItem(itemId, count, context, this);
if (item != null) if (item != null)
{ {
ItemAddedQuestCheck(itemId, count);
UpdateCriteria(CriteriaType.ObtainAnyItem, itemId, count);
UpdateCriteria(CriteriaType.AcquireItem, itemId, count);
item.AddItemFlag(ItemFieldFlags.NewItem); item.AddItemFlag(ItemFieldFlags.NewItem);
item.SetBonuses(bonusListIDs); item.SetBonuses(bonusListIDs);
item = StoreItem(pos, item, update); item = StoreItem(pos, item, update);
ItemAddedQuestCheck(itemId, count);
UpdateCriteria(CriteriaType.ObtainAnyItem, itemId, count);
UpdateCriteria(CriteriaType.AcquireItem, itemId, count);
item.SetFixedLevel(GetLevel()); item.SetFixedLevel(GetLevel());
item.SetItemRandomBonusList(randomBonusListId); item.SetItemRandomBonusList(randomBonusListId);
@@ -1576,9 +1576,10 @@ namespace Game.Entities
Item pItem = Item.CreateItem(item, 1, context, this); Item pItem = Item.CreateItem(item, 1, context, this);
if (pItem != null) if (pItem != null)
{ {
ItemAddedQuestCheck(item, 1);
UpdateCriteria(CriteriaType.ObtainAnyItem, item, 1); UpdateCriteria(CriteriaType.ObtainAnyItem, item, 1);
return EquipItem(pos, pItem, update); Item equippedItem = EquipItem(pos, pItem, update);
ItemAddedQuestCheck(item, 1);
return equippedItem;
} }
return null; return null;
@@ -4265,8 +4266,8 @@ namespace Game.Entities
Item it = GetItemByPos(bag, slot); Item it = GetItemByPos(bag, slot);
if (it != null) if (it != null)
{ {
ItemRemovedQuestCheck(it.GetEntry(), it.GetCount());
RemoveItem(bag, slot, update); RemoveItem(bag, slot, update);
ItemRemovedQuestCheck(it.GetEntry(), it.GetCount());
it.SetNotRefundable(this, false, null, false); it.SetNotRefundable(this, false, null, false);
Item.RemoveItemFromUpdateQueueOf(it, this); Item.RemoveItemFromUpdateQueueOf(it, this);
GetSession().GetCollectionMgr().RemoveTemporaryAppearance(it); GetSession().GetCollectionMgr().RemoveTemporaryAppearance(it);
@@ -4279,9 +4280,8 @@ namespace Game.Entities
} }
public void MoveItemToInventory(List<ItemPosCount> dest, Item pItem, bool update, bool in_characterInventoryDB = false) public void MoveItemToInventory(List<ItemPosCount> dest, Item pItem, bool update, bool in_characterInventoryDB = false)
{ {
// update quest counters uint itemId = pItem.GetEntry();
ItemAddedQuestCheck(pItem.GetEntry(), pItem.GetCount()); uint count = pItem.GetCount();
UpdateCriteria(CriteriaType.ObtainAnyItem, pItem.GetEntry(), pItem.GetCount());
// store item // store item
Item pLastItem = StoreItem(dest, pItem, update); Item pLastItem = StoreItem(dest, pItem, update);
@@ -4300,6 +4300,10 @@ namespace Game.Entities
if (pLastItem.IsBOPTradeable()) if (pLastItem.IsBOPTradeable())
AddTradeableItem(pLastItem); AddTradeableItem(pLastItem);
} }
// update quest counters
ItemAddedQuestCheck(itemId, count);
UpdateCriteria(CriteriaType.ObtainAnyItem, itemId, count);
} }
//Bank //Bank
@@ -5490,7 +5494,6 @@ namespace Game.Entities
ApplyItemObtainSpells(pItem, false); ApplyItemObtainSpells(pItem, false);
ItemRemovedQuestCheck(pItem.GetEntry(), pItem.GetCount());
Global.ScriptMgr.OnItemRemove(this, pItem); Global.ScriptMgr.OnItemRemove(this, pItem);
Bag pBag; Bag pBag;
@@ -5541,6 +5544,8 @@ namespace Game.Entities
if (pProto.HasFlag(ItemFlags.HasLoot)) if (pProto.HasFlag(ItemFlags.HasLoot))
Global.LootItemStorage.RemoveStoredLootForContainer(pItem.GetGUID().GetCounter()); Global.LootItemStorage.RemoveStoredLootForContainer(pItem.GetGUID().GetCounter());
ItemRemovedQuestCheck(pItem.GetEntry(), pItem.GetCount());
if (IsInWorld && update) if (IsInWorld && update)
{ {
pItem.RemoveFromWorld(); pItem.RemoveFromWorld();
@@ -5585,8 +5590,8 @@ namespace Game.Entities
} }
else else
{ {
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
item.SetCount(item.GetCount() - count + remcount); item.SetCount(item.GetCount() - count + remcount);
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
if (IsInWorld && update) if (IsInWorld && update)
item.SendUpdateToPlayer(this); item.SendUpdateToPlayer(this);
item.SetState(ItemUpdateState.Changed, this); item.SetState(ItemUpdateState.Changed, this);
@@ -5620,8 +5625,8 @@ namespace Game.Entities
} }
else else
{ {
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
item.SetCount(item.GetCount() - count + remcount); item.SetCount(item.GetCount() - count + remcount);
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
if (IsInWorld && update) if (IsInWorld && update)
item.SendUpdateToPlayer(this); item.SendUpdateToPlayer(this);
item.SetState(ItemUpdateState.Changed, this); item.SetState(ItemUpdateState.Changed, this);
@@ -5654,8 +5659,8 @@ namespace Game.Entities
} }
else else
{ {
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
item.SetCount(item.GetCount() - count + remcount); item.SetCount(item.GetCount() - count + remcount);
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
if (IsInWorld && update) if (IsInWorld && update)
item.SendUpdateToPlayer(this); item.SendUpdateToPlayer(this);
item.SetState(ItemUpdateState.Changed, this); item.SetState(ItemUpdateState.Changed, this);
@@ -5682,8 +5687,8 @@ namespace Game.Entities
} }
else else
{ {
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
item.SetCount(item.GetCount() - count + remcount); item.SetCount(item.GetCount() - count + remcount);
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
if (IsInWorld && update) if (IsInWorld && update)
item.SendUpdateToPlayer(this); item.SendUpdateToPlayer(this);
item.SetState(ItemUpdateState.Changed, this); item.SetState(ItemUpdateState.Changed, this);
@@ -5717,8 +5722,8 @@ namespace Game.Entities
} }
else else
{ {
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
item.SetCount(item.GetCount() - count + remcount); item.SetCount(item.GetCount() - count + remcount);
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
if (IsInWorld && update) if (IsInWorld && update)
item.SendUpdateToPlayer(this); item.SendUpdateToPlayer(this);
item.SetState(ItemUpdateState.Changed, this); item.SetState(ItemUpdateState.Changed, this);
@@ -5750,8 +5755,8 @@ namespace Game.Entities
} }
else else
{ {
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
item.SetCount(item.GetCount() - count + remcount); item.SetCount(item.GetCount() - count + remcount);
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
if (IsInWorld && update) if (IsInWorld && update)
item.SendUpdateToPlayer(this); item.SendUpdateToPlayer(this);
item.SetState(ItemUpdateState.Changed, this); item.SetState(ItemUpdateState.Changed, this);
@@ -5779,8 +5784,8 @@ namespace Game.Entities
} }
else else
{ {
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
item.SetCount(item.GetCount() - count + remcount); item.SetCount(item.GetCount() - count + remcount);
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
if (IsInWorld && update) if (IsInWorld && update)
item.SendUpdateToPlayer(this); item.SendUpdateToPlayer(this);
item.SetState(ItemUpdateState.Changed, this); item.SetState(ItemUpdateState.Changed, this);
@@ -5808,8 +5813,8 @@ namespace Game.Entities
} }
else else
{ {
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
item.SetCount(item.GetCount() - count + remcount); item.SetCount(item.GetCount() - count + remcount);
ItemRemovedQuestCheck(item.GetEntry(), count - remcount);
if (IsInWorld && update) if (IsInWorld && update)
item.SendUpdateToPlayer(this); item.SendUpdateToPlayer(this);
item.SetState(ItemUpdateState.Changed, this); item.SetState(ItemUpdateState.Changed, this);
Source/Game/Handlers/ItemHandler.cs
+1 -1
View File
@@ -481,8 +481,8 @@ namespace Game
} }
else else
{ {
pl.ItemRemovedQuestCheck(pItem.GetEntry(), pItem.GetCount());
pl.RemoveItem(pItem.GetBagSlot(), pItem.GetSlot(), true); pl.RemoveItem(pItem.GetBagSlot(), pItem.GetSlot(), true);
pl.ItemRemovedQuestCheck(pItem.GetEntry(), pItem.GetCount());
Item.RemoveItemFromUpdateQueueOf(pItem, pl); Item.RemoveItemFromUpdateQueueOf(pItem, pl);
pl.AddItemToBuyBackSlot(pItem); pl.AddItemToBuyBackSlot(pItem);
} }