mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 10:37:02 +00:00
[10400] Fixed crash in .aura command for spell without auras.
This commit is contained in:
parent
d1172a1b9b
commit
82314c364a
7 changed files with 40 additions and 23 deletions
|
|
@ -3811,28 +3811,35 @@ bool ChatHandler::HandleAuraCommand(char* args)
|
|||
// number or [name] Shift-click form |color|Hspell:spell_id|h[name]|h|r or Htalent form
|
||||
uint32 spellID = ExtractSpellIdFromLink(&args);
|
||||
|
||||
if (SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellID))
|
||||
{
|
||||
SpellAuraHolder *holder = NULL;
|
||||
if (IsSpellAppliesAura(spellInfo, (1 << EFFECT_INDEX_0) | (1 << EFFECT_INDEX_1) | (1 << EFFECT_INDEX_2)) || IsSpellHaveEffect(spellInfo, SPELL_EFFECT_PERSISTENT_AREA_AURA))
|
||||
holder = CreateSpellAuraHolder(spellInfo, target, m_session->GetPlayer());
|
||||
SpellEntry const *spellInfo = sSpellStore.LookupEntry(spellID);
|
||||
if (!spellInfo)
|
||||
return false;
|
||||
|
||||
for(uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
|
||||
{
|
||||
uint8 eff = spellInfo->Effect[i];
|
||||
if (eff>=TOTAL_SPELL_EFFECTS)
|
||||
continue;
|
||||
if (IsAreaAuraEffect(eff) ||
|
||||
eff == SPELL_EFFECT_APPLY_AURA ||
|
||||
eff == SPELL_EFFECT_PERSISTENT_AREA_AURA)
|
||||
{
|
||||
Aura *aur = CreateAura(spellInfo, SpellEffectIndex(i), NULL, holder, target);
|
||||
holder->AddAura(aur, SpellEffectIndex(i));
|
||||
}
|
||||
}
|
||||
target->AddSpellAuraHolder(holder);
|
||||
if (!IsSpellAppliesAura(spellInfo, (1 << EFFECT_INDEX_0) | (1 << EFFECT_INDEX_1) | (1 << EFFECT_INDEX_2)) &&
|
||||
!IsSpellHaveEffect(spellInfo, SPELL_EFFECT_PERSISTENT_AREA_AURA))
|
||||
{
|
||||
PSendSysMessage(LANG_SPELL_NO_HAVE_AURAS, spellID);
|
||||
SetSentErrorMessage(true);
|
||||
return false;
|
||||
}
|
||||
|
||||
SpellAuraHolder *holder = CreateSpellAuraHolder(spellInfo, target, m_session->GetPlayer());
|
||||
|
||||
for(uint32 i = 0; i < MAX_EFFECT_INDEX; ++i)
|
||||
{
|
||||
uint8 eff = spellInfo->Effect[i];
|
||||
if (eff>=TOTAL_SPELL_EFFECTS)
|
||||
continue;
|
||||
if (IsAreaAuraEffect(eff) ||
|
||||
eff == SPELL_EFFECT_APPLY_AURA ||
|
||||
eff == SPELL_EFFECT_PERSISTENT_AREA_AURA)
|
||||
{
|
||||
Aura *aur = CreateAura(spellInfo, SpellEffectIndex(i), NULL, holder, target);
|
||||
holder->AddAura(aur, SpellEffectIndex(i));
|
||||
}
|
||||
}
|
||||
target->AddSpellAuraHolder(holder);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue