mirror of
https://github.com/mangosfour/server.git
synced 2025-12-20 07:37:02 +00:00
[9490] Make common apply/remove handler for another spell group in HandleAuraDummy
This commit is contained in:
parent
7550c31138
commit
9ba8235649
2 changed files with 27 additions and 30 deletions
|
|
@ -2268,22 +2268,6 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
|
||||||
if (Unit* caster = GetCaster())
|
if (Unit* caster = GetCaster())
|
||||||
caster->CastSpell(caster, 13138, true, NULL, this);
|
caster->CastSpell(caster, 13138, true, NULL, this);
|
||||||
return;
|
return;
|
||||||
case 35356: // Spawn Feign Death
|
|
||||||
case 35357: // Spawn Feign Death
|
|
||||||
case 42557: // Feign Death
|
|
||||||
{
|
|
||||||
if (m_target->GetTypeId() == TYPEID_UNIT)
|
|
||||||
{
|
|
||||||
// Flags not set like it's done in SetFeignDeath() and apparently always applied at spawn of creature
|
|
||||||
// All three does however have SPELL_EFFECT_SPAWN(46) as effect1
|
|
||||||
// It is possible this effect will remove some flags, and then the three here can be handled "normally"
|
|
||||||
m_target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29);
|
|
||||||
m_target->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH);
|
|
||||||
|
|
||||||
m_target->addUnitState(UNIT_STAT_DIED);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
case 39850: // Rocket Blast
|
case 39850: // Rocket Blast
|
||||||
if(roll_chance_i(20)) // backfire stun
|
if(roll_chance_i(20)) // backfire stun
|
||||||
m_target->CastSpell(m_target, 51581, true, NULL, this);
|
m_target->CastSpell(m_target, 51581, true, NULL, this);
|
||||||
|
|
@ -2448,19 +2432,6 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
|
||||||
m_target->CastSpell(m_target, 28240, true, NULL, this);
|
m_target->CastSpell(m_target, 28240, true, NULL, this);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
case 35356: // Spawn Feign Death
|
|
||||||
case 35357: // Spawn Feign Death
|
|
||||||
case 42557: // Feign Death
|
|
||||||
{
|
|
||||||
if (m_target->GetTypeId() == TYPEID_UNIT)
|
|
||||||
{
|
|
||||||
m_target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29);
|
|
||||||
m_target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH);
|
|
||||||
|
|
||||||
m_target->clearUnitState(UNIT_STAT_DIED);
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
case 32286: // Focus Target Visual
|
case 32286: // Focus Target Visual
|
||||||
{
|
{
|
||||||
if (m_removeMode == AURA_REMOVE_BY_DEFAULT)
|
if (m_removeMode == AURA_REMOVE_BY_DEFAULT)
|
||||||
|
|
@ -2595,6 +2566,32 @@ void Aura::HandleAuraDummy(bool apply, bool Real)
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
case 35356: // Spawn Feign Death
|
||||||
|
case 35357: // Spawn Feign Death
|
||||||
|
case 42557: // Feign Death
|
||||||
|
{
|
||||||
|
if (m_target->GetTypeId() == TYPEID_UNIT)
|
||||||
|
{
|
||||||
|
// Flags not set like it's done in SetFeignDeath() and apparently always applied at spawn of creature
|
||||||
|
// All three does however have SPELL_EFFECT_SPAWN(46) as effect1
|
||||||
|
// It is possible this effect will remove some flags, and then the three here can be handled "normally"
|
||||||
|
if (apply)
|
||||||
|
{
|
||||||
|
m_target->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29);
|
||||||
|
m_target->SetFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH);
|
||||||
|
|
||||||
|
m_target->addUnitState(UNIT_STAT_DIED);
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
m_target->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_UNK_29);
|
||||||
|
m_target->RemoveFlag(UNIT_FIELD_FLAGS_2, UNIT_FLAG2_FEIGN_DEATH);
|
||||||
|
|
||||||
|
m_target->clearUnitState(UNIT_STAT_DIED);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
//Summon Fire Elemental
|
//Summon Fire Elemental
|
||||||
case 40133:
|
case 40133:
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "9489"
|
#define REVISION_NR "9490"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue