server/mangos
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Core] Skip item SPELLTRIGGER_ON_USE at form change. [cz2665]

Browse Source 
This will fix auras casted from items with spell charges (spell 25211) disappearing on form change.
This commit is contained in:
robinsch 2015-07-08 21:59:06 +01:00 committed by Antz
parent fa303fb829
commit 5dc51349ed
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/RequiredPorts.mangosproof
View File

@ -1 +1 @@
rUzt6Qdc4EKKtuvr7m2AqM9iQu/Ewo17ul9iktjbtIC4oSTjYtD9kk4xk+lvxAFg2soaw2cvIWw2aArt5lanaEXCgQbziGFOk+7xyiNL8L5EYI1Z1ktvsKuftuPexVFyu57ZCenLn4Yj8EDgqWTNxog7aJjnMXPYJIbiSNUHTPzanLwB8cHkU/XPKYzxC5+W4nvahkDlUsdF1y1LC9s31YNlbNPqNqFGOf7/StLRXrxo6CFnCpfDA9iEZIHak8nrM8mchHQq41wodkOKTtYadN0IiS8j3aKfO0JE/lZzEUlFpzSDSU04yuLBT76hA1ORasqTu+Au6aoQoe01/tBRqeUPfK8qXCF7O4U34ECSNIBX5J/UXUu1EOsVXOfAgh/HA+6qNDpqO7757nSM0x6z14bleHWb1017qhU/deATEqed6c63LIZ+BDJW3A1TU8Qx9ox1DmCRnrGclUpVmOMwGG96tBvvfPBB37KWymA18ux9WjpTtSTeM6wMnci+xYlw1ze5af85B0qJGGuayP2hB1Mf/zEAa2BLZkmX0CSNmdEwSEpIXuy8qcY2ef/bwX4PQYo4bex6mahcHtCUSCuSWIOlmEhrODk8BXYsf1LGgJO/Bbsg5kXUK2+rPPSxSuZtdPQGFB47yXoj8tTJVFCQVWXa8dW4G6PJ9BQPvXm1O+dGDQI8KuQR27eVttKbefxR+DAEICZGLVvLIJQr0ZQinlYxBZO6NF8Ao6060UrfW16G7OfJTDUhl88fmM3r6WAAOED0aK8IwsDxu9yW9l/yh/tpK82rXkl5Fmyk2UyxPantTWXKjyGZohTCWhpy73Yvd1foPV6jSuFx0CeIdYtEL6kYsIyIbYvjNJx3YYwCXTJc/u0uy2Iw+rhPh62EJTukacLucFxE3Vg6CnL39fVtS0/yKp1qdkXETxh4XoFGec1fYXWElvIUHLjQ21KMM/s9ZdpB7OmnKXyPcsGqABS6sqgVfruOGZMYtq4htIvCUeYeVys2tn0yczmdURyIZtwYLXzt1xWoSgnfMcWKpIDxOj==
rUzt6Qdc4EKKtuvr7m2AqM9iQu/Ewo17ul9iktjbtIC4oSTjYtD9kk4xk+lvxAFg2soaw2cvIWw2aArt5lanaEXCgQbziGFOk+7xyiNL8L5EYI1Z1ktvsKuftuPexVFyu57ZCenLn4Yj8EDgqWTNxog7aJjnMXPYJIbiSNUHTPzD9izpk1rcFHF9jO8c9jI6Z07+X/licLjm0H108Dw3wpacOZxSlyNsPgzYvjMwwQhz8h6RVLZhOAQHgw7lJbbVk0WWK69NYhUmdoPCNrfa/Fm9Ci/uO6JFHqTl7uOW3AKwwA6xXEKhVjmpgNllH8epO8bUNkNebacFGHxalxmPfpNo/u4Q5507uAWW3r9iphFf++asgQIWIrJuMynn/CEfX8R/TOZ5fOl7GPge5FO3a+9fP793kd+qXIrLvtoRs5i6D5J7+0xo2n2JaaXDGIZmZE6SA+h7pYG5RR/UbNXAQkqaF0LW+6epQUXw8TQgoV89Oz2hRduBlijC2I8Gidm3WYb6ezBKpLSrl2+d20FCJLeVkilJAMzSVZf/H27lBSHXc+lgC2AWqvBXPPLaNJyUrtXtSnMf4Rj0sMjMazMbmLe1M5cmRHNj6X0iH8L6FLEUemmIHVbkqu7MFbEs2q4YlRtPCagUSPwVpBm+K5b/CX3ZzLsjlLFRasyVlXWuQe8eJxOn8kLs34676noJbXPYazGx1L+VXlHyNLzP2kI+8pwIu3Zu/wljpxk9mZe3m/qV8VtORnWbX1MnkxCPlDrxuyvROdrtwC7fxgf7KKvU1+BYjdxLMvOyCseG8Gem0GPurga8fgp1P1wM6ehpnjK1z26S3XPBa9ov0qj7Na2BR1PPOIlP6g3Q//ZuvmDnF3qrhgSVYpmLCUlYyOJldbJk

4
src/game/Object/Player.cpp
View File

@ -6823,9 +6823,9 @@ void Player::ApplyItemEquipSpell(Item* item, bool apply, bool form_change)
else
{
// at un-apply remove all spells (not only at-apply, so any at-use active affects from item and etc)
// except with at-use with negative charges, so allow consuming item spells (including with extra flag that prevent consume really)
// except on form change and with at-use with negative charges, so allow consuming item spells (including with extra flag that prevent consume really)
// applied to player after item remove from equip slot
if (spellData.SpellTrigger == ITEM_SPELLTRIGGER_ON_USE && spellData.SpellCharges < 0)
if (spellData.SpellTrigger == ITEM_SPELLTRIGGER_ON_USE && (form_change || spellData.SpellCharges < 0))
{ continue; }
}