mirror of
https://github.com/mangosfour/server.git
synced 2025-12-15 19:37:02 +00:00
[7012] Fix use SpellVisual data
Signed-off-by: DiSlord <dislord@nomail.com>
This commit is contained in:
parent
1f4b00a848
commit
ba5e3dabc6
4 changed files with 5 additions and 5 deletions
|
|
@ -5338,7 +5338,7 @@ Unit* Spell::SelectMagnetTarget()
|
||||||
|
|
||||||
bool Spell::IsNeedSendToClient() const
|
bool Spell::IsNeedSendToClient() const
|
||||||
{
|
{
|
||||||
return m_spellInfo->SpellVisual!=0 || IsChanneledSpell(m_spellInfo) ||
|
return m_spellInfo->SpellVisual[0] || m_spellInfo->SpellVisual[1] || IsChanneledSpell(m_spellInfo) ||
|
||||||
m_spellInfo->speed > 0.0f || !m_triggeredByAuraSpell && !m_IsTriggeredSpell;
|
m_spellInfo->speed > 0.0f || !m_triggeredByAuraSpell && !m_IsTriggeredSpell;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4120,7 +4120,7 @@ void Aura::HandlePeriodicDamage(bool apply, bool Real)
|
||||||
case SPELLFAMILY_GENERIC:
|
case SPELLFAMILY_GENERIC:
|
||||||
{
|
{
|
||||||
// Pounce Bleed
|
// Pounce Bleed
|
||||||
if ( m_spellProto->SpellIconID == 147 && m_spellProto->SpellVisual == 0 )
|
if ( m_spellProto->SpellIconID == 147 && m_spellProto->SpellVisual[0] == 0 )
|
||||||
{
|
{
|
||||||
// $AP*0.18/6 bonus per tick
|
// $AP*0.18/6 bonus per tick
|
||||||
if (apply && !loading && caster)
|
if (apply && !loading && caster)
|
||||||
|
|
|
||||||
|
|
@ -1137,7 +1137,7 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
|
||||||
case SPELLFAMILY_ROGUE:
|
case SPELLFAMILY_ROGUE:
|
||||||
{
|
{
|
||||||
// Garrote-Silence -> Garrote (multi-family check)
|
// Garrote-Silence -> Garrote (multi-family check)
|
||||||
if( spellInfo_1->SpellIconID == 498 && spellInfo_1->SpellVisual == 0 && spellInfo_2->SpellIconID == 498 )
|
if( spellInfo_1->SpellIconID == 498 && spellInfo_1->SpellVisual[0] == 0 && spellInfo_2->SpellIconID == 498 )
|
||||||
return false;
|
return false;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
|
|
@ -1200,7 +1200,7 @@ bool SpellMgr::IsNoStackSpellDueToSpell(uint32 spellId_1, uint32 spellId_2) cons
|
||||||
//Corruption & Seed of corruption
|
//Corruption & Seed of corruption
|
||||||
if( spellInfo_1->SpellIconID == 313 && spellInfo_2->SpellIconID == 1932 ||
|
if( spellInfo_1->SpellIconID == 313 && spellInfo_2->SpellIconID == 1932 ||
|
||||||
spellInfo_2->SpellIconID == 313 && spellInfo_1->SpellIconID == 1932 )
|
spellInfo_2->SpellIconID == 313 && spellInfo_1->SpellIconID == 1932 )
|
||||||
if(spellInfo_1->SpellVisual != 0 && spellInfo_2->SpellVisual != 0)
|
if(spellInfo_1->SpellVisual[0] != 0 && spellInfo_2->SpellVisual[0] != 0)
|
||||||
return true; // can't be stacked
|
return true; // can't be stacked
|
||||||
|
|
||||||
// Corruption and Unstable Affliction
|
// Corruption and Unstable Affliction
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
#ifndef __REVISION_NR_H__
|
#ifndef __REVISION_NR_H__
|
||||||
#define __REVISION_NR_H__
|
#define __REVISION_NR_H__
|
||||||
#define REVISION_NR "7011"
|
#define REVISION_NR "7012"
|
||||||
#endif // __REVISION_NR_H__
|
#endif // __REVISION_NR_H__
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue