Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 08:55:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

*Move unsummon statue and pet code to spell::finish

Browse Source 
*Move m_formalCaster from Aura to AuraEffect
*Interrupt channeled spells in spell::update instead of unit::_deleteauras

--HG--
branch : trunk
This commit is contained in:
QAston
2009-04-20 23:08:03 +02:00
parent 0faac25742
commit 7139aa19d8
5 changed files with 70 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/game/Unit.cpp
View File

@@ -3198,56 +3198,6 @@ void Unit::_DeleteAuras()
for (AuraList::iterator i = m_removedAuras.begin(); i != m_removedAuras.end();i = m_removedAuras.begin())
{
Aura * Aur = *i;
SpellEntry const* AurSpellInfo = Aur->GetSpellProto();
// Statue unsummoned at aura delete
Totem* statue = NULL;
if(Aur->GetAuraDuration() && !Aur->IsPersistent() && IsChanneledSpell(Aur->GetSpellProto()))
{
Unit* caster = Aur->GetFormalCaster();
if(caster && caster->isAlive())
{
// stop caster chanelling state
if(caster->m_currentSpells[CURRENT_CHANNELED_SPELL])
{
// same spell
if (AurSpellInfo == caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->m_spellInfo
//prevent recurential call
&& caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->getState() != SPELL_STATE_FINISHED)
{
if (caster==this || !IsAreaOfEffectSpell(AurSpellInfo))
{
// remove auras only for non-aoe spells or when chanelled aura is removed
// because aoe spells don't require aura on target to continue
caster->m_currentSpells[CURRENT_CHANNELED_SPELL]->cancel();
}
if(caster->GetTypeId()==TYPEID_UNIT && ((Creature*)caster)->isTotem() && ((Totem*)caster)->GetTotemType()==TOTEM_STATUE)
statue = ((Totem*)caster);
}
}
// Unsummon summon as possessed creatures on spell cancel
if(caster->GetTypeId() == TYPEID_PLAYER)
{
for(int i = 0; i < 3; ++i)
{
if(AurSpellInfo->Effect[i] == SPELL_EFFECT_SUMMON)
if(SummonPropertiesEntry const *SummonProperties = sSummonPropertiesStore.LookupEntry(AurSpellInfo->EffectMiscValueB[i]))
if(SummonProperties->Category == SUMMON_CATEGORY_POSSESSED)
{
((Player*)caster)->StopCastingCharm();
break;
}
}
}
}
}
if(statue)
{
sLog.outDebug("Statue %d is unsummoned by aura %d delete from unit %d", statue->GetGUIDLow(), Aur->GetId(),GetGUIDLow());
statue->UnSummon();
}
sLog.outDebug("Aura %d is deleted from unit %d", Aur->GetId(), GetGUIDLow());
m_removedAuras.pop_front();
delete (Aur);