BETA: CORE-Part for [DP9553].

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

@@ -1010,7 +1010,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					{
 						for (L2Skill sk : _skillrender.getHealSkills())
 						{
-							if (sk.getTargetType() == L2TargetType.TARGET_SELF)
+							if (sk.getTargetType() == L2TargetType.SELF)
 							{
 								continue;
 							}
@@ -1054,7 +1054,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					{
 						continue;
 					}
-					if (sk.getTargetType() == L2TargetType.TARGET_ONE)
+					if (sk.getTargetType() == L2TargetType.ONE)
 					{
 						for (L2Character obj : npc.getKnownList().getKnownCharactersInRadius(sk.getCastRange() + collision))
 						{
@@ -1100,7 +1100,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					{
 						for (L2Skill sk : _skillrender.getResSkills())
 						{
-							if (sk.getTargetType() == L2TargetType.TARGET_SELF)
+							if (sk.getTargetType() == L2TargetType.SELF)
 							{
 								continue;
 							}
@@ -1129,7 +1129,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					{
 						continue;
 					}
-					if (sk.getTargetType() == L2TargetType.TARGET_ONE)
+					if (sk.getTargetType() == L2TargetType.ONE)
 					{
 						for (L2Character obj : npc.getKnownList().getKnownCharactersInRadius(sk.getCastRange() + collision))
 						{
@@ -1380,11 +1380,11 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				// ----------------------------------------
 				// If actor already have buff, start looking at others same faction mob to cast
-				if (sk.getTargetType() == L2TargetType.TARGET_SELF)
+				if (sk.getTargetType() == L2TargetType.SELF)
 				{
 					return false;
 				}
-				if (sk.getTargetType() == L2TargetType.TARGET_ONE)
+				if (sk.getTargetType() == L2TargetType.ONE)
 				{
 					L2Character target = effectTargetReconsider(sk, true);
 					if (target != null)
@@ -1412,7 +1412,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			case HEAL_PERCENT:
 			{
 				double percentage = (caster.getCurrentHp() / caster.getMaxHp()) * 100;
-				if (caster.isMinion() && (sk.getTargetType() != L2TargetType.TARGET_SELF))
+				if (caster.isMinion() && (sk.getTargetType() != L2TargetType.SELF))
 				{
 					L2Character leader = caster.getLeader();
 					if ((leader != null) && !leader.isDead() && (Rnd.get(100) > ((leader.getCurrentHp() / leader.getMaxHp()) * 100)))
@@ -1438,7 +1438,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					return true;
 				}
 				
-				if (sk.getTargetType() == L2TargetType.TARGET_ONE)
+				if (sk.getTargetType() == L2TargetType.ONE)
 				{
 					for (L2Character obj : caster.getKnownList().getKnownCharactersInRadius(sk.getCastRange() + caster.getTemplate().getCollisionRadius()))
 					{
@@ -1492,7 +1492,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			{
 				if (!isParty(sk))
 				{
-					if (caster.isMinion() && (sk.getTargetType() != L2TargetType.TARGET_SELF))
+					if (caster.isMinion() && (sk.getTargetType() != L2TargetType.SELF))
 					{
 						L2Character leader = caster.getLeader();
 						if ((leader != null) && leader.isDead())
@@ -1575,7 +1575,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				else if (canAOE(sk))
 				{
-					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))
+					if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB))
 					{
 						clientStopMoving(null);
 						// L2Object target = attackTarget;
@@ -1584,14 +1584,14 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 						// _actor.setTarget(target);
 						return true;
 					}
-					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))
+					if (((sk.getTargetType() == L2TargetType.AREA) || (sk.getTargetType() == L2TargetType.BEHIND_AREA) || (sk.getTargetType() == L2TargetType.FRONT_AREA)) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && (dist2 <= srange))
 					{
 						clientStopMoving(null);
 						caster.doCast(sk);
 						return true;
 					}
 				}
-				else if (sk.getTargetType() == L2TargetType.TARGET_ONE)
+				else if (sk.getTargetType() == L2TargetType.ONE)
 				{
 					L2Character target = effectTargetReconsider(sk, false);
 					if (target != null)
@@ -1605,7 +1605,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			}
 			case SLEEP:
 			{
-				if (sk.getTargetType() == L2TargetType.TARGET_ONE)
+				if (sk.getTargetType() == L2TargetType.ONE)
 				{
 					if (!attackTarget.isDead() && (dist2 <= srange))
 					{
@@ -1631,7 +1631,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				else if (canAOE(sk))
 				{
-					if ((sk.getTargetType() == L2TargetType.TARGET_AURA) || (sk.getTargetType() == L2TargetType.TARGET_BEHIND_AURA) || (sk.getTargetType() == L2TargetType.TARGET_FRONT_AURA))
+					if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA))
 					{
 						clientStopMoving(null);
 						// L2Object target = attackTarget;
@@ -1640,7 +1640,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 						// _actor.setTarget(target);
 						return true;
 					}
-					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))
+					if (((sk.getTargetType() == L2TargetType.AREA) || (sk.getTargetType() == L2TargetType.BEHIND_AREA) || (sk.getTargetType() == L2TargetType.FRONT_AREA)) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && (dist2 <= srange))
 					{
 						clientStopMoving(null);
 						caster.doCast(sk);
@@ -1664,7 +1664,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				else if (canAOE(sk))
 				{
-					if ((sk.getTargetType() == L2TargetType.TARGET_AURA) || (sk.getTargetType() == L2TargetType.TARGET_BEHIND_AURA) || (sk.getTargetType() == L2TargetType.TARGET_FRONT_AURA))
+					if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA))
 					{
 						clientStopMoving(null);
 						// L2Object target = attackTarget;
@@ -1673,14 +1673,14 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 						// _actor.setTarget(target);
 						return true;
 					}
-					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))
+					else if (((sk.getTargetType() == L2TargetType.AREA) || (sk.getTargetType() == L2TargetType.BEHIND_AREA) || (sk.getTargetType() == L2TargetType.FRONT_AREA)) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && (dist2 <= srange))
 					{
 						clientStopMoving(null);
 						caster.doCast(sk);
 						return true;
 					}
 				}
-				else if (sk.getTargetType() == L2TargetType.TARGET_ONE)
+				else if (sk.getTargetType() == L2TargetType.ONE)
 				{
 					L2Character target = effectTargetReconsider(sk, false);
 					if (target != null)
@@ -1706,7 +1706,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 				}
 				else if (canAOE(sk))
 				{
-					if ((sk.getTargetType() == L2TargetType.TARGET_AURA) || (sk.getTargetType() == L2TargetType.TARGET_BEHIND_AURA) || (sk.getTargetType() == L2TargetType.TARGET_FRONT_AURA))
+					if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA))
 					{
 						clientStopMoving(null);
 						// L2Object target = attackTarget;
@@ -1715,14 +1715,14 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 						// _actor.setTarget(target);
 						return true;
 					}
-					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))
+					if (((sk.getTargetType() == L2TargetType.AREA) || (sk.getTargetType() == L2TargetType.BEHIND_AREA) || (sk.getTargetType() == L2TargetType.FRONT_AREA)) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && (dist2 <= srange))
 					{
 						clientStopMoving(null);
 						caster.doCast(sk);
 						return true;
 					}
 				}
-				else if (sk.getTargetType() == L2TargetType.TARGET_ONE)
+				else if (sk.getTargetType() == L2TargetType.ONE)
 				{
 					L2Character target = effectTargetReconsider(sk, false);
 					if (target != null)
@@ -1782,7 +1782,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 						return true;
 					}
 					
-					if (sk.getTargetType() == L2TargetType.TARGET_ONE)
+					if (sk.getTargetType() == L2TargetType.ONE)
 					{
 						if ((attackTarget.getFirstEffect(L2EffectType.BUFF) != null) && GeoData.getInstance().canSeeTarget(caster, attackTarget) && !attackTarget.isDead() && (dist2 <= srange))
 						{
@@ -1806,7 +1806,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 					}
 					else if (canAOE(sk))
 					{
-						if (((sk.getTargetType() == L2TargetType.TARGET_AURA) || (sk.getTargetType() == L2TargetType.TARGET_BEHIND_AURA) || (sk.getTargetType() == L2TargetType.TARGET_FRONT_AURA)) && GeoData.getInstance().canSeeTarget(caster, attackTarget))
+						if (((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA)) && GeoData.getInstance().canSeeTarget(caster, attackTarget))
 						
 						{
 							clientStopMoving(null);
@@ -1816,7 +1816,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 							// _actor.setTarget(target);
 							return true;
 						}
-						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))
+						else if (((sk.getTargetType() == L2TargetType.AREA) || (sk.getTargetType() == L2TargetType.BEHIND_AREA) || (sk.getTargetType() == L2TargetType.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

@@ -1463,7 +1463,7 @@ public class L2CharacterAI extends AbstractAI
 	
 	public boolean canAura(L2Skill sk)
 	{
-		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))
+		if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB))
 		{
 			for (L2Object target : _actor.getKnownList().getKnownCharactersInRadius(sk.getAffectRange()))
 			{
@@ -1480,7 +1480,7 @@ public class L2CharacterAI extends AbstractAI
 	{
 		if (sk.hasEffectType(L2EffectType.CANCEL, L2EffectType.CANCEL_ALL, L2EffectType.NEGATE))
 		{
-			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))
+			if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB))
 			{
 				boolean cancast = true;
 				for (L2Character target : _actor.getKnownList().getKnownCharactersInRadius(sk.getAffectRange()))
@@ -1515,7 +1515,7 @@ public class L2CharacterAI extends AbstractAI
 					return true;
 				}
 			}
-			else if ((sk.getTargetType() == L2TargetType.TARGET_AREA) || (sk.getTargetType() == L2TargetType.TARGET_BEHIND_AREA) || (sk.getTargetType() == L2TargetType.TARGET_FRONT_AREA))
+			else if ((sk.getTargetType() == L2TargetType.AREA) || (sk.getTargetType() == L2TargetType.BEHIND_AREA) || (sk.getTargetType() == L2TargetType.FRONT_AREA))
 			{
 				boolean cancast = true;
 				for (L2Character target : getAttackTarget().getKnownList().getKnownCharactersInRadius(sk.getAffectRange()))
@@ -1547,7 +1547,7 @@ public class L2CharacterAI extends AbstractAI
 		}
 		else
 		{
-			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))
+			if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB))
 			{
 				boolean cancast = false;
 				for (L2Character target : _actor.getKnownList().getKnownCharactersInRadius(sk.getAffectRange()))
@@ -1576,7 +1576,7 @@ public class L2CharacterAI extends AbstractAI
 					return true;
 				}
 			}
