diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Aura.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Aura.java
index 50d362f624c998820f54e98b130c1889c5ee3b02..b0b3bb3c0567975e917db8d056ac41c6d9dc55df 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Aura.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/Aura.java
@@ -26,9 +26,7 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
-import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 
@@ -42,62 +40,30 @@ public class Aura implements ITargetTypeHandler
 	{
 		List<L2Character> targetList = new FastList<>();
 		final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE));
-		
-		final L2PcInstance sourcePlayer = activeChar.getActingPlayer();
-		
 		final Collection<L2Character> objs = activeChar.getKnownList().getKnownCharactersInRadius(skill.getAffectRange());
 		
-		if (skill.getSkillType() == L2SkillType.DUMMY)
+		for (L2Character obj : objs)
 		{
-			if (onlyFirst)
-			{
-				return new L2Character[]
-				{
-					activeChar
-				};
-			}
-			
-			targetList.add(activeChar);
-			for (L2Character obj : objs)
+			if (obj.isL2Attackable() || obj.isPlayable())
 			{
-				if (!((obj == activeChar) || (obj == sourcePlayer) || obj.isNpc() || obj.isL2Attackable()))
+				if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
 				{
 					continue;
 				}
 				
-				if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+				if (onlyFirst)
 				{
-					break;
+					return new L2Character[]
+					{
+						obj
+					};
 				}
 				
-				targetList.add(obj);
-			}
-		}
-		else
-		{
-			for (L2Character obj : objs)
-			{
-				if (obj.isL2Attackable() || obj.isPlayable())
+				if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
 				{
-					if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
-					{
-						continue;
-					}
-					
-					if (onlyFirst)
-					{
-						return new L2Character[]
-						{
-							obj
-						};
-					}
-					
-					if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
-					{
-						break;
-					}
-					targetList.add(obj);
+					break;
 				}
+				targetList.add(obj);
 			}
 		}
 		return targetList.toArray(new L2Character[targetList.size()]);
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/BehindAura.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/BehindAura.java
index 04b95c39604da6bff7d7c3e0178336bf1e491986..10c28dd966de0f6da1f5df58e3e73523488c98c1 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/BehindAura.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/BehindAura.java
@@ -26,9 +26,7 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
-import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 
@@ -42,29 +40,31 @@ public class BehindAura implements ITargetTypeHandler
 	{
 		List<L2Character> targetList = new FastList<>();
 		final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE));
-		
-		final L2PcInstance sourcePlayer = activeChar.getActingPlayer();
-		
 		final Collection<L2Character> objs = activeChar.getKnownList().getKnownCharactersInRadius(skill.getAffectRange());
 		
-		if (skill.getSkillType() == L2SkillType.DUMMY)
+		for (L2Character obj : objs)
 		{
-			if (onlyFirst)
+			if (obj.isL2Attackable() || obj.isPlayable())
 			{
-				return new L2Character[]
+				
+				if (!obj.isBehind(activeChar))
 				{
-					activeChar
-				};
-			}
-			
-			targetList.add(activeChar);
-			for (L2Character obj : objs)
-			{
-				if (!((obj == activeChar) || (obj == sourcePlayer) || (obj.isNpc()) || (obj.isL2Attackable())))
+					continue;
+				}
+				
+				if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
 				{
 					continue;
 				}
 				
+				if (onlyFirst)
+				{
+					return new L2Character[]
+					{
+						obj
+					};
+				}
+				
 				if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
 				{
 					break;
@@ -72,39 +72,6 @@ public class BehindAura implements ITargetTypeHandler
 				targetList.add(obj);
 			}
 		}
-		else
-		{
-			for (L2Character obj : objs)
-			{
-				if (obj.isL2Attackable() || obj.isPlayable())
-				{
-					
-					if (!obj.isBehind(activeChar))
-					{
-						continue;
-					}
-					
-					if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
-					{
-						continue;
-					}
-					
-					if (onlyFirst)
-					{
-						return new L2Character[]
-						{
-							obj
-						};
-					}
-					
-					if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
-					{
-						break;
-					}
-					targetList.add(obj);
-				}
-			}
-		}
 		return targetList.toArray(new L2Character[targetList.size()]);
 	}
 	
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/FrontAura.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/FrontAura.java
index 4387176a1c1fb156f7d41a0d2a4e12494afaf8c2..021516397ad9a7f7f33a6713b5b61adcecd8fc1c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/FrontAura.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/FrontAura.java
@@ -26,9 +26,7 @@ import javolution.util.FastList;
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
-import com.l2jserver.gameserver.model.skills.L2SkillType;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 
@@ -42,29 +40,31 @@ public class FrontAura implements ITargetTypeHandler
 	{
 		List<L2Character> targetList = new FastList<>();
 		final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE));
-		
-		final L2PcInstance sourcePlayer = activeChar.getActingPlayer();
-		
 		final Collection<L2Character> objs = activeChar.getKnownList().getKnownCharactersInRadius(skill.getAffectRange());
 		
-		if (skill.getSkillType() == L2SkillType.DUMMY)
+		for (L2Character obj : objs)
 		{
-			if (onlyFirst)
+			if (obj.isL2Attackable() || obj.isPlayable())
 			{
-				return new L2Character[]
+				
+				if (!obj.isInFrontOf(activeChar))
 				{
-					activeChar
-				};
-			}
-			
-			targetList.add(activeChar);
-			for (L2Character obj : objs)
-			{
-				if (!((obj == activeChar) || (obj == sourcePlayer) || (obj.isNpc()) || (obj.isL2Attackable())))
+					continue;
+				}
+				
+				if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
 				{
 					continue;
 				}
 				
+				if (onlyFirst)
+				{
+					return new L2Character[]
+					{
+						obj
+					};
+				}
+				
 				if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
 				{
 					break;
@@ -72,39 +72,6 @@ public class FrontAura implements ITargetTypeHandler
 				targetList.add(obj);
 			}
 		}
-		else
-		{
-			for (L2Character obj : objs)
-			{
-				if (obj.isL2Attackable() || obj.isPlayable())
-				{
-					
-					if (!obj.isInFrontOf(activeChar))
-					{
-						continue;
-					}
-					
-					if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
-					{
-						continue;
-					}
-					
-					if (onlyFirst)
-					{
-						return new L2Character[]
-						{
-							obj
-						};
-					}
-					
-					if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
-					{
-						break;
-					}
-					targetList.add(obj);
-				}
-			}
-		}
 		return targetList.toArray(new L2Character[targetList.size()]);
 	}