BETA: Discriminating dispel by slot skills.

	* Minor source cleanup.

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

@@ -1447,7 +1447,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			}
 		}
 		
-		if (sk.hasEffectType(L2EffectType.DISPEL))
+		if (sk.hasEffectType(L2EffectType.DISPEL, L2EffectType.DISPEL_BY_SLOT))
 		{
 			if (sk.getTargetType() == L2TargetType.ONE)
 			{
@@ -2062,7 +2062,7 @@ public class L2AttackableAI extends L2CharacterAI implements Runnable
 			return null;
 		}
 		L2Attackable actor = getActiveChar();
-		if (!sk.hasEffectType(L2EffectType.DISPEL))
+		if (!sk.hasEffectType(L2EffectType.DISPEL, L2EffectType.DISPEL_BY_SLOT))
 		{
 			if (!positive)
 			{

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

@@ -1301,7 +1301,7 @@ public class L2CharacterAI extends AbstractAI
 				}
 				else
 				{
-					if (sk.hasEffectType(L2EffectType.DISPEL))
+					if (sk.hasEffectType(L2EffectType.DISPEL, L2EffectType.DISPEL_BY_SLOT))
 					{
 						cancelSkills.add(sk);
 					}
@@ -1485,7 +1485,7 @@ public class L2CharacterAI extends AbstractAI
 	
 	public boolean canAOE(L2Skill sk)
 	{
-		if (sk.hasEffectType(L2EffectType.DISPEL))
+		if (sk.hasEffectType(L2EffectType.DISPEL, L2EffectType.DISPEL_BY_SLOT))
 		{
 			if ((sk.getTargetType() == L2TargetType.AURA) || (sk.getTargetType() == L2TargetType.BEHIND_AURA) || (sk.getTargetType() == L2TargetType.FRONT_AURA) || (sk.getTargetType() == L2TargetType.AURA_CORPSE_MOB))
 			{

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/NpcPersonalAIData.java

@@ -26,8 +26,8 @@ import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.util.Rnd;
 
 /**
- * This class holds parameter, specific to certain NPC's.
- * It can be either general parameters overrided for certain NPC instance instead of template parameters(aggro range, for example), or some optional parameters, handled by datapack scripts.<br>
+ * This class holds parameter, specific to certain NPCs.<br>
+ * It can be either general parameters overridden for certain NPC instance instead of template parameters(aggro range, for example), or some optional parameters, handled by datapack scripts.<br>
  * @author GKR
  */
 public class NpcPersonalAIData

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

@@ -160,16 +160,16 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 		return _maximumCount;
 	}
 	
- 	/**
+	/**
 	 * @return the String Identifier of this spawn.
- 	 */
+	 */
 	@Override
 	public String getName()
 	{
 		return _name;
 	}
 	
- 	/**
+	/**
 	 * Set the String Identifier of this spawn.
 	 * @param name
 	 */
@@ -553,12 +553,12 @@ public class L2Spawn implements IPositionable, IIdentifiable, INamable
 				return mob;
 			}
 			mob = (L2Npc) tmp;
-			// Check for certain AI data, overriden in spawnlist 
+			// Check for certain AI data, overriden in spawnlist
 			if (_name != null)
 			{
 				NpcPersonalAIData.getInstance().initializeNpcParameters(mob, this, _name);
 			}
-
+			
 			return initializeNpcInstance(mob);
 		}
 		catch (Exception e)

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

@@ -1865,7 +1865,7 @@ public class L2Npc extends L2Character
 	/**
 	 * Short wrapper for backward compatibility.
 	 * @param val value to store
-	 * @return {@code true} if stored script value equals given value, {@code false} otherwise 	 
+	 * @return {@code true} if stored script value equals given value, {@code false} otherwise
 	 */
 	public boolean isScriptValue(int val)
 	{
@@ -1907,7 +1907,7 @@ public class L2Npc extends L2Character
 		return ((getSpawn() != null) && (getSpawn().getX(this) == getX()) && (getSpawn().getY(this) == getY()));
 	}
 	
- 	/**
+	/**
 	 * @return {@code true} if {@link NpcVariables} instance is attached to current player's scripts, {@code false} otherwise.
 	 */
 	public boolean hasVariables()

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/templates/L2NpcTemplate.java

@@ -357,7 +357,7 @@ public final class L2NpcTemplate extends L2CharTemplate implements IIdentifiable
 				}
 				else if (skill.getSkillType() == L2SkillType.DUMMY)
 				{
-					if (skill.hasEffectType(L2EffectType.DISPEL))
+					if (skill.hasEffectType(L2EffectType.DISPEL, L2EffectType.DISPEL_BY_SLOT))
 					{
 						addNegativeSkill(skill);
 						addRangeSkill(skill);

L2J_Server_BETA/java/com/l2jserver/gameserver/model/effects/L2EffectType.java

@@ -39,6 +39,7 @@ public enum L2EffectType
 	DAMAGE_TRANSFER,
 	DEBUFF,
 	DISPEL,
+	DISPEL_BY_SLOT,
 	DMG_OVER_TIME,
 	DMG_OVER_TIME_PERCENT,
 	DEATH_LINK,

L2J_Server_BETA/java/com/l2jserver/gameserver/network/SystemMessageId.java

@@ -895,7 +895,7 @@ public final class SystemMessageId
 	
 	/**
 	 * ID: 144<br>
-	 * Message: That is the incorrect target.
+	 * Message: That is an incorrect target.
 	 */
 	public static final SystemMessageId TARGET_IS_INCORRECT;