-			else if ((sk.getTargetType() == L2TargetType.TARGET_AREA) || (sk.getTargetType() == L2TargetType.TARGET_BEHIND_AREA) || (sk.getTargetType() == L2TargetType.TARGET_FRONT_AREA))
+			else if ((sk.getTargetType() == L2TargetType.AREA) || (sk.getTargetType() == L2TargetType.BEHIND_AREA) || (sk.getTargetType() == L2TargetType.FRONT_AREA))
 			{
 				boolean cancast = true;
 				for (L2Character target : getAttackTarget().getKnownList().getKnownCharactersInRadius(sk.getAffectRange()))
@@ -1616,7 +1616,7 @@ public class L2CharacterAI extends AbstractAI
 	
 	public boolean canParty(L2Skill sk)
 	{
-		if (sk.getTargetType() == L2TargetType.TARGET_PARTY)
+		if (sk.getTargetType() == L2TargetType.PARTY)
 		{
 			int count = 0;
 			int ccount = 0;
@@ -1655,6 +1655,6 @@ public class L2CharacterAI extends AbstractAI
 	
 	public boolean isParty(L2Skill sk)
 	{
-		return (sk.getTargetType() == L2TargetType.TARGET_PARTY);
+		return (sk.getTargetType() == L2TargetType.PARTY);
 	}
 }

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

@@ -246,7 +246,7 @@ public class L2PlayerAI extends L2PlayableAI
 	private void thinkCast()
 	{
 		L2Character target = getCastTarget();
-		if ((_skill.getTargetType() == L2TargetType.TARGET_GROUND) && (_actor instanceof L2PcInstance))
+		if ((_skill.getTargetType() == L2TargetType.GROUND) && (_actor instanceof L2PcInstance))
 		{
 			if (maybeMoveToPosition(((L2PcInstance) _actor).getCurrentSkillWorldPosition(), _actor.getMagicalAttackRange(_skill)))
 			{

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

@@ -229,7 +229,7 @@ public class ChanceSkillList extends FastMap<IChanceSkillTrigger, ChanceConditio
 			{
 				return;
 			}
-			L2Character caster = triggered.getTargetType() == L2TargetType.TARGET_SELF ? _owner : effect.getEffector();
+			L2Character caster = triggered.getTargetType() == L2TargetType.SELF ? _owner : effect.getEffector();
 			
 			if ((caster == null) || (triggered.getSkillType() == L2SkillType.NOTDONE) || caster.isSkillDisabled(triggered))
 			{

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

@@ -1642,24 +1642,24 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 		// AURA skills should always be using caster as target
 		switch (skill.getTargetType())
 		{
-			case TARGET_AREA_SUMMON: // We need it to correct facing
+			case AREA_SUMMON: // We need it to correct facing
 				target = getSummon();
 				break;
-			case TARGET_AURA:
-			case TARGET_AURA_CORPSE_MOB:
-			case TARGET_FRONT_AURA:
-			case TARGET_BEHIND_AURA:
-			case TARGET_GROUND:
+			case AURA:
+			case AURA_CORPSE_MOB:
+			case FRONT_AURA:
+			case BEHIND_AURA:
+			case GROUND:
 				target = this;
 				break;
-			case TARGET_SELF:
-			case TARGET_PET:
-			case TARGET_SUMMON:
-			case TARGET_OWNER_PET:
-			case TARGET_PARTY:
-			case TARGET_CLAN:
-			case TARGET_PARTY_CLAN:
-			case TARGET_ALLY:
+			case SELF:
+			case PET:
+			case SUMMON:
+			case OWNER_PET:
+			case PARTY:
+			case CLAN:
+			case PARTY_CLAN:
+			case ALLY:
 				doit = true;
 			default:
 				if (targets.length == 0)
@@ -2125,7 +2125,7 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 				return false;
 			}
 			boolean canCast = true;
-			if ((skill.getTargetType() == L2TargetType.TARGET_GROUND) && isPlayer())
+			if ((skill.getTargetType() == L2TargetType.GROUND) && isPlayer())
 			{
 				Point3D wp = getActingPlayer().getCurrentSkillWorldPosition();
 				if (!region.checkEffectRangeInsidePeaceZone(skill, wp.getX(), wp.getY(), wp.getZ()))
@@ -6360,10 +6360,10 @@ public abstract class L2Character extends L2Object implements ISkillsHolder
 			switch (skill.getTargetType())
 			{
 			// only AURA-type skills can be cast without target
-				case TARGET_AURA:
-				case TARGET_FRONT_AURA:
-				case TARGET_BEHIND_AURA:
-				case TARGET_AURA_CORPSE_MOB:
+				case AURA:
+				case FRONT_AURA:
+				case BEHIND_AURA:
+				case AURA_CORPSE_MOB:
 					break;
 				default:
 					abortCast();

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

@@ -266,7 +266,7 @@ public class L2Npc extends L2Character
 				{
 					for (L2Skill sk : skills)
 					{
-						if ((sk == null) || sk.isPassive() || (sk.getTargetType() == L2TargetType.TARGET_SELF))
+						if ((sk == null) || sk.isPassive() || (sk.getTargetType() == L2TargetType.SELF))
 						{
 							continue;
 						}
@@ -324,7 +324,7 @@ public class L2Npc extends L2Character
 				{
 					for (L2Skill sk : skills)
 					{
-						if ((sk == null) || sk.isPassive() || (sk.getTargetType() == L2TargetType.TARGET_SELF))
+						if ((sk == null) || sk.isPassive() || (sk.getTargetType() == L2TargetType.SELF))
 						{
 							continue;
 						}

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

@@ -626,16 +626,16 @@ public abstract class L2Summon extends L2Playable
 		switch (skill.getTargetType())
 		{
 		// OWNER_PET should be cast even if no target has been found
-			case TARGET_OWNER_PET:
+			case OWNER_PET:
 				target = getOwner();
 				break;
 			// PARTY, AURA, SELF should be cast even if no target has been found
-			case TARGET_PARTY:
-			case TARGET_AURA:
-			case TARGET_FRONT_AURA:
-			case TARGET_BEHIND_AURA:
-			case TARGET_SELF:
-			case TARGET_AURA_CORPSE_MOB:
+			case PARTY:
+			case AURA:
+			case FRONT_AURA:
+			case BEHIND_AURA:
+			case SELF:
+			case AURA_CORPSE_MOB:
 				target = this;
 				break;
 			default:
@@ -728,7 +728,7 @@ public abstract class L2Summon extends L2Playable
 				}
 				
 				// Check if a Forced attack is in progress on non-attackable target
-				if (!target.isAutoAttackable(this) && !forceUse && !target.isNpc() && (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))
+				if (!target.isAutoAttackable(this) && !forceUse && !target.isNpc() && (skill.getTargetType() != L2TargetType.AURA) && (skill.getTargetType() != L2TargetType.FRONT_AURA) && (skill.getTargetType() != L2TargetType.BEHIND_AURA) && (skill.getTargetType() != L2TargetType.CLAN) && (skill.getTargetType() != L2TargetType.ALLY) && (skill.getTargetType() != L2TargetType.PARTY) && (skill.getTargetType() != L2TargetType.SELF))
 				{
 					return false;
 				}

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

@@ -275,9 +275,9 @@ public class L2Trap extends L2Character
 						{
 							switch (getSkill().getTargetType())
 							{
-								case TARGET_AURA:
-								case TARGET_FRONT_AURA:
-								case TARGET_BEHIND_AURA:
+								case AURA:
+								case FRONT_AURA:
+								case BEHIND_AURA:
 									trigger(L2Trap.this);
 									break;
 								default:

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

@@ -2562,7 +2562,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 dependent on cast though.
-			if (!effectSkill.isOffensive() && !((effectSkill.getTargetType() == L2TargetType.TARGET_PARTY) && (effectSkill.getSkillType() == L2SkillType.BUFF)))
+			if (!effectSkill.isOffensive() && !((effectSkill.getTargetType() == L2TargetType.PARTY) && (effectSkill.getSkillType() == L2SkillType.BUFF)))
 			{
 				// Check to rest to assure current effect meets weapon requirements.
 				if (!effectSkill.getWeaponDependancy(this))
@@ -9280,12 +9280,12 @@ public final class L2PcInstance extends L2Playable
 		L2Object target = null;
 		switch (skill.getTargetType())
 		{
-			case TARGET_AURA: // AURA, SELF should be cast even if no target has been found
-			case TARGET_FRONT_AURA:
-			case TARGET_BEHIND_AURA:
-			case TARGET_GROUND:
-			case TARGET_SELF:
-			case TARGET_AURA_CORPSE_MOB:
+			case AURA: // AURA, SELF should be cast even if no target has been found
+			case FRONT_AURA:
+			case BEHIND_AURA:
+			case GROUND:
+			case SELF:
+			case AURA_CORPSE_MOB:
 				target = this;
 				break;
 			default:
@@ -9378,7 +9378,7 @@ public final class L2PcInstance extends L2Playable
 		L2TargetType sklTargetType = skill.getTargetType();
 		Point3D worldPosition = getCurrentSkillWorldPosition();
 		
-		if ((sklTargetType == L2TargetType.TARGET_GROUND) && (worldPosition == null))
+		if ((sklTargetType == L2TargetType.GROUND) && (worldPosition == null))
 		{
 			_log.info("WorldPosition is null for skill: " + skill.getName() + ", player: " + getName() + ".");
 			sendPacket(ActionFailed.STATIC_PACKET);
@@ -9388,21 +9388,21 @@ public final class L2PcInstance extends L2Playable
 		switch (sklTargetType)
 		{
 		// Target the player if skill type is AURA, PARTY, CLAN or SELF
-			case TARGET_AURA:
-			case TARGET_FRONT_AURA:
-			case TARGET_BEHIND_AURA:
-			case TARGET_PARTY:
-			case TARGET_ALLY:
-			case TARGET_CLAN:
-			case TARGET_PARTY_CLAN:
-			case TARGET_GROUND:
-			case TARGET_SELF:
-			case TARGET_AREA_SUMMON:
-			case TARGET_AURA_CORPSE_MOB:
+			case AURA:
+			case FRONT_AURA:
+			case BEHIND_AURA:
+			case PARTY:
+			case ALLY:
+			case CLAN:
+			case PARTY_CLAN:
+			case GROUND:
+			case SELF:
+			case AREA_SUMMON:
+			case AURA_CORPSE_MOB:
 				target = this;
 				break;
-			case TARGET_PET:
-			case TARGET_SUMMON:
+			case PET:
+			case SUMMON:
 				target = getSummon();
 				break;
 			default:
@@ -9567,17 +9567,17 @@ public final class L2PcInstance extends L2Playable
 			{
 				switch (sklTargetType)
 				{
-					case TARGET_AURA:
-					case TARGET_FRONT_AURA:
-					case TARGET_BEHIND_AURA:
-					case TARGET_AURA_CORPSE_MOB:
-					case TARGET_CLAN:
-					case TARGET_PARTY_CLAN:
-					case TARGET_ALLY:
-					case TARGET_PARTY:
-					case TARGET_SELF:
-					case TARGET_GROUND:
-					case TARGET_AREA_SUMMON:
+					case AURA:
+					case FRONT_AURA:
+					case BEHIND_AURA:
+					case AURA_CORPSE_MOB:
+					case CLAN:
+					case PARTY_CLAN:
+					case ALLY:
+					case PARTY:
+					case SELF:
+					case GROUND:
+					case AREA_SUMMON:
 						break;
 					default: // Send a Server->Client packet ActionFailed to the L2PcInstance
 						sendPacket(ActionFailed.STATIC_PACKET);
@@ -9589,7 +9589,7 @@ public final class L2PcInstance extends L2Playable
 			if (dontMove)
 			{
 				// Calculate the distance between the L2PcInstance and the target
-				if (sklTargetType == L2TargetType.TARGET_GROUND)
+				if (sklTargetType == L2TargetType.GROUND)
 				{
 					if (!isInsideRadius(worldPosition.getX(), worldPosition.getY(), worldPosition.getZ(), skill.getCastRange() + getTemplate().getCollisionRadius(), false, false))
 					{
@@ -9647,20 +9647,20 @@ public final class L2PcInstance extends L2Playable
 			// check if the target is a monster and if force attack is set.. if not then we don't want to cast.
 			switch (sklTargetType)
 			{
-				case TARGET_PET:
-				case TARGET_SUMMON:
-				case TARGET_AURA:
-				case TARGET_FRONT_AURA:
-				case TARGET_BEHIND_AURA:
-				case TARGET_AURA_CORPSE_MOB:
-				case TARGET_CLAN:
-				case TARGET_PARTY_CLAN:
-				case TARGET_SELF:
-				case TARGET_PARTY:
-				case TARGET_ALLY:
-				case TARGET_CORPSE_MOB:
-				case TARGET_AREA_CORPSE_MOB:
-				case TARGET_GROUND:
+				case PET:
+				case SUMMON:
+				case AURA:
+				case FRONT_AURA:
+				case BEHIND_AURA:
+				case AURA_CORPSE_MOB:
+				case CLAN:
+				case PARTY_CLAN:
+				case SELF:
+				case PARTY:
+				case ALLY:
+				case CORPSE_MOB:
+				case AREA_CORPSE_MOB:
+				case GROUND:
 					break;
 				default:
 				{
@@ -9682,15 +9682,15 @@ public final class L2PcInstance extends L2Playable
 		// Check if this is a Pvp skill and target isn't a non-flagged/non-karma player
 		switch (sklTargetType)
 		{
-			case TARGET_PARTY:
-			case TARGET_ALLY: // For such skills, checkPvpSkill() is called from L2Skill.getTargetList()
-			case TARGET_CLAN: // For such skills, checkPvpSkill() is called from L2Skill.getTargetList()
-			case TARGET_PARTY_CLAN: // For such skills, checkPvpSkill() is called from L2Skill.getTargetList()
-			case TARGET_AURA:
-			case TARGET_FRONT_AURA:
-			case TARGET_BEHIND_AURA:
-			case TARGET_GROUND:
-			case TARGET_SELF:
+			case PARTY:
+			case ALLY: // For such skills, checkPvpSkill() is called from L2Skill.getTargetList()
+			case CLAN: // For such skills, checkPvpSkill() is called from L2Skill.getTargetList()
+			case PARTY_CLAN: // For such skills, checkPvpSkill() is called from L2Skill.getTargetList()
+			case AURA:
+			case FRONT_AURA:
+			case BEHIND_AURA:
+			case GROUND:
+			case SELF:
 				break;
 			default:
 				if (!checkPvpSkill(target, skill) && !getAccessLevel().allowPeaceAttack())
@@ -9705,7 +9705,7 @@ public final class L2PcInstance extends L2Playable
 		}
 		
 		// TODO: Unhardcode skillId 844 which is the outpost construct skill
-		if (((sklTargetType == L2TargetType.TARGET_HOLY) && !checkIfOkToCastSealOfRule(CastleManager.getInstance().getCastle(this), false, skill, target)) || ((sklTargetType == L2TargetType.TARGET_FLAGPOLE) && !checkIfOkToCastFlagDisplay(FortManager.getInstance().getFort(this), false, skill, target)) || ((sklType == L2SkillType.SIEGEFLAG) && !L2SkillSiegeFlag.checkIfOkToPlaceFlag(this, false, skill.getId() == 844)) || ((sklType == L2SkillType.STRSIEGEASSAULT) && !checkIfOkToUseStriderSiegeAssault()) || ((sklType == L2SkillType.SUMMON_FRIEND) && !(checkSummonerStatus(this) && checkSummonTargetStatus(target, this))))
+		if (((sklTargetType == L2TargetType.HOLY) && !checkIfOkToCastSealOfRule(CastleManager.getInstance().getCastle(this), false, skill, target)) || ((sklTargetType == L2TargetType.FLAGPOLE) && !checkIfOkToCastFlagDisplay(FortManager.getInstance().getFort(this), false, skill, target)) || ((sklType == L2SkillType.SIEGEFLAG) && !L2SkillSiegeFlag.checkIfOkToPlaceFlag(this, false, skill.getId() == 844)) || ((sklType == L2SkillType.STRSIEGEASSAULT) && !checkIfOkToUseStriderSiegeAssault()) || ((sklType == L2SkillType.SUMMON_FRIEND) && !(checkSummonerStatus(this) && checkSummonTargetStatus(target, this))))
 		{
 			sendPacket(ActionFailed.STATIC_PACKET);
 			abortCast();
@@ -9715,7 +9715,7 @@ public final class L2PcInstance extends L2Playable
 		// GeoData Los Check here
 		if (skill.getCastRange() > 0)
 		{
-			if (sklTargetType == L2TargetType.TARGET_GROUND)
+			if (sklTargetType == L2TargetType.GROUND)
 			{
 				if (!GeoData.getInstance().canSeeTarget(this, worldPosition))
 				{

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

@@ -384,7 +384,7 @@ public abstract class L2Skill implements IChanceSkillTrigger
 			}
 		}
 		
-		_targetType = set.getEnum("target", L2TargetType.class);
+		_targetType = set.getEnum("targetType", L2TargetType.class);
 		_power = set.getFloat("power", 0.f);
 		_pvpPower = set.getFloat("pvpPower", (float) getPower());
 		_pvePower = set.getFloat("pvePower", (float) getPower());

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

@@ -67,7 +67,7 @@ public class L2SkillDrain extends L2Skill
 		
 		for (L2Character target : (L2Character[]) targets)
 		{
-			if (target.isAlikeDead() && (getTargetType() != L2TargetType.TARGET_CORPSE_MOB))
+			if (target.isAlikeDead() && (getTargetType() != L2TargetType.CORPSE_MOB))
 			{
 				continue;
 			}
@@ -115,7 +115,7 @@ public class L2SkillDrain extends L2Skill
 			activeChar.sendPacket(suhp);
 			
 			// Check to see if we should damage the target
-			if ((damage > 0) && (!target.isDead() || (getTargetType() != L2TargetType.TARGET_CORPSE_MOB)))
+			if ((damage > 0) && (!target.isDead() || (getTargetType() != L2TargetType.CORPSE_MOB)))
 			{
 				// Manage attack or cast break of the target (calculating rate, sending message...)
 				if (!target.isRaid() && Formulas.calcAtkBreak(target, damage))
@@ -142,7 +142,7 @@ public class L2SkillDrain extends L2Skill
 					_logDamage.log(record);
 				}
 				
-				if (hasEffects() && (getTargetType() != L2TargetType.TARGET_CORPSE_MOB))
+				if (hasEffects() && (getTargetType() != L2TargetType.CORPSE_MOB))
 				{
 					// ignoring vengance-like reflections
 					if ((Formulas.calcSkillReflect(target, this) & Formulas.SKILL_REFLECT_SUCCEED) > 0)
@@ -175,7 +175,7 @@ public class L2SkillDrain extends L2Skill
 			}
 			
 			// Check to see if we should do the decay right after the cast
-			if (target.isDead() && (getTargetType() == L2TargetType.TARGET_CORPSE_MOB) && target.isNpc())
+			if (target.isDead() && (getTargetType() == L2TargetType.CORPSE_MOB) && target.isNpc())
 			{
 				((L2Npc) target).endDecayTask();
 			}
@@ -202,7 +202,7 @@ public class L2SkillDrain extends L2Skill
 		
 		for (L2Character target : (L2Character[]) targets)
 		{
-			if (target.isAlikeDead() && (getTargetType() != L2TargetType.TARGET_CORPSE_MOB))
+			if (target.isAlikeDead() && (getTargetType() != L2TargetType.CORPSE_MOB))
 			{
 				continue;
 			}
@@ -227,7 +227,7 @@ public class L2SkillDrain extends L2Skill
 			owner.sendPacket(suhp);
 			
 			// Check to see if we should damage the target
-			if ((damage > 0) && (!target.isDead() || (getTargetType() != L2TargetType.TARGET_CORPSE_MOB)))
+			if ((damage > 0) && (!target.isDead() || (getTargetType() != L2TargetType.CORPSE_MOB)))
 			{
 				target.reduceCurrentHp(damage, activeCubic.getOwner(), this);
 				

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

@@ -56,7 +56,7 @@ public final class L2SkillSignet extends L2Skill
 		int y = caster.getY();
 		int z = caster.getZ();
 		
-		if (caster.isPlayer() && (getTargetType() == L2TargetType.TARGET_GROUND))
+		if (caster.isPlayer() && (getTargetType() == L2TargetType.GROUND))
 		{
 			Point3D wordPosition = caster.getActingPlayer().getCurrentSkillWorldPosition();
 			

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

@@ -107,7 +107,7 @@ public class L2SkillSummon extends L2Skill
 			
 			if (isCubic())
 			{
-				if (getTargetType() != L2TargetType.TARGET_SELF)
+				if (getTargetType() != L2TargetType.SELF)
 				{
 					return true; // Player is always able to cast mass cubic skill
 				}

L2J_Server_BETA/java/com/l2jserver/gameserver/model/skills/targets/L2TargetType.java

@@ -23,41 +23,41 @@ package com.l2jserver.gameserver.model.skills.targets;
  */
 public enum L2TargetType
 {
-	TARGET_ALLY,
-	TARGET_AREA,
-	TARGET_AREA_CORPSE_MOB,
-	TARGET_AREA_FRIENDLY,
-	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
+	ALLY,
+	AREA,
+	AREA_CORPSE_MOB,
+	AREA_FRIENDLY,
+	AREA_SUMMON,
+	AREA_UNDEAD,
+	AURA,
+	AURA_CORPSE_MOB,
+	BEHIND_AREA,
+	BEHIND_AURA,
+	CLAN,
+	CLAN_MEMBER,
+	CORPSE,
+	CORPSE_ALLY,
+	CORPSE_CLAN,
+	CORPSE_MOB,
+	CORPSE_PET,
+	CORPSE_PLAYER,
+	ENEMY_SUMMON,
+	FLAGPOLE,
+	FRONT_AREA,
+	FRONT_AURA,
+	GROUND,
+	HOLY,
+	NONE,
+	ONE,
+	OWNER_PET,
+	PARTY,
+	PARTY_CLAN,
+	PARTY_MEMBER,
+	PARTY_NOTME,
+	PARTY_OTHER,
+	PET,
+	SELF,
+	SUMMON,
+	UNDEAD,
+	UNLOCKABLE
 }

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestMagicSkillUse.java

@@ -117,7 +117,7 @@ public final class RequestMagicSkillUse extends L2GameClientPacket
 			activeChar.useMagic(skill, _ctrlPressed, _shiftPressed);
 			
 			// Stop if use self-buff (except if on AirShip or Boat).
-			if (((skill.getSkillType() == L2SkillType.BUFF) && (skill.getTargetType() == L2TargetType.TARGET_SELF)) && (!activeChar.isInAirShip() || !activeChar.isInBoat()))
+			if (((skill.getSkillType() == L2SkillType.BUFF) && (skill.getTargetType() == L2TargetType.SELF)) && (!activeChar.isInAirShip() || !activeChar.isInBoat()))
 			{
 				final PcPosition charPos = activeChar.getPosition();
 				final L2CharPosition stopPos = new L2CharPosition(charPos.getX(), charPos.getY(), charPos.getZ(), charPos.getHeading());