BETA: Moving target types out of L2Skill.

	* Renamed some method to match it's function.
	* Better Format setting for enums.

L2J_Server_BETA/.settings/org.eclipse.jdt.core.prefs

@@ -1,4 +1,4 @@
-#Sat Oct 01 02:05:14 UYT 2011
+#Mon Oct 03 22:35:58 UYST 2011
 eclipse.preferences.version=1
 org.eclipse.jdt.core.codeComplete.argumentPrefixes=
 org.eclipse.jdt.core.codeComplete.argumentSuffixes=
@@ -105,7 +105,7 @@ org.eclipse.jdt.core.formatter.alignment_for_assignment=0
 org.eclipse.jdt.core.formatter.alignment_for_binary_expression=0
 org.eclipse.jdt.core.formatter.alignment_for_compact_if=0
 org.eclipse.jdt.core.formatter.alignment_for_conditional_expression=0
-org.eclipse.jdt.core.formatter.alignment_for_enum_constants=0
+org.eclipse.jdt.core.formatter.alignment_for_enum_constants=48
 org.eclipse.jdt.core.formatter.alignment_for_expressions_in_array_initializer=48
 org.eclipse.jdt.core.formatter.alignment_for_method_declaration=0
 org.eclipse.jdt.core.formatter.alignment_for_multiple_fields=16

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2AttackableAI.java

@@ -32,7 +32,6 @@ import com.l2jserver.gameserver.instancemanager.DimensionalRiftManager;
 import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
@@ -52,6 +51,7 @@ import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate.AIType;
 import com.l2jserver.gameserver.templates.skills.L2EffectType;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Util;
 import com.l2jserver.util.Rnd;
 
