nchebrov/azerothcore-wotlk
1
0
Fork 0
mirror of https://github.com/mod-playerbots/azerothcore-wotlk.git synced 2026-02-04 11:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(Core/Misc): Define & Rename Attributes (#5311)

Browse Source
This commit is contained in:
Kitzunu
2021-04-28 14:55:24 +02:00
committed by GitHub
parent 0a571973d7
commit 5954d9c739
22 changed files with 667 additions and 666 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/server/game/Handlers/PetHandler.cpp
View File

@@ -414,7 +414,7 @@ void WorldSession::HandlePetAction(WorldPacket& recvData)
{
// xinef: allow dissmis dead pets
SpellInfo const* spell = (flag == ACT_ENABLED || flag == ACT_PASSIVE) ? sSpellMgr->GetSpellInfo(spellid) : nullptr;
if ((flag != ACT_COMMAND || spellid != COMMAND_ABANDON) && (!spell || !spell->HasAttribute(SPELL_ATTR0_CASTABLE_WHILE_DEAD)))
if ((flag != ACT_COMMAND || spellid != COMMAND_ABANDON) && (!spell || !spell->HasAttribute(SPELL_ATTR0_ALLOW_CAST_WHILE_DEAD)))
return;
}

4
src/server/game/Handlers/SpellHandler.cpp
View File

@@ -479,8 +479,8 @@ void WorldSession::HandleCancelAuraOpcode(WorldPacket& recvPacket)
if (!spellInfo)
return;
// not allow remove non positive spells and spells with attr SPELL_ATTR0_CANT_CANCEL
if ((!spellInfo->IsPositive() || spellInfo->HasAttribute(SPELL_ATTR0_CANT_CANCEL) || spellInfo->IsPassive()) && spellId != 605)
// not allow remove non positive spells and spells with attr SPELL_ATTR0_NO_AURA_CANCEL
if ((!spellInfo->IsPositive() || spellInfo->HasAttribute(SPELL_ATTR0_NO_AURA_CANCEL) || spellInfo->IsPassive()) && spellId != 605)
return;
// channeled spell case (it currently casted then)