Merge remote-tracking branch 'origin/master' into 4.3.4

Conflicts:
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp

1 files changed, 7 insertions, 7 deletions

diff --git a/src/server/scripts/Spells/spell_warlock.cpp b/src/server/scripts/Spells/spell_warlock.cpp
index a48661d4aed..0def62b7d3a 100644
--- a/src/server/scripts/Spells/spell_warlock.cpp
+++ b/src/server/scripts/Spells/spell_warlock.cpp
@@ -679,38 +679,38 @@ class spell_warl_health_funnel : public SpellScriptLoader
 {
 public:
     spell_warl_health_funnel() : SpellScriptLoader("spell_warl_health_funnel") { }
- 
+
     class spell_warl_health_funnel_AuraScript : public AuraScript
     {
-        PrepareAuraScript(spell_warl_health_funnel_AuraScript)
-        
+        PrepareAuraScript(spell_warl_health_funnel_AuraScript);
+
         void ApplyEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
         {
             Unit* caster = GetCaster();
             if (!caster)
                 return;
-                
+
             Unit* target = GetTarget();
             if (caster->HasAura(WARLOCK_IMPROVED_HEALTH_FUNNEL_R2))
                 target->CastSpell(target, WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R2, true);
             else if (caster->HasAura(WARLOCK_IMPROVED_HEALTH_FUNNEL_R1))
                 target->CastSpell(target, WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R1, true);
         }
- 
+
         void RemoveEffect(AuraEffect const* /*aurEff*/, AuraEffectHandleModes /*mode*/)
         {
             Unit* target = GetTarget();
             target->RemoveAurasDueToSpell(WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R1);
             target->RemoveAurasDueToSpell(WARLOCK_IMPROVED_HEALTH_FUNNEL_BUFF_R2);
         }
- 
+
         void Register()
         {
             OnEffectRemove += AuraEffectRemoveFn(spell_warl_health_funnel_AuraScript::RemoveEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL);
             OnEffectApply += AuraEffectApplyFn(spell_warl_health_funnel_AuraScript::ApplyEffect, EFFECT_0, SPELL_AURA_PERIODIC_HEAL, AURA_EFFECT_HANDLE_REAL);
         }
     };
- 
+
     AuraScript* GetAuraScript() const
     {
         return new spell_warl_health_funnel_AuraScript();