@@ -922,7 +922,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					if (leader != null && !leader.isDead() && Rnd.get(100) > (leader.getCurrentHp() / leader.getMaxHp() * 100))
 						for (L2Skill sk : _skillrender._healskills)
 						{
-							if (sk.getTargetType() == L2Skill.SkillTargetType.TARGET_SELF)
+							if (sk.getTargetType() == L2TargetType.TARGET_SELF)
 								continue;
 							if ((sk.getMpConsume() >= npc.getCurrentMp() || npc.isSkillDisabled(sk) || (sk.isMagic() && npc.isMuted()) || (!sk.isMagic() && npc.isPhysicalMuted())))
 							{
@@ -961,7 +961,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					{
 						continue;
 					}
-					if (sk.getTargetType() == L2Skill.SkillTargetType.TARGET_ONE)
+					if (sk.getTargetType() == L2TargetType.TARGET_ONE)
 						for (L2Character obj : npc.getKnownList().getKnownCharactersInRadius(sk.getCastRange() + collision))
 						{
 							if (!(obj instanceof L2Attackable) || obj.isDead())
@@ -1000,7 +1000,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					if (leader != null && leader.isDead())
 						for (L2Skill sk : _skillrender._resskills)
 						{
-							if (sk.getTargetType() == L2Skill.SkillTargetType.TARGET_SELF)
+							if (sk.getTargetType() == L2TargetType.TARGET_SELF)
 								continue;
 							if ((sk.getMpConsume() >= npc.getCurrentMp() || npc.isSkillDisabled(sk) || (sk.isMagic() && npc.isMuted()) || (!sk.isMagic() && npc.isPhysicalMuted())))
 							{
@@ -1026,7 +1026,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					{
 						continue;
 					}
-					if (sk.getTargetType() == L2Skill.SkillTargetType.TARGET_ONE)
+					if (sk.getTargetType() == L2TargetType.TARGET_ONE)
 						for (L2Character obj : npc.getKnownList().getKnownCharactersInRadius(sk.getCastRange() + collision))
 						{
 							if (!(obj instanceof L2Attackable) || !obj.isDead())
@@ -1252,9 +1252,9 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				//----------------------------------------
 				//If actor already have buff, start looking at others same faction mob to cast
-				if (sk.getTargetType() == L2Skill.SkillTargetType.TARGET_SELF)
+				if (sk.getTargetType() == L2TargetType.TARGET_SELF)
 					return false;
-				if (sk.getTargetType() == L2Skill.SkillTargetType.TARGET_ONE)
+				if (sk.getTargetType() == L2TargetType.TARGET_ONE)
 				{
 					L2Character target = effectTargetReconsider(sk, true);
 					if (target != null)
@@ -1285,7 +1285,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			case BALANCE_LIFE:
 			{
 				double percentage = caster.getCurrentHp() / caster.getMaxHp() * 100;
-				if (caster.isMinion() && sk.getTargetType() != L2Skill.SkillTargetType.TARGET_SELF)
+				if (caster.isMinion() && sk.getTargetType() != L2TargetType.TARGET_SELF)
 				{
 					L2Character leader = caster.getLeader();
 					if (leader != null && !leader.isDead() && Rnd.get(100) > (leader.getCurrentHp() / leader.getMaxHp() * 100))
@@ -1311,7 +1311,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					return true;
 				}
 				
-				if (sk.getTargetType() == L2Skill.SkillTargetType.TARGET_ONE)
+				if (sk.getTargetType() == L2TargetType.TARGET_ONE)
 					for (L2Character obj : caster.getKnownList().getKnownCharactersInRadius(sk.getCastRange() + caster.getTemplate().collisionRadius))
 					{
 						if (!(obj instanceof L2Attackable) || obj.isDead())
@@ -1359,7 +1359,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			{
 				if (!isParty(sk))
 				{
-					if (caster.isMinion() && sk.getTargetType() != L2Skill.SkillTargetType.TARGET_SELF)
+					if (caster.isMinion() && sk.getTargetType() != L2TargetType.TARGET_SELF)
 					{
 						L2Character leader = caster.getLeader();
 						if (leader != null && leader.isDead())
@@ -1436,7 +1436,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				else if (canAOE(sk))
 				{
-					if (sk.getTargetType() == SkillTargetType.TARGET_AURA || sk.getTargetType() == SkillTargetType.TARGET_BEHIND_AURA || sk.getTargetType() == SkillTargetType.TARGET_FRONT_AURA  || (sk.getTargetType() == L2Skill.SkillTargetType.TARGET_AURA_CORPSE_MOB))
+					if (sk.getTargetType() == L2TargetType.TARGET_AURA || sk.getTargetType() == L2TargetType.TARGET_BEHIND_AURA || sk.getTargetType() == L2TargetType.TARGET_FRONT_AURA  || (sk.getTargetType() == L2TargetType.TARGET_AURA_CORPSE_MOB))
 					{
 						clientStopMoving(null);
 						//L2Object target = attackTarget;
@@ -1445,14 +1445,14 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 						//_actor.setTarget(target);
 						return true;
 					}
-					if ((sk.getTargetType() == SkillTargetType.TARGET_AREA || sk.getTargetType() == SkillTargetType.TARGET_BEHIND_AREA || sk.getTargetType() == SkillTargetType.TARGET_FRONT_AREA) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && dist2 <= srange)
+					if ((sk.getTargetType() == L2TargetType.TARGET_AREA || sk.getTargetType() == L2TargetType.TARGET_BEHIND_AREA || sk.getTargetType() == L2TargetType.TARGET_FRONT_AREA) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && dist2 <= srange)
 					{
 						clientStopMoving(null);
 						caster.doCast(sk);
 						return true;
 					}
 				}
-				else if (sk.getTargetType() == SkillTargetType.TARGET_ONE)
+				else if (sk.getTargetType() == L2TargetType.TARGET_ONE)
 				{
 					L2Character target = effectTargetReconsider(sk, false);
 					if (target != null)
@@ -1466,7 +1466,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			}
 			case SLEEP:
 			{
-				if (sk.getTargetType() == SkillTargetType.TARGET_ONE)
+				if (sk.getTargetType() == L2TargetType.TARGET_ONE)
 				{
 					if (!attackTarget.isDead() && dist2 <= srange)
 					{
@@ -1492,7 +1492,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				else if (canAOE(sk))
 				{
-					if (sk.getTargetType() == SkillTargetType.TARGET_AURA || sk.getTargetType() == SkillTargetType.TARGET_BEHIND_AURA || sk.getTargetType() == SkillTargetType.TARGET_FRONT_AURA)
+					if (sk.getTargetType() == L2TargetType.TARGET_AURA || sk.getTargetType() == L2TargetType.TARGET_BEHIND_AURA || sk.getTargetType() == L2TargetType.TARGET_FRONT_AURA)
 					{
 						clientStopMoving(null);
 						//L2Object target = attackTarget;
@@ -1501,7 +1501,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 						//_actor.setTarget(target);
 						return true;
 					}
-					if ((sk.getTargetType() == SkillTargetType.TARGET_AREA || sk.getTargetType() == SkillTargetType.TARGET_BEHIND_AREA || sk.getTargetType() == SkillTargetType.TARGET_FRONT_AREA) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && dist2 <= srange)
+					if ((sk.getTargetType() == L2TargetType.TARGET_AREA || sk.getTargetType() == L2TargetType.TARGET_BEHIND_AREA || sk.getTargetType() == L2TargetType.TARGET_FRONT_AREA) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && dist2 <= srange)
 					{
 						clientStopMoving(null);
 						caster.doCast(sk);
@@ -1525,7 +1525,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				else if (canAOE(sk))
 				{
-					if (sk.getTargetType() == SkillTargetType.TARGET_AURA || sk.getTargetType() == SkillTargetType.TARGET_BEHIND_AURA || sk.getTargetType() == SkillTargetType.TARGET_FRONT_AURA)
+					if (sk.getTargetType() == L2TargetType.TARGET_AURA || sk.getTargetType() == L2TargetType.TARGET_BEHIND_AURA || sk.getTargetType() == L2TargetType.TARGET_FRONT_AURA)
 					{
 						clientStopMoving(null);
 						//L2Object target = attackTarget;
@@ -1534,14 +1534,14 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 						//_actor.setTarget(target);
 						return true;
 					}
-					else if ((sk.getTargetType() == SkillTargetType.TARGET_AREA || sk.getTargetType() == SkillTargetType.TARGET_BEHIND_AREA || sk.getTargetType() == SkillTargetType.TARGET_FRONT_AREA) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && dist2 <= srange)
+					else if ((sk.getTargetType() == L2TargetType.TARGET_AREA || sk.getTargetType() == L2TargetType.TARGET_BEHIND_AREA || sk.getTargetType() == L2TargetType.TARGET_FRONT_AREA) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && dist2 <= srange)
 					{
 						clientStopMoving(null);
 						caster.doCast(sk);
 						return true;
 					}
 				}
-				else if (sk.getTargetType() == SkillTargetType.TARGET_ONE)
+				else if (sk.getTargetType() == L2TargetType.TARGET_ONE)
 				{
 					L2Character target = effectTargetReconsider(sk, false);
 					if (target != null)
@@ -1567,7 +1567,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				else if (canAOE(sk))
 				{
-					if (sk.getTargetType() == SkillTargetType.TARGET_AURA || sk.getTargetType() == SkillTargetType.TARGET_BEHIND_AURA || sk.getTargetType() == SkillTargetType.TARGET_FRONT_AURA)
+					if (sk.getTargetType() == L2TargetType.TARGET_AURA || sk.getTargetType() == L2TargetType.TARGET_BEHIND_AURA || sk.getTargetType() == L2TargetType.TARGET_FRONT_AURA)
 					{
 						clientStopMoving(null);
 						//L2Object target = attackTarget;
@@ -1576,14 +1576,14 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 						//_actor.setTarget(target);
 						return true;
 					}
-					if ((sk.getTargetType() == SkillTargetType.TARGET_AREA || sk.getTargetType() == SkillTargetType.TARGET_BEHIND_AREA || sk.getTargetType() == SkillTargetType.TARGET_FRONT_AREA) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && dist2 <= srange)
+					if ((sk.getTargetType() == L2TargetType.TARGET_AREA || sk.getTargetType() == L2TargetType.TARGET_BEHIND_AREA || sk.getTargetType() == L2TargetType.TARGET_FRONT_AREA) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && dist2 <= srange)
 					{
 						clientStopMoving(null);
 						caster.doCast(sk);
 						return true;
 					}
 				}
-				else if (sk.getTargetType() == SkillTargetType.TARGET_ONE)
+				else if (sk.getTargetType() == L2TargetType.TARGET_ONE)
 				{
 					L2Character target = effectTargetReconsider(sk, false);
 					if (target != null)
@@ -1602,7 +1602,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				if (Rnd.get(50) != 0)
 					return true;
 
-				if (sk.getTargetType() == SkillTargetType.TARGET_ONE)
+				if (sk.getTargetType() == L2TargetType.TARGET_ONE)
 				{
 					if (attackTarget.getFirstEffect(L2EffectType.BUFF) != null && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && dist2 <= srange)
 					{
@@ -1626,7 +1626,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				else if (canAOE(sk))
 				{
-					if ((sk.getTargetType() == SkillTargetType.TARGET_AURA || sk.getTargetType() == SkillTargetType.TARGET_BEHIND_AURA || sk.getTargetType() == SkillTargetType.TARGET_FRONT_AURA) && GeoData.getInstance().canSeeTarget(caster, attackTarget))
+					if ((sk.getTargetType() == L2TargetType.TARGET_AURA || sk.getTargetType() == L2TargetType.TARGET_BEHIND_AURA || sk.getTargetType() == L2TargetType.TARGET_FRONT_AURA) && GeoData.getInstance().canSeeTarget(caster, attackTarget))
 						
 					{
 						clientStopMoving(null);
@@ -1636,7 +1636,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 						//_actor.setTarget(target);
 						return true;
 					}
-					else if ((sk.getTargetType() == SkillTargetType.TARGET_AREA || sk.getTargetType() == SkillTargetType.TARGET_BEHIND_AREA || sk.getTargetType() == SkillTargetType.TARGET_FRONT_AREA) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && dist2 <= srange)
+					else if ((sk.getTargetType() == L2TargetType.TARGET_AREA || sk.getTargetType() == L2TargetType.TARGET_BEHIND_AREA || sk.getTargetType() == L2TargetType.TARGET_FRONT_AREA) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && dist2 <= srange)
 					{
 						clientStopMoving(null);
 						caster.doCast(sk);

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2CharacterAI.java

@@ -52,6 +52,7 @@ import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.templates.item.L2Weapon;
 import com.l2jserver.gameserver.templates.item.L2WeaponType;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Point3D;
 import com.l2jserver.util.Rnd;
 /**
@@ -1354,10 +1355,10 @@ public class L2CharacterAI extends AbstractAI
 	
 	public boolean canAura(L2Skill sk)
 	{
-		if(sk.getTargetType() == L2Skill.SkillTargetType.TARGET_AURA
-				|| sk.getTargetType() == L2Skill.SkillTargetType.TARGET_BEHIND_AURA
-				|| sk.getTargetType() == L2Skill.SkillTargetType.TARGET_FRONT_AURA
-				|| (sk.getTargetType() == L2Skill.SkillTargetType.TARGET_AURA_CORPSE_MOB))
+		if(sk.getTargetType() == L2TargetType.TARGET_AURA
+				|| sk.getTargetType() == L2TargetType.TARGET_BEHIND_AURA
+				|| sk.getTargetType() == L2TargetType.TARGET_FRONT_AURA
+				|| (sk.getTargetType() == L2TargetType.TARGET_AURA_CORPSE_MOB))
 		{
 			for(L2Object target:_actor.getKnownList().getKnownCharactersInRadius(sk.getSkillRadius()))
 			{
@@ -1372,10 +1373,10 @@ public class L2CharacterAI extends AbstractAI
 	{
 		if(sk.getSkillType() != L2SkillType.NEGATE || sk.getSkillType() != L2SkillType.CANCEL)
 		{
-			if(sk.getTargetType() == L2Skill.SkillTargetType.TARGET_AURA
-					|| sk.getTargetType() == L2Skill.SkillTargetType.TARGET_BEHIND_AURA
-					|| sk.getTargetType() == L2Skill.SkillTargetType.TARGET_FRONT_AURA
-					|| (sk.getTargetType() == L2Skill.SkillTargetType.TARGET_AURA_CORPSE_MOB))
+			if(sk.getTargetType() == L2TargetType.TARGET_AURA
+					|| sk.getTargetType() == L2TargetType.TARGET_BEHIND_AURA
+					|| sk.getTargetType() == L2TargetType.TARGET_FRONT_AURA
+					|| (sk.getTargetType() == L2TargetType.TARGET_AURA_CORPSE_MOB))
 			{
 				boolean cancast = true;
 				for(L2Character target:_actor.getKnownList().getKnownCharactersInRadius(sk.getSkillRadius()))
@@ -1404,9 +1405,9 @@ public class L2CharacterAI extends AbstractAI
 				if(cancast)
 					return true;
 			}
-			else if(sk.getTargetType() == L2Skill.SkillTargetType.TARGET_AREA
-					|| sk.getTargetType() == L2Skill.SkillTargetType.TARGET_BEHIND_AREA
-					|| sk.getTargetType() == L2Skill.SkillTargetType.TARGET_FRONT_AREA)
+			else if(sk.getTargetType() == L2TargetType.TARGET_AREA
+					|| sk.getTargetType() == L2TargetType.TARGET_BEHIND_AREA
+					|| sk.getTargetType() == L2TargetType.TARGET_FRONT_AREA)
 			{
 				boolean cancast = true;
 				for(L2Character target: getAttackTarget().getKnownList().getKnownCharactersInRadius(sk.getSkillRadius()))
@@ -1430,10 +1431,10 @@ public class L2CharacterAI extends AbstractAI
 		}
 		else
 		{
-			if(sk.getTargetType() == L2Skill.SkillTargetType.TARGET_AURA
-					|| sk.getTargetType() == L2Skill.SkillTargetType.TARGET_BEHIND_AURA
-					|| sk.getTargetType() == L2Skill.SkillTargetType.TARGET_FRONT_AURA
-					|| (sk.getTargetType() == L2Skill.SkillTargetType.TARGET_AURA_CORPSE_MOB))
+			if(sk.getTargetType() == L2TargetType.TARGET_AURA
+					|| sk.getTargetType() == L2TargetType.TARGET_BEHIND_AURA
+					|| sk.getTargetType() == L2TargetType.TARGET_FRONT_AURA
+					|| (sk.getTargetType() == L2TargetType.TARGET_AURA_CORPSE_MOB))
 			{
 				boolean cancast = false;
 				for(L2Character target:_actor.getKnownList().getKnownCharactersInRadius(sk.getSkillRadius()))
@@ -1454,9 +1455,9 @@ public class L2CharacterAI extends AbstractAI
 				if(cancast)
 					return true;
 			}
-			else if(sk.getTargetType() == L2Skill.SkillTargetType.TARGET_AREA
-					|| sk.getTargetType() == L2Skill.SkillTargetType.TARGET_BEHIND_AREA
-					|| sk.getTargetType() == L2Skill.SkillTargetType.TARGET_FRONT_AREA)
+			else if(sk.getTargetType() == L2TargetType.TARGET_AREA
+					|| sk.getTargetType() == L2TargetType.TARGET_BEHIND_AREA
+					|| sk.getTargetType() == L2TargetType.TARGET_FRONT_AREA)
 			{
 				boolean cancast = true;
 				for(L2Character target: getAttackTarget().getKnownList().getKnownCharactersInRadius(sk.getSkillRadius()))
@@ -1489,7 +1490,7 @@ public class L2CharacterAI extends AbstractAI
 	}
 	public boolean canParty(L2Skill sk)
 	{
-		if(sk.getTargetType() == L2Skill.SkillTargetType.TARGET_PARTY)
+		if(sk.getTargetType() == L2TargetType.TARGET_PARTY)
 		{
 			int count = 0;
 			int ccount = 0;
@@ -1525,7 +1526,7 @@ public class L2CharacterAI extends AbstractAI
 	}
 	public boolean isParty(L2Skill sk)
 	{
-		if(sk.getTargetType() == L2Skill.SkillTargetType.TARGET_PARTY)
+		if(sk.getTargetType() == L2TargetType.TARGET_PARTY)
 		{
 			return true;
 		}

L2J_Server_BETA/java/com/l2jserver/gameserver/ai/L2PlayerAI.java

@@ -26,11 +26,11 @@ import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.L2CharPosition;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Character.AIAccessor;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2StaticObjectInstance;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 public class L2PlayerAI extends L2PlayableAI
 {
@@ -254,7 +254,7 @@ public class L2PlayerAI extends L2PlayableAI
 		if (Config.DEBUG)
 			_log.warning("L2PlayerAI: thinkCast -> Start");
 		
-		if (_skill.getTargetType() == SkillTargetType.TARGET_GROUND && _actor instanceof L2PcInstance)
+		if (_skill.getTargetType() == L2TargetType.TARGET_GROUND && _actor instanceof L2PcInstance)
 		{
 			if (maybeMoveToPosition(((L2PcInstance) _actor).getCurrentSkillWorldPosition(), _actor.getMagicalAttackRange(_skill)))
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ISkillTargetTypeHandler.java → L2J_Server_BETA/java/com/l2jserver/gameserver/handler/ITargetTypeHandler.java

@@ -16,19 +16,17 @@ package com.l2jserver.gameserver.handler;
 
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
 import com.l2jserver.gameserver.model.actor.L2Character;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
- * 
- *
  * @author UnAfraid
  */
-public interface ISkillTargetTypeHandler
+public interface ITargetTypeHandler
 {
 	static final L2Object[] _emptyTargetList = new L2Object[0];
 	
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target);
 	
-	public Enum<SkillTargetType> getTargetType();
+	public Enum<L2TargetType> getTargetType();
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/handler/TargetHandler.java

@@ -18,14 +18,14 @@ import java.util.Map;
 
 import javolution.util.FastMap;
 
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * @author UnAfraid
  */
 public class TargetHandler
 {
-	private final Map<Enum<SkillTargetType>, ISkillTargetTypeHandler> _datatable;
+	private final Map<Enum<L2TargetType>, ITargetTypeHandler> _datatable;
 	
 	public static TargetHandler getInstance()
 	{
@@ -34,17 +34,17 @@ public class TargetHandler
 	
 	private TargetHandler()
 	{
-		_datatable = new FastMap<Enum<SkillTargetType>, ISkillTargetTypeHandler>();
+		_datatable = new FastMap<Enum<L2TargetType>, ITargetTypeHandler>();
 	}
 	
-	public void registerSkillTargetType(ISkillTargetTypeHandler handler)
+	public void registerTargetType(ITargetTypeHandler handler)
 	{
 		_datatable.put(handler.getTargetType(), handler);
 	}
 	
-	public ISkillTargetTypeHandler getSkillTarget(Enum<SkillTargetType> skillTargetType)
+	public ITargetTypeHandler getTargetTypeHandler(Enum<L2TargetType> targetType)
 	{
-		return _datatable.get(skillTargetType);
+		return _datatable.get(targetType);
 	}
 	
 	public int size()

L2J_Server_BETA/java/com/l2jserver/gameserver/model/ChanceSkillList.java

@@ -27,6 +27,7 @@ import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillLaunched;
 import com.l2jserver.gameserver.network.serverpackets.MagicSkillUse;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 /**
  * CT2.3: Added support for allowing effect as a chance skill trigger (DrHouse)
@@ -190,7 +191,7 @@ public class ChanceSkillList extends FastMap<IChanceSkillTrigger, ChanceConditio
 			L2Skill triggered = SkillTable.getInstance().getInfo(effect.getTriggeredChanceId(), effect.getTriggeredChanceLevel());
 			if (triggered == null)
 				return;
-			L2Character caster = triggered.getTargetType() == L2Skill.SkillTargetType.TARGET_SELF ? _owner : effect.getEffector();
+			L2Character caster = triggered.getTargetType() == L2TargetType.TARGET_SELF ? _owner : effect.getEffector();
 			
 			if (caster == null
 					|| triggered.getSkillType() == L2SkillType.NOTDONE

L2J_Server_BETA/java/com/l2jserver/gameserver/model/L2Skill.java

@@ -30,7 +30,7 @@ import com.l2jserver.gameserver.datatables.GMSkillTable;
 import com.l2jserver.gameserver.datatables.HeroSkillTable;
 import com.l2jserver.gameserver.datatables.ItemTable;
 import com.l2jserver.gameserver.datatables.SkillTable;
-import com.l2jserver.gameserver.handler.ISkillTargetTypeHandler;
+import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.handler.TargetHandler;
 import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
@@ -55,6 +55,7 @@ import com.l2jserver.gameserver.templates.effects.EffectTemplate;
 import com.l2jserver.gameserver.templates.item.L2Armor;
 import com.l2jserver.gameserver.templates.item.L2ArmorType;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Util;
 
 /**
@@ -82,47 +83,6 @@ public abstract class L2Skill implements IChanceSkillTrigger
 		OP_PASSIVE, OP_ACTIVE, OP_TOGGLE
 	}
 	
-	/** Target types of skills : SELF, PARTY, CLAN, PET... */
-	public static enum SkillTargetType
-	{
-		TARGET_NONE,
-		TARGET_SELF,
-		TARGET_ONE,
-		TARGET_PARTY,
-		TARGET_ALLY,
-		TARGET_CLAN,
-		TARGET_PET,
-		TARGET_SUMMON,
-		TARGET_AREA,
-		TARGET_FRONT_AREA,
-		TARGET_BEHIND_AREA,
-		TARGET_AURA,
-		TARGET_AURA_CORPSE_MOB,
-		TARGET_FRONT_AURA,
-		TARGET_BEHIND_AURA,
-		TARGET_CORPSE,
-		TARGET_UNDEAD,
-		TARGET_AREA_UNDEAD,
-		TARGET_CORPSE_ALLY,
-		TARGET_CORPSE_CLAN,
-		TARGET_CORPSE_PLAYER,
-		TARGET_CORPSE_PET,
-		TARGET_AREA_CORPSE_MOB,
-		TARGET_CORPSE_MOB,
-		TARGET_UNLOCKABLE,
-		TARGET_HOLY,
-		TARGET_FLAGPOLE,
-		TARGET_PARTY_MEMBER,
-		TARGET_PARTY_OTHER,
-		TARGET_PARTY_CLAN,
-		TARGET_ENEMY_SUMMON,
-		TARGET_OWNER_PET,
-		TARGET_GROUND,
-		TARGET_PARTY_NOTME,
-		TARGET_AREA_SUMMON,
-		TARGET_CLAN_MEMBER
-	}
-	
 	public static enum SkillTraitType
 	{
 		NONE,
@@ -212,7 +172,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 	private final int _equipDelay;
 	
 	/** Target type of the skill : SELF, PARTY, CLAN, PET... */
-	private final SkillTargetType _targetType;
+	private final L2TargetType _targetType;
 	private final int _feed;
 	// base success chance
 	private final double _power;
@@ -482,7 +442,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 		
 		_skillRadius = set.getInteger("skillRadius", 80);
 		
-		_targetType = set.getEnum("target", SkillTargetType.class);
+		_targetType = set.getEnum("target", L2TargetType.class);
 		_power = set.getFloat("power", 0.f);
 		_pvpPower = set.getFloat("pvpPower", (float)getPower());
 		_pvePower = set.getFloat("pvePower", (float)getPower());
@@ -636,7 +596,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 	 * Return the target type of the skill : SELF, PARTY, CLAN, PET...<BR><BR>
 	 * @return 
 	 */
-	public final SkillTargetType getTargetType()
+	public final L2TargetType getTargetType()
 	{
 		return _targetType;
 	}
@@ -1466,7 +1426,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 	 */
 	public final L2Object[] getTargetList(L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
-		ISkillTargetTypeHandler handler = TargetHandler.getInstance().getSkillTarget(getTargetType()); 
+		final ITargetTypeHandler handler = TargetHandler.getInstance().getTargetTypeHandler(getTargetType()); 
 		if (handler != null) 
 		{ 
 			try 

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Character.java

@@ -56,7 +56,6 @@ import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
 import com.l2jserver.gameserver.model.L2World;
 import com.l2jserver.gameserver.model.L2WorldRegion;
 import com.l2jserver.gameserver.model.Location;
@@ -111,6 +110,7 @@ import com.l2jserver.gameserver.templates.item.L2Weapon;
 import com.l2jserver.gameserver.templates.item.L2WeaponType;
 import com.l2jserver.gameserver.templates.skills.L2EffectType;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.L2TIntObjectHashMap;
 import com.l2jserver.gameserver.util.Point3D;
 import com.l2jserver.gameserver.util.Util;
@@ -2105,7 +2105,7 @@ public abstract class L2Character extends L2Object
 			if (region == null)
 				return false;
 			boolean canCast = true;
-			if (skill.getTargetType() == SkillTargetType.TARGET_GROUND && this instanceof L2PcInstance)
+			if (skill.getTargetType() == L2TargetType.TARGET_GROUND && this instanceof L2PcInstance)
 			{
 				Point3D wp = ((L2PcInstance) this).getCurrentSkillWorldPosition();
 				if (!region.checkEffectRangeInsidePeaceZone(skill, wp.getX(), wp.getY(), wp.getZ()))

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Npc.java

@@ -75,6 +75,7 @@ import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate.AIType;
 import com.l2jserver.gameserver.templates.item.L2Item;
 import com.l2jserver.gameserver.templates.item.L2Weapon;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Broadcast;
 import com.l2jserver.util.Rnd;
 import com.l2jserver.util.StringUtil;
@@ -333,7 +334,7 @@ public class L2Npc extends L2Character
 				{
 					for (L2Skill sk : skills)
 					{
-						if (sk == null || sk.isPassive() || sk.getTargetType() == L2Skill.SkillTargetType.TARGET_SELF)
+						if (sk == null || sk.isPassive() || sk.getTargetType() == L2TargetType.TARGET_SELF)
 							continue;
 						
 						if (sk.getCastRange() >= 200)
@@ -395,7 +396,7 @@ public class L2Npc extends L2Character
 				{
 					for (L2Skill sk : skills)
 					{
-						if (sk == null || sk.isPassive() || sk.getTargetType() == L2Skill.SkillTargetType.TARGET_SELF)
+						if (sk == null || sk.isPassive() || sk.getTargetType() == L2TargetType.TARGET_SELF)
 							continue;
 						
 						if (sk.getCastRange() <= 200)

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/L2Summon.java

@@ -27,7 +27,6 @@ import com.l2jserver.gameserver.model.L2ItemInstance;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.L2Party;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
 import com.l2jserver.gameserver.model.L2WorldRegion;
 import com.l2jserver.gameserver.model.actor.L2Attackable.AggroInfo;
 import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
@@ -59,6 +58,7 @@ import com.l2jserver.gameserver.taskmanager.DecayTaskManager;
 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
 import com.l2jserver.gameserver.templates.item.L2EtcItem;
 import com.l2jserver.gameserver.templates.item.L2Weapon;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 public abstract class L2Summon extends L2Playable
 {
@@ -707,7 +707,7 @@ public abstract class L2Summon extends L2Playable
 				}
 				
 				// Check if a Forced ATTACK is in progress on non-attackable target
-				if (!target.isAutoAttackable(this) && !forceUse && skill.getTargetType() != SkillTargetType.TARGET_AURA && skill.getTargetType() != SkillTargetType.TARGET_FRONT_AURA && skill.getTargetType() != SkillTargetType.TARGET_BEHIND_AURA && skill.getTargetType() != SkillTargetType.TARGET_CLAN && skill.getTargetType() != SkillTargetType.TARGET_ALLY && skill.getTargetType() != SkillTargetType.TARGET_PARTY && skill.getTargetType() != SkillTargetType.TARGET_SELF)
+				if (!target.isAutoAttackable(this) && !forceUse && skill.getTargetType() != L2TargetType.TARGET_AURA && skill.getTargetType() != L2TargetType.TARGET_FRONT_AURA && skill.getTargetType() != L2TargetType.TARGET_BEHIND_AURA && skill.getTargetType() != L2TargetType.TARGET_CLAN && skill.getTargetType() != L2TargetType.TARGET_ALLY && skill.getTargetType() != L2TargetType.TARGET_PARTY && skill.getTargetType() != L2TargetType.TARGET_SELF)
 				{
 					return false;
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2PcInstance.java

@@ -121,7 +121,6 @@ import com.l2jserver.gameserver.model.L2RecipeList;
 import com.l2jserver.gameserver.model.L2Request;
 import com.l2jserver.gameserver.model.L2ShortCut;
 import com.l2jserver.gameserver.model.L2Skill;
-import com.l2jserver.gameserver.model.L2Skill.SkillTargetType;
 import com.l2jserver.gameserver.model.L2SkillLearn;
 import com.l2jserver.gameserver.model.L2Transformation;
 import com.l2jserver.gameserver.model.L2UIKeysSettings;
@@ -270,6 +269,7 @@ import com.l2jserver.gameserver.templates.item.L2Weapon;
 import com.l2jserver.gameserver.templates.item.L2WeaponType;
 import com.l2jserver.gameserver.templates.skills.L2EffectType;
 import com.l2jserver.gameserver.templates.skills.L2SkillType;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.FloodProtectors;
 import com.l2jserver.gameserver.util.L2TIntObjectHashMap;
 import com.l2jserver.gameserver.util.PlayerEventStatus;
@@ -2407,7 +2407,7 @@ public final class L2PcInstance extends L2Playable
 			L2Skill effectSkill = currenteffect.getSkill();
 			
 			// Ignore all buff skills that are party related (ie. songs, dances) while still remaining weapon dependant on cast though.
-			if (!effectSkill.isOffensive() && !(effectSkill.getTargetType() == SkillTargetType.TARGET_PARTY && effectSkill.getSkillType() == L2SkillType.BUFF))
+			if (!effectSkill.isOffensive() && !(effectSkill.getTargetType() == L2TargetType.TARGET_PARTY && effectSkill.getSkillType() == L2SkillType.BUFF))
 			{
 				// Check to rest to assure current effect meets weapon requirements.
 				if (!effectSkill.getWeaponDependancy(this))
@@ -8836,10 +8836,10 @@ public final class L2PcInstance extends L2Playable
 		//************************************* Check Target *******************************************
 		// Create and set a L2Object containing the target of the skill
 		L2Object target = null;
-		SkillTargetType sklTargetType = skill.getTargetType();
+		L2TargetType sklTargetType = skill.getTargetType();
 		Point3D worldPosition = getCurrentSkillWorldPosition();
 		
-		if (sklTargetType == SkillTargetType.TARGET_GROUND && worldPosition == null)
+		if (sklTargetType == L2TargetType.TARGET_GROUND && worldPosition == null)
 		{
 			_log.info("WorldPosition is null for skill: "+skill.getName() + ", player: " + getName() + ".");
 			sendPacket(ActionFailed.STATIC_PACKET);
@@ -9055,7 +9055,7 @@ public final class L2PcInstance extends L2Playable
 			if (dontMove)
 			{
 				// Calculate the distance between the L2PcInstance and the target
-				if (sklTargetType == SkillTargetType.TARGET_GROUND)
+				if (sklTargetType == L2TargetType.TARGET_GROUND)
 				{
 					if (!isInsideRadius(worldPosition.getX(), worldPosition.getY(), worldPosition.getZ(), skill.getCastRange()+getTemplate().collisionRadius, false, false))
 					{
@@ -9199,8 +9199,8 @@ public final class L2PcInstance extends L2Playable
 		}
 		
 		// TODO: Unhardcode skillId 844 which is the outpost construct skill
-		if ((sklTargetType == SkillTargetType.TARGET_HOLY && !checkIfOkToCastSealOfRule(CastleManager.getInstance().getCastle(this), false, skill))
-				|| (sklTargetType == SkillTargetType.TARGET_FLAGPOLE && !checkIfOkToCastFlagDisplay(FortManager.getInstance().getFort(this), false, skill))
+		if ((sklTargetType == L2TargetType.TARGET_HOLY && !checkIfOkToCastSealOfRule(CastleManager.getInstance().getCastle(this), false, skill))
+				|| (sklTargetType == L2TargetType.TARGET_FLAGPOLE && !checkIfOkToCastFlagDisplay(FortManager.getInstance().getFort(this), false, skill))
 				|| (sklType == L2SkillType.SIEGEFLAG && !L2SkillSiegeFlag.checkIfOkToPlaceFlag(this, false, skill.getId() == 844))
 				|| (sklType == L2SkillType.STRSIEGEASSAULT && !checkIfOkToUseStriderSiegeAssault())
 				|| (sklType == L2SkillType.SUMMON_FRIEND && !(checkSummonerStatus(this) && checkSummonTargetStatus(target, this))))
@@ -9213,7 +9213,7 @@ public final class L2PcInstance extends L2Playable
 		// GeoData Los Check here
 		if (skill.getCastRange() > 0)
 		{
-			if (sklTargetType == SkillTargetType.TARGET_GROUND)
+			if (sklTargetType == L2TargetType.TARGET_GROUND)
 			{
 				if (!GeoData.getInstance().canSeeTarget(this, worldPosition))
 				{

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillDrain.java

@@ -34,6 +34,7 @@ import com.l2jserver.gameserver.network.serverpackets.StatusUpdate;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.skills.Formulas;
 import com.l2jserver.gameserver.templates.StatsSet;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 
 public class L2SkillDrain extends L2Skill
@@ -62,7 +63,7 @@ public class L2SkillDrain extends L2Skill
 		
 		for(L2Character target: (L2Character[]) targets)
 		{
-			if (target.isAlikeDead() && getTargetType() != SkillTargetType.TARGET_CORPSE_MOB)
+			if (target.isAlikeDead() && getTargetType() != L2TargetType.TARGET_CORPSE_MOB)
 				continue;
 			
 			if (activeChar != target && target.isInvul())
@@ -131,7 +132,7 @@ public class L2SkillDrain extends L2Skill
 			activeChar.sendPacket(suhp);
 			
 			// Check to see if we should damage the target
-			if (damage > 0 && (!target.isDead() || getTargetType() != SkillTargetType.TARGET_CORPSE_MOB))
+			if (damage > 0 && (!target.isDead() || getTargetType() != L2TargetType.TARGET_CORPSE_MOB))
 			{
 				// Manage attack or cast break of the target (calculating rate, sending message...)
 				if (!target.isRaid() && Formulas.calcAtkBreak(target, damage))
@@ -152,7 +153,7 @@ public class L2SkillDrain extends L2Skill
 					_logDamage.log(record);
 				}
 				
-				if (hasEffects() && getTargetType() != SkillTargetType.TARGET_CORPSE_MOB)
+				if (hasEffects() && getTargetType() != L2TargetType.TARGET_CORPSE_MOB)
 				{
 					// ignoring vengance-like reflections
 					if ((Formulas.calcSkillReflect(target, this) & Formulas.SKILL_REFLECT_SUCCEED) > 0)
@@ -183,7 +184,7 @@ public class L2SkillDrain extends L2Skill
 			}
 			
 			// Check to see if we should do the decay right after the cast
-			if (target.isDead() && getTargetType() == SkillTargetType.TARGET_CORPSE_MOB && target instanceof L2Npc) {
+			if (target.isDead() && getTargetType() == L2TargetType.TARGET_CORPSE_MOB && target instanceof L2Npc) {
 				((L2Npc)target).endDecayTask();
 			}
 		}
@@ -204,7 +205,7 @@ public class L2SkillDrain extends L2Skill
 		
 		for(L2Character target: (L2Character[]) targets)
 		{
-			if (target.isAlikeDead() && getTargetType() != SkillTargetType.TARGET_CORPSE_MOB)
+			if (target.isAlikeDead() && getTargetType() != L2TargetType.TARGET_CORPSE_MOB)
 				continue;
 			
 			boolean mcrit = Formulas.calcMCrit(activeCubic.getMCriticalHit(target, this));
@@ -225,7 +226,7 @@ public class L2SkillDrain extends L2Skill
 			owner.sendPacket(suhp);
 			
 			// Check to see if we should damage the target
-			if (damage > 0 && (!target.isDead() || getTargetType() != SkillTargetType.TARGET_CORPSE_MOB))
+			if (damage > 0 && (!target.isDead() || getTargetType() != L2TargetType.TARGET_CORPSE_MOB))
 			{
 				target.reduceCurrentHp(damage, activeCubic.getOwner(), this);
 				

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSignet.java

@@ -28,6 +28,7 @@ import com.l2jserver.gameserver.model.actor.instance.L2EffectPointInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.templates.StatsSet;
 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 import com.l2jserver.gameserver.util.Point3D;
 
 public final class L2SkillSignet extends L2Skill
@@ -58,7 +59,7 @@ public final class L2SkillSignet extends L2Skill
 		int y = caster.getY();
 		int z = caster.getZ();
 		
-		if (caster instanceof L2PcInstance && getTargetType() == L2Skill.SkillTargetType.TARGET_GROUND)
+		if (caster instanceof L2PcInstance && getTargetType() == L2TargetType.TARGET_GROUND)
 		{
 			Point3D wordPosition = ((L2PcInstance)caster).getCurrentSkillWorldPosition();
 			

L2J_Server_BETA/java/com/l2jserver/gameserver/skills/l2skills/L2SkillSummon.java

@@ -30,6 +30,7 @@ import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.network.serverpackets.SystemMessage;
 import com.l2jserver.gameserver.templates.StatsSet;
 import com.l2jserver.gameserver.templates.chars.L2NpcTemplate;
+import com.l2jserver.gameserver.templates.skills.L2TargetType;
 
 public class L2SkillSummon extends L2Skill
 {
@@ -99,7 +100,7 @@ public class L2SkillSummon extends L2Skill
 			
 			if (isCubic())
 			{
-				if (getTargetType() != L2Skill.SkillTargetType.TARGET_SELF)
+				if (getTargetType() != L2TargetType.TARGET_SELF)
 				{
 					return true; //Player is always able to cast mass cubic skill
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/templates/skills/L2TargetType.java

@@ -0,0 +1,58 @@
+/*
+ * This program is free software: you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later
+ * version.
+ * 
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.l2jserver.gameserver.templates.skills;
+
+/**
+ * @author Zoey76
+ */
+public enum L2TargetType
+{
+	TARGET_ALLY,
+	TARGET_AREA,
+	TARGET_AREA_CORPSE_MOB,
+	TARGET_AREA_SUMMON,
+	TARGET_AREA_UNDEAD,
+	TARGET_AURA,
+	TARGET_AURA_CORPSE_MOB,
+	TARGET_BEHIND_AREA,
+	TARGET_BEHIND_AURA,
+	TARGET_CLAN,
+	TARGET_CLAN_MEMBER,
+	TARGET_CORPSE,
+	TARGET_CORPSE_ALLY,
+	TARGET_CORPSE_CLAN,
+	TARGET_CORPSE_MOB,
+	TARGET_CORPSE_PET,
+	TARGET_CORPSE_PLAYER,
+	TARGET_ENEMY_SUMMON,
+	TARGET_FLAGPOLE,
+	TARGET_FRONT_AREA,
+	TARGET_FRONT_AURA,
+	TARGET_GROUND,
+	TARGET_HOLY,
+	TARGET_NONE,
+	TARGET_ONE,
+	TARGET_OWNER_PET,
+	TARGET_PARTY,
+	TARGET_PARTY_CLAN,
+	TARGET_PARTY_MEMBER,
+	TARGET_PARTY_NOTME,
+	TARGET_PARTY_OTHER,
+	TARGET_PET,
+	TARGET_SELF,
+	TARGET_SUMMON,
+	TARGET_UNDEAD,
+	TARGET_UNLOCKABLE
+}