aboutsummaryrefslogtreecommitdiff
path: root/src/server/game/Handlers/SpellHandler.cpp
diff options
context:
space:
mode:
authorShauren <shauren.trinity@gmail.com>2022-04-24 18:40:10 +0200
committerShauren <shauren.trinity@gmail.com>2022-04-24 18:40:10 +0200
commita31e6819447626cd7b6967665001ea89bf6a0298 (patch)
tree990b29701465f18e7141cfe091d5d31d2664a469 /src/server/game/Handlers/SpellHandler.cpp
parent51299ab88620a56bd3c7f3e38a9b28844252aae7 (diff)
Core/Spells: Rename SpellAttr0 to use official attribute names
Diffstat (limited to 'src/server/game/Handlers/SpellHandler.cpp')
-rw-r--r--src/server/game/Handlers/SpellHandler.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/server/game/Handlers/SpellHandler.cpp b/src/server/game/Handlers/SpellHandler.cpp
index daa1cda6c88..1de96660fc5 100644
--- a/src/server/game/Handlers/SpellHandler.cpp
+++ b/src/server/game/Handlers/SpellHandler.cpp
@@ -380,7 +380,7 @@ void WorldSession::HandleCancelAuraOpcode(WorldPackets::Spells::CancelAura& canc
return;
// not allow remove spells with attr SPELL_ATTR0_CANT_CANCEL
- if (spellInfo->HasAttribute(SPELL_ATTR0_CANT_CANCEL))
+ if (spellInfo->HasAttribute(SPELL_ATTR0_NO_AURA_CANCEL))
return;
// channeled spell case (it currently cast then)
@@ -437,7 +437,7 @@ void WorldSession::HandleCancelGrowthAuraOpcode(WorldPackets::Spells::CancelGrow
_player->RemoveAurasByType(SPELL_AURA_MOD_SCALE, [](AuraApplication const* aurApp)
{
SpellInfo const* spellInfo = aurApp->GetBase()->GetSpellInfo();
- return !spellInfo->HasAttribute(SPELL_ATTR0_CANT_CANCEL) && spellInfo->IsPositive() && !spellInfo->IsPassive();
+ return !spellInfo->HasAttribute(SPELL_ATTR0_NO_AURA_CANCEL) && spellInfo->IsPositive() && !spellInfo->IsPassive();
});
}
@@ -446,7 +446,7 @@ void WorldSession::HandleCancelMountAuraOpcode(WorldPackets::Spells::CancelMount
_player->RemoveAurasByType(SPELL_AURA_MOUNTED, [](AuraApplication const* aurApp)
{
SpellInfo const* spellInfo = aurApp->GetBase()->GetSpellInfo();
- return !spellInfo->HasAttribute(SPELL_ATTR0_CANT_CANCEL) && spellInfo->IsPositive() && !spellInfo->IsPassive();
+ return !spellInfo->HasAttribute(SPELL_ATTR0_NO_AURA_CANCEL) && spellInfo->IsPositive() && !spellInfo->IsPassive();
});
}
@@ -469,7 +469,7 @@ void WorldSession::HandleCancelChanneling(WorldPackets::Spells::CancelChannellin
return;
// not allow remove spells with attr SPELL_ATTR0_CANT_CANCEL
- if (spellInfo->HasAttribute(SPELL_ATTR0_CANT_CANCEL))
+ if (spellInfo->HasAttribute(SPELL_ATTR0_NO_AURA_CANCEL))
return;
Spell* spell = mover->GetCurrentSpell(CURRENT_CHANNELED_SPELL);