Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity

Core/Spell: reverted stun aura handling

Browse Source 
Partial revert of 50a3ce5703bdaa4fe16e2e773eabafa9a4818083

Closes #18487
Closes #18490
Closes #18497
This commit is contained in:
ariel- authored and roc13x committed 2017-05-04 03:47:21 +01:00
1 parent be418d3671
commit 0814834492
1 file changed
+42 -2
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/Spells/Spell.cpp
+42 -2
View File
@@ -5865,14 +5865,54 @@ SpellCastResult Spell::CheckCasterAuras(uint32* param1) const
// Get unit state
uint32 const unitflag = m_caster->GetUInt32Value(UNIT_FIELD_FLAGS);
// this check should only be done when player does cast directly
// (ie not when it's called from a script) Breaks for example PlayerAI when charmed
/*
if (m_caster->GetCharmerGUID())
{
if (Unit* charmer = m_caster->GetCharmer())
if (charmer->GetUnitBeingMoved() != m_caster && !CheckSpellCancelsCharm(param1))
result = SPELL_FAILED_CHARMED;
}
else if (unitflag & UNIT_FLAG_STUNNED && !usableWhileStunned && !CheckSpellCancelsStun(param1))
result = SPELL_FAILED_STUNNED;
*/
if (unitflag & UNIT_FLAG_STUNNED)
{
// spell is usable while stunned, check if caster has allowed stun auras, another stun types must prevent cast spell
if (usableWhileStunned)
{
static uint32 const allowedStunMask =
1 << MECHANIC_STUN
| 1 << MECHANIC_SLEEP;
bool foundNotStun = false;
Unit::AuraEffectList const& stunAuras = m_caster->GetAuraEffectsByType(SPELL_AURA_MOD_STUN);
for (AuraEffect const* stunEff : stunAuras)
{
uint32 const stunMechanicMask = stunEff->GetSpellInfo()->GetAllEffectsMechanicMask();
if (stunMechanicMask && !(stunMechanicMask & allowedStunMask))
{
foundNotStun = true;
// fill up aura mechanic info to send client proper error message
if (param1)
{
*param1 = stunEff->GetSpellInfo()->Effects[stunEff->GetEffIndex()].Mechanic;
if (!*param1)
*param1 = stunEff->GetSpellInfo()->Mechanic;
}
break;
}
}
if (foundNotStun)
result = SPELL_FAILED_STUNNED;
}
// Not usable while stunned, however spell might provide some immunity that allows to cast it anyway
else if (!CheckSpellCancelsStun(param1))
result = SPELL_FAILED_STUNNED;
}
else if (unitflag & UNIT_FLAG_SILENCED && m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_SILENCE && !CheckSpellCancelsSilence(param1))
result = SPELL_FAILED_SILENCED;
else if (unitflag & UNIT_FLAG_PACIFIED && m_spellInfo->PreventionType == SPELL_PREVENTION_TYPE_PACIFY && !CheckSpellCancelsPacify(param1))