diff options
| author | Manuel <manue.l@live.com.ar> | 2011-01-16 15:13:22 -0300 |
|---|---|---|
| committer | Manuel <manue.l@live.com.ar> | 2011-01-16 15:13:22 -0300 |
| commit | 98d3cc01d58d9bbdd8b02f1f64bb3432649aa2c2 (patch) | |
| tree | 93b7235de06ffbd4f18ccf58ec62f7e079d7d7f5 /src/server/game/Spells | |
| parent | 7b7327acdcbeadc5ec509da4520190205d640f52 (diff) | |
| parent | df334f194c7b0da49fd1c1a4f821df78a0e25fb8 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore
Diffstat (limited to 'src/server/game/Spells')
| -rwxr-xr-x | src/server/game/Spells/Auras/SpellAuraEffects.cpp | 6 | ||||
| -rwxr-xr-x | src/server/game/Spells/Spell.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/server/game/Spells/Auras/SpellAuraEffects.cpp b/src/server/game/Spells/Auras/SpellAuraEffects.cpp index f811b20d9d8..125203dfdeb 100755 --- a/src/server/game/Spells/Auras/SpellAuraEffects.cpp +++ b/src/server/game/Spells/Auras/SpellAuraEffects.cpp @@ -1142,9 +1142,9 @@ void AuraEffect::UpdatePeriodic(Unit * caster) } else { - //********************************************** + // ********************************************** // This feature uses only in arenas - //********************************************** + // ********************************************** // Here need increase mana regen per tick (6 second rule) // on 0 tick - 0 (handled in 2 second) // on 1 tick - 166% (handled in 4 second) @@ -1931,7 +1931,7 @@ void AuraEffect::PeriodicDummyTick(Unit * target, Unit * caster) const } case 54798: // FLAMING Arrow Triggered Effect { - if (!target->ToCreature() || !caster->ToCreature()->IsVehicle()) + if (!target || !target->ToCreature() || !caster->ToCreature()->IsVehicle()) return; Unit *rider = caster->GetVehicleKit()->GetPassenger(0); diff --git a/src/server/game/Spells/Spell.h b/src/server/game/Spells/Spell.h index 1d775c9c825..0d7f163c0ea 100755 --- a/src/server/game/Spells/Spell.h +++ b/src/server/game/Spells/Spell.h @@ -606,17 +606,17 @@ class Spell int32 m_damage; // Damge in effects count here int32 m_healing; // Healing in effects count here - //****************************************** + // ****************************************** // Spell trigger system - //****************************************** + // ****************************************** uint32 m_procAttacker; // Attacker trigger flags uint32 m_procVictim; // Victim trigger flags uint32 m_procEx; void prepareDataForTriggerSystem(AuraEffect const * triggeredByAura); - //***************************************** + // ***************************************** // Spell target subsystem - //***************************************** + // ***************************************** // Targets store structures and data struct TargetInfo { |