Rebase resync

This commit is contained in:
Antz 2020-02-17 09:19:44 +00:00
parent a0797532e8
commit 1997c1e903
3106 changed files with 11118 additions and 627576 deletions

View file

@ -1,4 +1,4 @@
/*
/**
* This code is part of MaNGOS. Contributor & Copyright details are in AUTHORS/THANKS.
*
* This program is free software; you can redistribute it and/or modify
@ -3778,8 +3778,7 @@ void Spell::EffectTriggerSpell(SpellEffectEntry const* effect)
// special cases
switch (triggered_spell_id)
{
// Vanish (not exist)
case 18461:
case 18461: // Vanish (not exist)
{
unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_ROOT);
unitTarget->RemoveSpellsCausingAura(SPELL_AURA_MOD_DECREASE_SPEED);
@ -3801,22 +3800,18 @@ void Spell::EffectTriggerSpell(SpellEffectEntry const* effect)
case 23770: // Sayge's Dark Fortune of *
// not exist, common cooldown can be implemented in scripts if need.
return;
// Brittle Armor - (need add max stack of 24575 Brittle Armor)
case 29284:
case 29284: // Brittle Armor - (need add max stack of 24575 Brittle Armor)
m_caster->CastSpell(unitTarget, 24575, true, m_CastItem, NULL, m_originalCasterGUID);
return;
// Mercurial Shield - (need add max stack of 26464 Mercurial Shield)
case 29286:
case 29286: // Mercurial Shield - (need add max stack of 26464 Mercurial Shield)
m_caster->CastSpell(unitTarget, 26464, true, m_CastItem, NULL, m_originalCasterGUID);
return;
// Righteous Defense
case 31980:
case 31980: // Righteous Defense
{
m_caster->CastSpell(unitTarget, 31790, true, m_CastItem, NULL, m_originalCasterGUID);
return;
}
// Cloak of Shadows
case 35729:
case 35729: // Cloak of Shadows
{
Unit::SpellAuraHolderMap& Auras = unitTarget->GetSpellAuraHolderMap();
for (Unit::SpellAuraHolderMap::iterator iter = Auras.begin(); iter != Auras.end(); ++iter)
@ -3833,15 +3828,13 @@ void Spell::EffectTriggerSpell(SpellEffectEntry const* effect)
}
return;
}
// Priest Shadowfiend (34433) need apply mana gain trigger aura on pet
case 41967:
case 41967: // Priest Shadowfiend (34433) need apply mana gain trigger aura on pet
{
if (Unit* pet = unitTarget->GetPet())
pet->CastSpell(pet, 28305, true);
return;
}
// Empower Rune Weapon
case 53258:
case 53258: // Empower Rune Weapon
{
// remove cooldown of frost/death, undead/blood activated in main spell
if (unitTarget->GetTypeId() == TYPEID_PLAYER)