Merge branch 'master' of github.com:joschiwald/TrinityCore into spellscripts

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Spells/spell_paladin.cpp

src/server/scripts/Spells/spell_paladin.cpp

@@ -297,13 +297,15 @@ class spell_pal_holy_shock : public SpellScriptLoader
                 {
                     if (!caster->IsFriendlyTo(target))
                     {
-                        if (!caster->HasInArc(static_cast<float>(M_PI), target))
-                            return SPELL_FAILED_UNIT_NOT_INFRONT;
-
                         if (!caster->IsValidAttackTarget(target))
                             return SPELL_FAILED_BAD_TARGETS;
+
+                        if (!caster->isInFront(target))
+                            return SPELL_FAILED_UNIT_NOT_INFRONT;
                     }
                 }
+                else
+                    return SPELL_FAILED_BAD_TARGETS;
                 return SPELL_CAST_OK;
             }