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

Core/Player: prevent early aura removal when swapping weapons

Browse Source
This commit is contained in:
hondacrx
2018-03-12 14:46:20 -04:00
parent b9c1e3876b
commit 05c975c643
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/Game/Entities/Player/Player.Items.cs
+10 -3
View File
@@ -1945,7 +1945,7 @@ namespace Game.Entities
if (pProto != null && pProto.GetItemSet() != 0) if (pProto != null && pProto.GetItemSet() != 0)
Item.RemoveItemsSetItem(this, pProto); Item.RemoveItemsSetItem(this, pProto);
_ApplyItemMods(pItem, slot, false); _ApplyItemMods(pItem, slot, false, update);
// remove item dependent auras and casts (only weapon and armor slots) // remove item dependent auras and casts (only weapon and armor slots)
if (slot < EquipmentSlot.End) if (slot < EquipmentSlot.End)
@@ -2434,6 +2434,9 @@ 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);
@@ -2446,6 +2449,9 @@ 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);
@@ -3927,7 +3933,7 @@ namespace Game.Entities
return false; return false;
} }
public void _ApplyItemMods(Item item, byte slot, bool apply) public void _ApplyItemMods(Item item, byte slot, bool apply, bool updateItemAuras = true)
{ {
if (slot >= InventorySlots.BagEnd || item == null) if (slot >= InventorySlots.BagEnd || item == null)
return; return;
@@ -3948,7 +3954,8 @@ namespace Game.Entities
_ApplyItemBonuses(item, slot, apply); _ApplyItemBonuses(item, slot, apply);
ApplyItemEquipSpell(item, apply); ApplyItemEquipSpell(item, apply);
ApplyItemDependentAuras(item, apply); if (updateItemAuras)
ApplyItemDependentAuras(item, apply);
ApplyArtifactPowers(item, apply); ApplyArtifactPowers(item, apply);
ApplyEnchantment(item, apply); ApplyEnchantment(item, apply);