mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-14 07:37:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8028] Missing part of [7879] commit.

Browse source 
Signed-off-by: ApoC <apoc@nymfe.net>
This commit is contained in:
Tanatos 2009-06-16 14:10:10 +02:00 • committed by ApoC
parent 21a650889c
commit 57ac3bdfef
3 changed files with 11 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/game/Spell.cpp
View file

@ -767,9 +767,13 @@ void Spell::prepareDataForTriggerSystem()
{ {
switch (m_spellInfo->SpellFamilyName) switch (m_spellInfo->SpellFamilyName)
{ {
case SPELLFAMILY_MAGE: // Arcane Missles / Blizzard triggers need do it case SPELLFAMILY_MAGE:
// Arcane Missles / Blizzard triggers need do it
if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000200080)) if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000000200080))
m_canTrigger = true; m_canTrigger = true;
// Clearcasting trigger need do it
else if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000000200000000) && m_spellInfo->SpellFamilyFlags2 & 0x8)
m_canTrigger = true;
break; break;
case SPELLFAMILY_WARLOCK: // For Hellfire Effect / Rain of Fire / Seed of Corruption triggers need do it case SPELLFAMILY_WARLOCK: // For Hellfire Effect / Rain of Fire / Seed of Corruption triggers need do it
if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000800000000060)) if (m_spellInfo->SpellFamilyFlags & UI64LIT(0x0000800000000060))

4
src/game/Unit.cpp
View file

@ -10920,6 +10920,10 @@ void Unit::ProcDamageAndSpellFor( bool isVictim, Unit * pTarget, uint32 procFlag
if (triggeredByAura->GetCasterGUID() != pTarget->GetGUID()) if (triggeredByAura->GetCasterGUID() != pTarget->GetGUID())
continue; continue;
break; break;
case SPELL_AURA_MOD_SPELL_CRIT_CHANCE:
if (!procSpell)
continue;
break;
default: default:
// nothing do, just charges counter // nothing do, just charges counter
break; break;

2
src/shared/revision_nr.h
View file

@ -1,4 +1,4 @@
#ifndef __REVISION_NR_H__ #ifndef __REVISION_NR_H__
#define __REVISION_NR_H__ #define __REVISION_NR_H__
#define REVISION_NR "8027" #define REVISION_NR "8028"
#endif // __REVISION_NR_H__ #endif // __REVISION_NR_H__