diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/server/game/Miscellaneous/SharedDefines.h | 2 | ||||
| -rw-r--r-- | src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp | 6 | ||||
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 3196074a2fa..574ee066ff2 100644 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -770,7 +770,7 @@ enum SpellAttr9 : uint32 SPELL_ATTR9_COOLDOWN_IGNORES_RANGED_WEAPON = 0x00000100, // TITLE Cooldown Ignores Ranged Weapon SPELL_ATTR9_NOT_IN_ARENA = 0x00000200, // TITLE Not In Arena SPELL_ATTR9_TARGET_MUST_BE_GROUNDED = 0x00000400, // TITLE Target Must Be Grounded - SPELL_ATTR9_UNK11 = 0x00000800, // TITLE Unknown attribute 11@Attr9 + SPELL_ATTR9_ALLOW_WHILE_BANISHED_AURA_STATE = 0x00000800, // TITLE Allow While Banished Aura State DESCRIPTION Doesn't seem to be doing anything, banish behaves like a regular stun now - tested on patch 10.2.7 with spell 17767 (doesn't have this attribute, only SPELL_ATTR5_ALLOW_WHILE_STUNNED and was castable while banished) SPELL_ATTR9_UNK12 = 0x00001000, // TITLE Unknown attribute 12@Attr9 SPELL_ATTR9_SLAM = 0x00002000, // TITLE Haste Affects Melee Ability Casttime SPELL_ATTR9_USABLE_IN_RATED_BATTLEGROUNDS = 0x00004000, // TITLE Ignore Default Rated Battleground Restrictions diff --git a/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp b/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp index fc45be673c4..b945a697185 100644 --- a/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp +++ b/src/server/game/Miscellaneous/enuminfo_SharedDefines.cpp @@ -1446,7 +1446,7 @@ TC_API_EXPORT EnumText EnumUtils<SpellAttr9>::ToString(SpellAttr9 value) case SPELL_ATTR9_COOLDOWN_IGNORES_RANGED_WEAPON: return { "SPELL_ATTR9_COOLDOWN_IGNORES_RANGED_WEAPON", "Cooldown Ignores Ranged Weapon", "" }; case SPELL_ATTR9_NOT_IN_ARENA: return { "SPELL_ATTR9_NOT_IN_ARENA", "Not In Arena", "" }; case SPELL_ATTR9_TARGET_MUST_BE_GROUNDED: return { "SPELL_ATTR9_TARGET_MUST_BE_GROUNDED", "Target Must Be Grounded", "" }; - case SPELL_ATTR9_UNK11: return { "SPELL_ATTR9_UNK11", "Unknown attribute 11@Attr9", "" }; + case SPELL_ATTR9_ALLOW_WHILE_BANISHED_AURA_STATE: return { "SPELL_ATTR9_ALLOW_WHILE_BANISHED_AURA_STATE", "Allow While Banished Aura State", "Doesn't seem to be doing anything, banish behaves like a regular stun now - tested on patch 10.2.7 with spell 17767 (doesn't have this attribute, only SPELL_ATTR5_ALLOW_WHILE_STUNNED and was castable while banished)" }; case SPELL_ATTR9_UNK12: return { "SPELL_ATTR9_UNK12", "Unknown attribute 12@Attr9", "" }; case SPELL_ATTR9_SLAM: return { "SPELL_ATTR9_SLAM", "Haste Affects Melee Ability Casttime", "" }; case SPELL_ATTR9_USABLE_IN_RATED_BATTLEGROUNDS: return { "SPELL_ATTR9_USABLE_IN_RATED_BATTLEGROUNDS", "Ignore Default Rated Battleground Restrictions", "" }; @@ -1490,7 +1490,7 @@ TC_API_EXPORT SpellAttr9 EnumUtils<SpellAttr9>::FromIndex(size_t index) case 8: return SPELL_ATTR9_COOLDOWN_IGNORES_RANGED_WEAPON; case 9: return SPELL_ATTR9_NOT_IN_ARENA; case 10: return SPELL_ATTR9_TARGET_MUST_BE_GROUNDED; - case 11: return SPELL_ATTR9_UNK11; + case 11: return SPELL_ATTR9_ALLOW_WHILE_BANISHED_AURA_STATE; case 12: return SPELL_ATTR9_UNK12; case 13: return SPELL_ATTR9_SLAM; case 14: return SPELL_ATTR9_USABLE_IN_RATED_BATTLEGROUNDS; @@ -1531,7 +1531,7 @@ TC_API_EXPORT size_t EnumUtils<SpellAttr9>::ToIndex(SpellAttr9 value) case SPELL_ATTR9_COOLDOWN_IGNORES_RANGED_WEAPON: return 8; case SPELL_ATTR9_NOT_IN_ARENA: return 9; case SPELL_ATTR9_TARGET_MUST_BE_GROUNDED: return 10; - case SPELL_ATTR9_UNK11: return 11; + case SPELL_ATTR9_ALLOW_WHILE_BANISHED_AURA_STATE: return 11; case SPELL_ATTR9_UNK12: return 12; case SPELL_ATTR9_SLAM: return 13; case SPELL_ATTR9_USABLE_IN_RATED_BATTLEGROUNDS: return 14; diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 785f468612d..8c3408c9394 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -7122,8 +7122,6 @@ SpellCastResult Spell::CheckCasterAuras(int32* param1) const } else if (!CheckSpellCancelsStun(param1)) result = SPELL_FAILED_STUNNED; - else if ((m_spellInfo->Mechanic & MECHANIC_IMMUNE_SHIELD) && m_caster->ToUnit() && m_caster->ToUnit()->HasAuraWithMechanic(1 << MECHANIC_BANISH)) - result = SPELL_FAILED_STUNNED; } else if (unitCaster->IsSilenced(m_spellSchoolMask) && m_spellInfo->PreventionType & SPELL_PREVENTION_TYPE_SILENCE && !CheckSpellCancelsSilence(param1)) result = SPELL_FAILED_SILENCED; |