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

Core/Items: Fixed problem where item dependent auras are not properly updated

Browse Source
This commit is contained in:
hondacrx
2018-03-18 12:18:00 -04:00
parent 20ba7e63f6
commit 2ca6b95029
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Items.cs
+6 -7
View File
@@ -2434,9 +2434,6 @@ namespace Game.Entities
RemoveItem(dstbag, dstslot, false); RemoveItem(dstbag, dstslot, false);
RemoveItem(srcbag, srcslot, false); RemoveItem(srcbag, srcslot, false);
if (srcbag == InventorySlots.Bag0 && srcslot < InventorySlots.BagEnd)
ApplyItemDependentAuras(pSrcItem, false);
// add to dest // add to dest
if (IsInventoryPos(dst)) if (IsInventoryPos(dst))
StoreItem(_sDest, pSrcItem, true); StoreItem(_sDest, pSrcItem, true);
@@ -2449,9 +2446,6 @@ namespace Game.Entities
EquipChildItem(srcbag, srcslot, pSrcItem); EquipChildItem(srcbag, srcslot, pSrcItem);
} }
if (dstbag == InventorySlots.Bag0 && dstslot < InventorySlots.BagEnd)
ApplyItemDependentAuras(pDstItem, false);
// add to src // add to src
if (IsInventoryPos(src)) if (IsInventoryPos(src))
StoreItem(sDest2, pDstItem, true); StoreItem(sDest2, pDstItem, true);
@@ -2459,7 +2453,12 @@ namespace Game.Entities
BankItem(sDest2, pDstItem, true); BankItem(sDest2, pDstItem, true);
else if (IsEquipmentPos(src)) else if (IsEquipmentPos(src))
EquipItem(eDest2, pDstItem, true); EquipItem(eDest2, pDstItem, true);
// if inventory item was moved, check if we can remove dependent auras, because they were not removed in Player::RemoveItem (update was set to false)
// do this after swaps are done, we pass nullptr because both weapons could be swapped and none of them should be ignored
if ((srcbag == InventorySlots.Bag0 && srcslot < InventorySlots.BagEnd) || (dstbag == InventorySlots.Bag0 && dstslot < InventorySlots.BagEnd))
ApplyItemDependentAuras(null, false);
// if player is moving bags and is looting an item inside this bag // if player is moving bags and is looting an item inside this bag
// release the loot // release the loot
if (!GetLootGUID().IsEmpty()) if (!GetLootGUID().IsEmpty())
Source/Game/Handlers/ItemHandler.cs
+5
View File
@@ -298,6 +298,11 @@ namespace Game
} }
pl.AutoUnequipOffhandIfNeed(); pl.AutoUnequipOffhandIfNeed();
// if inventory item was moved, check if we can remove dependent auras, because they were not removed in Player::RemoveItem (update was set to false)
// do this after swaps are done, we pass nullptr because both weapons could be swapped and none of them should be ignored
if ((autoEquipItem.PackSlot == InventorySlots.Bag0 && autoEquipItem.Slot < InventorySlots.BagEnd) || (dstbag == InventorySlots.Bag0 && dstslot < InventorySlots.BagEnd))
pl.ApplyItemDependentAuras(null, false);
} }
} }