BETA: Targethandlers related improvements:

	* Avoiding some '''instanceof''' where it's possible.
	* Format and cleanup.

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAlly.java

@@ -22,7 +22,6 @@ 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.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.model.skills.L2Skill;
@@ -37,25 +36,39 @@ public class TargetAlly implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new FastList<>();
-		if (activeChar instanceof L2Playable)
+		if (activeChar.isPlayable())
 		{
 			final L2PcInstance player = activeChar.getActingPlayer();
 			
 			if (player == null)
+			{
 				return _emptyTargetList;
+			}
 			
 			if (player.isInOlympiadMode())
-				return new L2Character[] { player };
+			{
+				return new L2Character[]
+				{
+					player
+				};
+			}
 			
 			if (onlyFirst)
-				return new L2Character[] { player };
+			{
+				return new L2Character[]
+				{
+					player
+				};
+			}
 			
 			targetList.add(player);
 			
 			final int radius = skill.getSkillRadius();
 			
 			if (L2Skill.addSummon(activeChar, player, radius, false))
+			{
 				targetList.add(player.getSummon());
+			}
 			
 			if (player.getClan() != null)
 			{
@@ -64,37 +77,60 @@ public class TargetAlly implements ITargetTypeHandler
 				for (L2PcInstance obj : objs)
 				{
 					if (obj == null)
+					{
 						continue;
-					if ((obj.getAllyId() == 0 || obj.getAllyId() != player.getAllyId()) && (obj.getClan() == null || obj.getClanId() != player.getClanId()))
+					}
+					if (((obj.getAllyId() == 0) || (obj.getAllyId() != player.getAllyId())) && ((obj.getClan() == null) || (obj.getClanId() != player.getClanId())))
+					{
 						continue;
+					}
 					
 					if (player.isInDuel())
 					{
 						if (player.getDuelId() != obj.getDuelId())
+						{
 							continue;
-						if (player.isInParty() && obj.isInParty() && player.getParty().getLeaderObjectId() != obj.getParty().getLeaderObjectId())
+						}
+						if (player.isInParty() && obj.isInParty() && (player.getParty().getLeaderObjectId() != obj.getParty().getLeaderObjectId()))
+						{
 							continue;
+						}
 					}
 					
 					// Don't add this target if this is a Pc->Pc pvp
 					// casting and pvp condition not met
 					if (!player.checkPvpSkill(obj, skill))
+					{
 						continue;
+					}
 					
 					if (!TvTEvent.checkForTvTSkill(player, obj, skill))
+					{
 						continue;
+					}
 					
 					if (!onlyFirst && L2Skill.addSummon(activeChar, obj, radius, false))
+					{
 						targetList.add(obj.getSummon());
+					}
 					
 					if (!L2Skill.addCharacter(activeChar, obj, radius, false))
+					{
 						continue;
+					}
 					
 					if (onlyFirst)
-						return new L2Character[] { obj };
+					{
+						return new L2Character[]
+						{
+							obj
+						};
+					}
 					
-					if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+					if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+					{
 						break;
+					}
 					
 					targetList.add(obj);
 				}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetArea.java

@@ -21,9 +21,7 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
@@ -39,7 +37,7 @@ public class TargetArea implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new FastList<>();
-		if (((target == null || target == activeChar || target.isAlikeDead()) && skill.getCastRange() >= 0) || (!(target instanceof L2Attackable || target instanceof L2Playable)))
+		if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isL2Attackable() || target.isPlayable())))
 		{
 			activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
 			return _emptyTargetList;
@@ -52,40 +50,59 @@ public class TargetArea implements ITargetTypeHandler
 		if (skill.getCastRange() >= 0)
 		{
 			if (!L2Skill.checkForAreaOffensiveSkills(activeChar, target, skill, srcInArena))
+			{
 				return _emptyTargetList;
+			}
 			
 			if (onlyFirst)
-				return new L2Character[] { target };
+			{
+				return new L2Character[]
+				{
+					target
+				};
+			}
 			
 			origin = target;
 			targetList.add(origin); // Add target to target list
 		}
 		else
+		{
 			origin = activeChar;
+		}
 		
 		final Collection<L2Character> objs = activeChar.getKnownList().getKnownCharacters();
 		for (L2Character obj : objs)
 		{
-			if (!(obj instanceof L2Attackable || obj instanceof L2Playable))
+			if (!(obj.isL2Attackable() || obj.isPlayable()))
+			{
 				continue;
+			}
 			
 			if (obj == origin)
+			{
 				continue;
+			}
 			
 			if (Util.checkIfInRange(radius, origin, obj, true))
 			{
 				if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+				{
 					continue;
+				}
 				
-				if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+				if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+				{
 					break;
+				}
 				
 				targetList.add(obj);
 			}
 		}
 		
 		if (targetList.isEmpty())
+		{
 			return _emptyTargetList;
+		}
 		
 		return targetList.toArray(new L2Character[targetList.size()]);
 	}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaCorpseMob.java

@@ -21,9 +21,7 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
@@ -39,14 +37,19 @@ public class TargetAreaCorpseMob implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new FastList<>();
-		if ((!(target instanceof L2Attackable)) || !target.isDead())
+		if (!target.isL2Attackable() || !target.isDead())
 		{
 			activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
 			return _emptyTargetList;
 		}
 		
 		if (onlyFirst)
-			return new L2Character[] { target };
+		{
+			return new L2Character[]
+			{
+				target
+			};
+		}
 		
 		targetList.add(target);
 		
@@ -56,17 +59,23 @@ public class TargetAreaCorpseMob implements ITargetTypeHandler
 		final Collection<L2Character> objs = activeChar.getKnownList().getKnownCharacters();
 		for (L2Character obj : objs)
 		{
-			if (!(obj instanceof L2Attackable || obj instanceof L2Playable) || !Util.checkIfInRange(radius, target, obj, true))
+			if (!(obj.isL2Attackable() || obj.isPlayable()) || !Util.checkIfInRange(radius, target, obj, true))
+			{
 				continue;
+			}
 			
 			if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+			{
 				continue;
+			}
 			
 			targetList.add(obj);
 		}
 		
 		if (targetList.isEmpty())
+		{
 			return _emptyTargetList;
+		}
 		return targetList.toArray(new L2Character[targetList.size()]);
 	}
 	

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAreaSummon.java

@@ -21,10 +21,7 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Playable;
-import com.l2jserver.gameserver.model.actor.instance.L2ServitorInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
@@ -40,11 +37,18 @@ public class TargetAreaSummon implements ITargetTypeHandler
 	{
 		List<L2Character> targetList = new FastList<>();
 		target = activeChar.getSummon();
-		if (target == null || !(target instanceof L2ServitorInstance) || target.isDead())
+		if ((target == null) || !target.isServitor() || target.isDead())
+		{
 			return _emptyTargetList;
+		}
 		
 		if (onlyFirst)
-			return new L2Character[] { target };
+		{
+			return new L2Character[]
+			{
+				target
+			};
+		}
 		
 		final boolean srcInArena = (activeChar.isInsideZone(ZoneId.PVP) && !activeChar.isInsideZone(ZoneId.SIEGE));
 		final Collection<L2Character> objs = target.getKnownList().getKnownCharacters();
@@ -52,26 +56,38 @@ public class TargetAreaSummon implements ITargetTypeHandler
 		
 		for (L2Character obj : objs)
 		{
-			if (obj == null || obj == target || obj == activeChar)
+			if ((obj == null) || (obj == target) || (obj == activeChar))
+			{
 				continue;
+			}
 			
 			if (!Util.checkIfInRange(radius, target, obj, true))
+			{
 				continue;
+			}
 			
-			if (!(obj instanceof L2Attackable || obj instanceof L2Playable))
+			if (!(obj.isL2Attackable() || obj.isPlayable()))
+			{
 				continue;
+			}
 			
 			if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+			{
 				continue;
+			}
 			
-			if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+			if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+			{
 				break;
+			}
 			
 			targetList.add(obj);
 		}
 		
 		if (targetList.isEmpty())
+		{
 			return _emptyTargetList;
+		}
 		
 		return targetList.toArray(new L2Character[targetList.size()]);
 	}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAura.java

@@ -21,10 +21,7 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.L2SkillType;
@@ -49,16 +46,25 @@ public class TargetAura implements ITargetTypeHandler
 		if (skill.getSkillType() == L2SkillType.DUMMY)
 		{
 			if (onlyFirst)
-				return new L2Character[] { activeChar };
+			{
+				return new L2Character[]
+				{
+					activeChar
+				};
+			}
 			
 			targetList.add(activeChar);
 			for (L2Character obj : objs)
 			{
-				if (!(obj == activeChar || obj == sourcePlayer || obj instanceof L2Npc || obj instanceof L2Attackable))
+				if (!((obj == activeChar) || (obj == sourcePlayer) || obj.isNpc() || obj.isL2Attackable()))
+				{
 					continue;
+				}
 				
-				if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+				if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+				{
 					break;
+				}
 				
 				targetList.add(obj);
 			}
@@ -67,16 +73,25 @@ public class TargetAura implements ITargetTypeHandler
 		{
 			for (L2Character obj : objs)
 			{
-				if (obj instanceof L2Attackable || obj instanceof L2Playable)
+				if (obj.isL2Attackable() || obj.isPlayable())
 				{
 					if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+					{
 						continue;
+					}
 					
 					if (onlyFirst)
-						return new L2Character[] { obj };
+					{
+						return new L2Character[]
+						{
+							obj
+						};
+					}
 					
-					if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+					if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+					{
 						break;
+					}
 					targetList.add(obj);
 				}
 			}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetAuraCorpseMob.java

@@ -21,7 +21,6 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
@@ -39,13 +38,20 @@ public class TargetAuraCorpseMob implements ITargetTypeHandler
 		final Collection<L2Character> objs = activeChar.getKnownList().getKnownCharactersInRadius(skill.getSkillRadius());
 		for (L2Character obj : objs)
 		{
-			if (obj instanceof L2Attackable && obj.isDead())
+			if (obj.isL2Attackable() && obj.isDead())
 			{
 				if (onlyFirst)
-					return new L2Character[] { obj };
+				{
+					return new L2Character[]
+					{
+						obj
+					};
+				}
 				
-				if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+				if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+				{
 					break;
+				}
 				
 				targetList.add(obj);
 			}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindArea.java

@@ -21,9 +21,7 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
@@ -39,7 +37,7 @@ public class TargetBehindArea implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new FastList<>();
-		if (((target == null || target == activeChar || target.isAlikeDead()) && skill.getCastRange() >= 0) || (!(target instanceof L2Attackable || target instanceof L2Playable)))
+		if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isL2Attackable() || target.isPlayable())))
 		{
 			activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
 			return _emptyTargetList;
@@ -52,43 +50,64 @@ public class TargetBehindArea implements ITargetTypeHandler
 		if (skill.getCastRange() >= 0)
 		{
 			if (!L2Skill.checkForAreaOffensiveSkills(activeChar, target, skill, srcInArena))
+			{
 				return _emptyTargetList;
+			}
 			
 			if (onlyFirst)
-				return new L2Character[] { target };
+			{
+				return new L2Character[]
+				{
+					target
+				};
+			}
 			
 			origin = target;
 			targetList.add(origin); // Add target to target list
 		}
 		else
+		{
 			origin = activeChar;
+		}
 		
 		final Collection<L2Character> objs = activeChar.getKnownList().getKnownCharacters();
 		for (L2Character obj : objs)
 		{
-			if (!(obj instanceof L2Attackable || obj instanceof L2Playable))
+			if (!(obj.isL2Attackable() || obj.isPlayable()))
+			{
 				continue;
+			}
 			
 			if (obj == origin)
+			{
 				continue;
+			}
 			
 			if (Util.checkIfInRange(radius, origin, obj, true))
 			{
 				if (!obj.isBehind(activeChar))
+				{
 					continue;
+				}
 				
 				if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+				{
 					continue;
+				}
 				
-				if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+				if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+				{
 					break;
+				}
 				
 				targetList.add(obj);
 			}
 		}
 		
 		if (targetList.isEmpty())
+		{
 			return _emptyTargetList;
+		}
 		
 		return targetList.toArray(new L2Character[targetList.size()]);
 	}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetBehindAura.java

@@ -21,10 +21,7 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.L2SkillType;
@@ -49,16 +46,25 @@ public class TargetBehindAura implements ITargetTypeHandler
 		if (skill.getSkillType() == L2SkillType.DUMMY)
 		{
 			if (onlyFirst)
-				return new L2Character[] { activeChar };
+			{
+				return new L2Character[]
+				{
+					activeChar
+				};
+			}
 			
 			targetList.add(activeChar);
 			for (L2Character obj : objs)
 			{
-				if (!(obj == activeChar || obj == sourcePlayer || obj instanceof L2Npc || obj instanceof L2Attackable))
+				if (!((obj == activeChar) || (obj == sourcePlayer) || (obj.isNpc()) || (obj.isL2Attackable())))
+				{
 					continue;
+				}
 				
-				if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+				if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+				{
 					break;
+				}
 				targetList.add(obj);
 			}
 		}
@@ -66,20 +72,31 @@ public class TargetBehindAura implements ITargetTypeHandler
 		{
 			for (L2Character obj : objs)
 			{
-				if (obj instanceof L2Attackable || obj instanceof L2Playable)
+				if (obj.isL2Attackable() || obj.isPlayable())
 				{
 					
 					if (!obj.isBehind(activeChar))
+					{
 						continue;
+					}
 					
 					if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+					{
 						continue;
+					}
 					
 					if (onlyFirst)
-						return new L2Character[] { obj };
+					{
+						return new L2Character[]
+						{
+							obj
+						};
+					}
 					
-					if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+					if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+					{
 						break;
+					}
 					targetList.add(obj);
 				}
 			}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClan.java

@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.L2ClanMember;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.model.skills.L2Skill;
@@ -41,18 +40,30 @@ public class TargetClan implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new FastList<>();
-		if (activeChar instanceof L2Playable)
+		if (activeChar.isPlayable())
 		{
 			final L2PcInstance player = activeChar.getActingPlayer();
 			
 			if (player == null)
+			{
 				return _emptyTargetList;
+			}
 			
 			if (player.isInOlympiadMode())
-				return new L2Character[] { player };
+			{
+				return new L2Character[]
+				{
+					player
+				};
+			}
 			
 			if (onlyFirst)
-				return new L2Character[] { player };
+			{
+				return new L2Character[]
+				{
+					player
+				};
+			}
 			
 			targetList.add(player);
 			
@@ -60,7 +71,9 @@ public class TargetClan implements ITargetTypeHandler
 			final L2Clan clan = player.getClan();
 			
 			if (L2Skill.addSummon(activeChar, player, radius, false))
+			{
 				targetList.add(player.getSummon());
+			}
 			
 			if (clan != null)
 			{
@@ -69,47 +82,71 @@ public class TargetClan implements ITargetTypeHandler
 				{
 					obj = member.getPlayerInstance();
 					
-					if (obj == null || obj == player)
+					if ((obj == null) || (obj == player))
+					{
 						continue;
+					}
 					
 					if (player.isInDuel())
 					{
 						if (player.getDuelId() != obj.getDuelId())
+						{
 							continue;
-						if (player.isInParty() && obj.isInParty() && player.getParty().getLeaderObjectId() != obj.getParty().getLeaderObjectId())
+						}
+						if (player.isInParty() && obj.isInParty() && (player.getParty().getLeaderObjectId() != obj.getParty().getLeaderObjectId()))
+						{
 							continue;
+						}
 					}
 					
 					// Don't add this target if this is a Pc->Pc pvp casting and pvp condition not met
 					if (!player.checkPvpSkill(obj, skill))
+					{
 						continue;
+					}
 					
 					if (!TvTEvent.checkForTvTSkill(player, obj, skill))
+					{
 						continue;
+					}
 					
 					if (!onlyFirst && L2Skill.addSummon(activeChar, obj, radius, false))
+					{
 						targetList.add(obj.getSummon());
+					}
 					
 					if (!L2Skill.addCharacter(activeChar, obj, radius, false))
+					{
 						continue;
+					}
 					
 					if (onlyFirst)
-						return new L2Character[] { obj };
+					{
+						return new L2Character[]
+						{
+							obj
+						};
+					}
 					
-					if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+					if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+					{
 						break;
+					}
 					
 					targetList.add(obj);
 				}
 			}
 		}
-		else if (activeChar instanceof L2Npc)
+		else if (activeChar.isNpc())
 		{
 			// for buff purposes, returns friendly mobs nearby and mob itself
 			final L2Npc npc = (L2Npc) activeChar;
-			if (npc.getFactionId() == null || npc.getFactionId().isEmpty())
+			if ((npc.getFactionId() == null) || npc.getFactionId().isEmpty())
 			{
-				return new L2Character[] { activeChar };
+				return new L2Character[]
+				{
+					activeChar
+				};
 			}
 			
 			targetList.add(activeChar);
@@ -118,13 +155,17 @@ public class TargetClan implements ITargetTypeHandler
 			
 			for (L2Object newTarget : objs)
 			{
-				if (newTarget instanceof L2Npc && npc.getFactionId().equals(((L2Npc) newTarget).getFactionId()))
+				if (newTarget.isNpc() && npc.getFactionId().equals(((L2Npc) newTarget).getFactionId()))
 				{
 					if (!Util.checkIfInRange(skill.getCastRange(), activeChar, newTarget, true))
+					{
 						continue;
+					}
 					
-					if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+					if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+					{
 						break;
+					}
 					
 					targetList.add((L2Npc) newTarget);
 				}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetClanMember.java

@@ -36,32 +36,43 @@ public class TargetClanMember implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new FastList<>();
-		if (activeChar instanceof L2Npc)
+		if (activeChar.isNpc())
 		{
 			// for buff purposes, returns friendly mobs nearby and mob itself
 			final L2Npc npc = (L2Npc) activeChar;
-			if (npc.getFactionId() == null || npc.getFactionId().isEmpty())
+			if ((npc.getFactionId() == null) || npc.getFactionId().isEmpty())
 			{
-				return new L2Character[] { activeChar };
+				return new L2Character[]
+				{
+					activeChar
+				};
 			}
 			final Collection<L2Object> objs = activeChar.getKnownList().getKnownObjects().values();
 			for (L2Object newTarget : objs)
 			{
-				if (newTarget instanceof L2Npc && npc.getFactionId().equals(((L2Npc) newTarget).getFactionId()))
+				if (newTarget.isNpc() && npc.getFactionId().equals(((L2Npc) newTarget).getFactionId()))
 				{
 					if (!Util.checkIfInRange(skill.getCastRange(), activeChar, newTarget, true))
+					{
 						continue;
+					}
 					if (((L2Npc) newTarget).getFirstEffect(skill) != null)
+					{
 						continue;
+					}
 					targetList.add((L2Npc) newTarget);
 					break;
 				}
 			}
 			if (targetList.isEmpty())
+			{
 				targetList.add(npc);
+			}
 		}
 		else
+		{
 			return _emptyTargetList;
+		}
 		return targetList.toArray(new L2Character[targetList.size()]);
 	}
 	

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseAlly.java

@@ -22,7 +22,6 @@ 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.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.model.skills.L2Skill;
@@ -39,69 +38,101 @@ public class TargetCorpseAlly implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new FastList<>();
-		if (activeChar instanceof L2Playable)
+		if (activeChar.isPlayable())
 		{
 			final L2PcInstance player = activeChar.getActingPlayer();
 			
 			if (player == null)
+			{
 				return _emptyTargetList;
+			}
 			
 			if (player.isInOlympiadMode())
-				return new L2Character[] {player};
+			{
+				return new L2Character[]
+				{
+					player
+				};
+			}
 			
 			final int radius = skill.getSkillRadius();
 			
 			if (L2Skill.addSummon(activeChar, player, radius, true))
+			{
 				targetList.add(player.getSummon());
+			}
 			
 			if (player.getClan() != null)
 			{
 				// Get all visible objects in a spherical area near the L2Character
 				final Collection<L2PcInstance> objs = activeChar.getKnownList().getKnownPlayersInRadius(radius);
-				//synchronized (activeChar.getKnownList().getKnownObjects())
 				{
 					for (L2PcInstance obj : objs)
 					{
 						if (obj == null)
+						{
 							continue;
-						if ((obj.getAllyId() == 0 || obj.getAllyId() != player.getAllyId())
-								&& (obj.getClan() == null || obj.getClanId() != player.getClanId()))
+						}
+						if (((obj.getAllyId() == 0) || (obj.getAllyId() != player.getAllyId())) && ((obj.getClan() == null) || (obj.getClanId() != player.getClanId())))
+						{
 							continue;
+						}
 						
 						if (player.isInDuel())
 						{
 							if (player.getDuelId() != obj.getDuelId())
+							{
 								continue;
-							if (player.isInParty() && obj.isInParty() && player.getParty().getLeaderObjectId() != obj.getParty().getLeaderObjectId())
+							}
+							if (player.isInParty() && obj.isInParty() && (player.getParty().getLeaderObjectId() != obj.getParty().getLeaderObjectId()))
+							{
 								continue;
+							}
 						}
 						
 						// Don't add this target if this is a Pc->Pc pvp
 						// casting and pvp condition not met
 						if (!player.checkPvpSkill(obj, skill))
+						{
 							continue;
+						}
 						
 						if (!TvTEvent.checkForTvTSkill(player, obj, skill))
+						{
 							continue;
+						}
 						
 						if (!onlyFirst && L2Skill.addSummon(activeChar, obj, radius, true))
+						{
 							targetList.add(obj.getSummon());
+						}
 						
 						if (!L2Skill.addCharacter(activeChar, obj, radius, true))
+						{
 							continue;
+						}
 						
 						// Siege battlefield resurrect has been made possible for participants
 						if (skill.getSkillType() == L2SkillType.RESURRECT)
 						{
 							if (obj.isInsideZone(ZoneId.SIEGE) && !obj.isInSiege())
+							{
 								continue;
+							}
 						}
 						
 						if (onlyFirst)
-							return new L2Character[] { obj };
+						{
+							return new L2Character[]
+							{
+								obj
+							};
+						}
 						
-						if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+						if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+						{
 							break;
+						}
 						
 						targetList.add(obj);
 					}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseClan.java

@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.model.L2ClanMember;
 import com.l2jserver.gameserver.model.L2Object;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.TvTEvent;
 import com.l2jserver.gameserver.model.skills.L2Skill;
@@ -43,21 +42,30 @@ public class TargetCorpseClan implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new FastList<>();
-		if (activeChar instanceof L2Playable)
+		if (activeChar.isPlayable())
 		{
 			final L2PcInstance player = activeChar.getActingPlayer();
 			
 			if (player == null)
+			{
 				return _emptyTargetList;
+			}
 			
 			if (player.isInOlympiadMode())
-				return new L2Character[] { player };
+			{
+				return new L2Character[]
+				{
+					player
+				};
+			}
 			
 			final int radius = skill.getSkillRadius();
 			final L2Clan clan = player.getClan();
 			
 			if (L2Skill.addSummon(activeChar, player, radius, true))
+			{
 				targetList.add(player.getSummon());
+			}
 			
 			if (clan != null)
 			{
@@ -66,42 +74,65 @@ public class TargetCorpseClan implements ITargetTypeHandler
 				{
 					obj = member.getPlayerInstance();
 					
-					if (obj == null || obj == player)
+					if ((obj == null) || (obj == player))
+					{
 						continue;
+					}
 					
 					if (player.isInDuel())
 					{
 						if (player.getDuelId() != obj.getDuelId())
+						{
 							continue;
-						if (player.isInParty() && obj.isInParty() && player.getParty().getLeaderObjectId() != obj.getParty().getLeaderObjectId())
+						}
+						if (player.isInParty() && obj.isInParty() && (player.getParty().getLeaderObjectId() != obj.getParty().getLeaderObjectId()))
+						{
 							continue;
+						}
 					}
 					
 					// Don't add this target if this is a Pc->Pc pvp casting and pvp condition not met
 					if (!player.checkPvpSkill(obj, skill))
+					{
 						continue;
+					}
 					
 					if (!TvTEvent.checkForTvTSkill(player, obj, skill))
+					{
 						continue;
+					}
 					
 					if (!onlyFirst && L2Skill.addSummon(activeChar, obj, radius, true))
+					{
 						targetList.add(obj.getSummon());
+					}
 					
 					if (!L2Skill.addCharacter(activeChar, obj, radius, true))
+					{
 						continue;
+					}
 					
 					if (skill.getSkillType() == L2SkillType.RESURRECT)
 					{
 						// check target is not in a active siege zone
 						if (obj.isInsideZone(ZoneId.SIEGE) && !obj.isInSiege())
+						{
 							continue;
+						}
 					}
 					
 					if (onlyFirst)
-						return new L2Character[] { obj };
+					{
+						return new L2Character[]
+						{
+							obj
+						};
+					}
 					
-					if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+					if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+					{
 						break;
+					}
 					
 					targetList.add(obj);
 				}
@@ -111,9 +142,12 @@ public class TargetCorpseClan implements ITargetTypeHandler
 		{
 			// for buff purposes, returns friendly mobs nearby and mob itself
 			final L2Npc npc = (L2Npc) activeChar;
-			if (npc.getFactionId() == null || npc.getFactionId().isEmpty())
+			if ((npc.getFactionId() == null) || npc.getFactionId().isEmpty())
 			{
-				return new L2Character[] { activeChar };
+				return new L2Character[]
+				{
+					activeChar
+				};
 			}
 			
 			targetList.add(activeChar);
@@ -122,13 +156,17 @@ public class TargetCorpseClan implements ITargetTypeHandler
 			
 			for (L2Object newTarget : objs)
 			{
-				if (newTarget instanceof L2Npc && npc.getFactionId().equals(((L2Npc) newTarget).getFactionId()))
+				if ((newTarget.isNpc()) && npc.getFactionId().equals(((L2Npc) newTarget).getFactionId()))
 				{
 					if (!Util.checkIfInRange(skill.getCastRange(), activeChar, newTarget, true))
+					{
 						continue;
+					}
 					
-					if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+					if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+					{
 						break;
+					}
 					
 					targetList.add((L2Npc) newTarget);
 				}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpseMob.java

@@ -37,8 +37,8 @@ public class TargetCorpseMob implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new FastList<>();
-		final boolean isSummon = target instanceof L2ServitorInstance;
-		if (!(isSummon || target instanceof L2Attackable) || !target.isDead())
+		final boolean isSummon = target.isServitor();
+		if (!(isSummon || target.isL2Attackable()) || !target.isDead())
 		{
 			activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
 			return _emptyTargetList;
@@ -49,9 +49,10 @@ public class TargetCorpseMob implements ITargetTypeHandler
 		{
 			case SUMMON:
 			{
-				if (isSummon && ((L2ServitorInstance)target).getOwner() != null
-						&& ((L2ServitorInstance)target).getOwner().getObjectId() == activeChar.getObjectId())
+				if (isSummon && (((L2ServitorInstance) target).getOwner() != null) && (((L2ServitorInstance) target).getOwner().getObjectId() == activeChar.getObjectId()))
+				{
 					return _emptyTargetList;
+				}
 				
 				break;
 			}
@@ -69,7 +70,10 @@ public class TargetCorpseMob implements ITargetTypeHandler
 			targetList.add(target);
 			return targetList.toArray(new L2Object[targetList.size()]);
 		}
-		return new L2Character[] { target };
+		return new L2Character[]
+		{
+			target
+		};
 	}
 	
 	@Override

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePet.java

@@ -17,7 +17,6 @@ package handlers.targethandlers;
 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.targets.L2TargetType;
 
@@ -29,11 +28,16 @@ public class TargetCorpsePet implements ITargetTypeHandler
 	@Override
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
-		if (activeChar instanceof L2PcInstance)
+		if (activeChar.isPlayer())
 		{
 			target = activeChar.getSummon();
-			if (target != null && target.isDead())
-				return new L2Character[] { target };
+			if ((target != null) && target.isDead())
+			{
+				return new L2Character[]
+				{
+					target
+				};
+			}
 		}
 		
 		return _emptyTargetList;

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetCorpsePlayer.java

@@ -38,27 +38,39 @@ public class TargetCorpsePlayer implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new FastList<>();
-		if (target != null && target.isDead())
+		if ((target != null) && target.isDead())
 		{
 			final L2PcInstance player;
-			if (activeChar instanceof L2PcInstance)
-				player = (L2PcInstance) activeChar;
+			if (activeChar.isPlayer())
+			{
+				player = activeChar.getActingPlayer();
+			}
 			else
+			{
 				player = null;
+			}
 			
 			final L2PcInstance targetPlayer;
-			if (target instanceof L2PcInstance)
-				targetPlayer = (L2PcInstance) target;
+			if (target.isPlayer())
+			{
+				targetPlayer = target.getActingPlayer();
+			}
 			else
+			{
 				targetPlayer = null;
+			}
 			
 			final L2PetInstance targetPet;
-			if (target instanceof L2PetInstance)
+			if (target.isPet())
+			{
 				targetPet = (L2PetInstance) target;
+			}
 			else
+			{
 				targetPet = null;
+			}
 			
-			if (player != null && (targetPlayer != null || targetPet != null))
+			if ((player != null) && ((targetPlayer != null) || (targetPet != null)))
 			{
 				boolean condGood = true;
 				
@@ -81,9 +93,13 @@ public class TargetCorpsePlayer implements ITargetTypeHandler
 						if (targetPlayer.isReviveRequested())
 						{
 							if (targetPlayer.isRevivingPet())
+							{
 								player.sendPacket(SystemMessageId.MASTER_CANNOT_RES); // While a pet is attempting to resurrect, it cannot help in resurrecting its master.
+							}
 							else
+							{
 								player.sendPacket(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed.
+							}
 							condGood = false;
 						}
 					}
@@ -94,9 +110,13 @@ public class TargetCorpsePlayer implements ITargetTypeHandler
 							if (targetPet.getOwner().isReviveRequested())
 							{
 								if (targetPet.getOwner().isRevivingPet())
+								{
 									player.sendPacket(SystemMessageId.RES_HAS_ALREADY_BEEN_PROPOSED); // Resurrection is already been proposed.
+								}
 								else
+								{
 									player.sendPacket(SystemMessageId.CANNOT_RES_PET2); // A pet cannot be resurrected while it's owner is in the process of resurrecting.
+								}
 								condGood = false;
 							}
 						}
@@ -110,7 +130,10 @@ public class TargetCorpsePlayer implements ITargetTypeHandler
 						targetList.add(target);
 						return targetList.toArray(new L2Object[targetList.size()]);
 					}
-					return new L2Character[] { target };
+					return new L2Character[]
+					{
+						target
+					};
 				}
 			}
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetEnemySummon.java

@@ -18,7 +18,6 @@ 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.L2Summon;
-import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
@@ -31,14 +30,16 @@ public class TargetEnemySummon implements ITargetTypeHandler
 	@Override
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
-		if(target instanceof L2Summon)
+		if (target.isSummon())
 		{
-			L2Summon targetSummon = (L2Summon)target;
-			if (activeChar instanceof L2PcInstance && activeChar.getSummon() != targetSummon && !targetSummon.isDead()
-					&& (targetSummon.getOwner().getPvpFlag() != 0 || targetSummon.getOwner().getKarma() > 0)
-					|| (targetSummon.getOwner().isInsideZone(ZoneId.PVP) && ((L2PcInstance)activeChar).isInsideZone(ZoneId.PVP))
-					|| (targetSummon.getOwner().isInDuel() && ((L2PcInstance)activeChar).isInDuel() && targetSummon.getOwner().getDuelId() == ((L2PcInstance)activeChar).getDuelId()))
-				return new L2Character[]{targetSummon};
+			L2Summon targetSummon = (L2Summon) target;
+			if ((activeChar.isPlayer() && (activeChar.getSummon() != targetSummon) && !targetSummon.isDead() && ((targetSummon.getOwner().getPvpFlag() != 0) || (targetSummon.getOwner().getKarma() > 0))) || (targetSummon.getOwner().isInsideZone(ZoneId.PVP) && activeChar.getActingPlayer().isInsideZone(ZoneId.PVP)) || (targetSummon.getOwner().isInDuel() && activeChar.getActingPlayer().isInDuel() && (targetSummon.getOwner().getDuelId() == activeChar.getActingPlayer().getDuelId())))
+			{
+				return new L2Character[]
+				{
+					targetSummon
+				};
+			}
 		}
 		return _emptyTargetList;
 	}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFlagPole.java

@@ -32,12 +32,16 @@ public class TargetFlagPole implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		if (!activeChar.isPlayer())
+		{
 			return _emptyTargetList;
+		}
 		
 		final L2PcInstance player = activeChar.getActingPlayer();
 		final Fort fort = FortManager.getInstance().getFort(player);
-		if (player.getClan() == null || fort == null || !player.checkIfOkToCastFlagDisplay(fort, true, skill, activeChar.getTarget()))
+		if ((player.getClan() == null) || (fort == null) || !player.checkIfOkToCastFlagDisplay(fort, true, skill, activeChar.getTarget()))
+		{
 			return _emptyTargetList;
+		}
 		
 		return new L2Object[]
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontArea.java

@@ -21,9 +21,7 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 import com.l2jserver.gameserver.model.zone.ZoneId;
@@ -39,7 +37,7 @@ public class TargetFrontArea implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new FastList<>();
-		if (((target == null || target == activeChar || target.isAlikeDead()) && skill.getCastRange() >= 0) || (!(target instanceof L2Attackable || target instanceof L2Playable)))
+		if ((target == null) || (((target == activeChar) || target.isAlikeDead()) && (skill.getCastRange() >= 0)) || (!(target.isL2Attackable() || target.isPlayable())))
 		{
 			activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
 			return _emptyTargetList;
@@ -52,43 +50,64 @@ public class TargetFrontArea implements ITargetTypeHandler
 		if (skill.getCastRange() >= 0)
 		{
 			if (!L2Skill.checkForAreaOffensiveSkills(activeChar, target, skill, srcInArena))
+			{
 				return _emptyTargetList;
+			}
 			
 			if (onlyFirst)
-				return new L2Character[] { target };
+			{
+				return new L2Character[]
+				{
+					target
+				};
+			}
 			
 			origin = target;
 			targetList.add(origin); // Add target to target list
 		}
 		else
+		{
 			origin = activeChar;
+		}
 		
 		final Collection<L2Character> objs = activeChar.getKnownList().getKnownCharacters();
 		for (L2Character obj : objs)
 		{
-			if (!(obj instanceof L2Attackable || obj instanceof L2Playable))
+			if (!(obj.isL2Attackable() || obj.isPlayable()))
+			{
 				continue;
+			}
 			
 			if (obj == origin)
+			{
 				continue;
+			}
 			
 			if (Util.checkIfInRange(radius, origin, obj, true))
 			{
 				if (!obj.isInFrontOf(activeChar))
+				{
 					continue;
+				}
 				
 				if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+				{
 					continue;
+				}
 				
-				if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+				if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+				{
 					break;
+				}
 				
 				targetList.add(obj);
 			}
 		}
 		
 		if (targetList.isEmpty())
+		{
 			return _emptyTargetList;
+		}
 		
 		return targetList.toArray(new L2Character[targetList.size()]);
 	}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetFrontAura.java

@@ -21,10 +21,7 @@ import javolution.util.FastList;
 
 import com.l2jserver.gameserver.handler.ITargetTypeHandler;
 import com.l2jserver.gameserver.model.L2Object;
-import com.l2jserver.gameserver.model.actor.L2Attackable;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Npc;
-import com.l2jserver.gameserver.model.actor.L2Playable;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.L2SkillType;
@@ -49,16 +46,25 @@ public class TargetFrontAura implements ITargetTypeHandler
 		if (skill.getSkillType() == L2SkillType.DUMMY)
 		{
 			if (onlyFirst)
-				return new L2Character[] { activeChar };
+			{
+				return new L2Character[]
+				{
+					activeChar
+				};
+			}
 			
 			targetList.add(activeChar);
 			for (L2Character obj : objs)
 			{
-				if (!(obj == activeChar || obj == sourcePlayer || obj instanceof L2Npc || obj instanceof L2Attackable))
+				if (!((obj == activeChar) || (obj == sourcePlayer) || (obj.isNpc()) || (obj.isL2Attackable())))
+				{
 					continue;
+				}
 				
-				if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+				if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+				{
 					break;
+				}
 				targetList.add(obj);
 			}
 		}
@@ -66,20 +72,31 @@ public class TargetFrontAura implements ITargetTypeHandler
 		{
 			for (L2Character obj : objs)
 			{
-				if (obj instanceof L2Attackable || obj instanceof L2Playable)
+				if (obj.isL2Attackable() || obj.isPlayable())
 				{
 					
 					if (!obj.isInFrontOf(activeChar))
+					{
 						continue;
+					}
 					
 					if (!L2Skill.checkForAreaOffensiveSkills(activeChar, obj, skill, srcInArena))
+					{
 						continue;
+					}
 					
 					if (onlyFirst)
-						return new L2Character[] { obj };
+					{
+						return new L2Character[]
+						{
+							obj
+						};
+					}
 					
-					if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+					if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+					{
 						break;
+					}
 					targetList.add(obj);
 				}
 			}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetGround.java

@@ -29,7 +29,10 @@ public class TargetGround implements ITargetTypeHandler
 	@Override
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
-		return new L2Character[] { activeChar };
+		return new L2Character[]
+		{
+			activeChar
+		};
 	}
 	
 	@Override

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetHoly.java

@@ -32,12 +32,16 @@ public class TargetHoly implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		if (!activeChar.isPlayer())
+		{
 			return _emptyTargetList;
+		}
 		
 		final L2PcInstance player = activeChar.getActingPlayer();
 		final Castle castle = CastleManager.getInstance().getCastle(player);
-		if (player.getClan() == null || castle == null || !player.checkIfOkToCastSealOfRule(castle, true, skill, target))
+		if ((player.getClan() == null) || (castle == null) || !player.checkIfOkToCastSealOfRule(castle, true, skill, target))
+		{
 			return _emptyTargetList;
+		}
 		
 		return new L2Object[]
 		{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOne.java

@@ -53,14 +53,17 @@ public class TargetOne implements ITargetTypeHandler
 		}
 		
 		// Check for null target or any other invalid target
-		if (target == null || target.isDead() || (target == activeChar && !canTargetSelf))
+		if ((target == null) || target.isDead() || ((target == activeChar) && !canTargetSelf))
 		{
 			activeChar.sendPacket(SystemMessageId.TARGET_IS_INCORRECT);
 			return _emptyTargetList;
 		}
 		
 		// If a target is found, return it in a table else send a system message TARGET_IS_INCORRECT
-		return new L2Character[] { target };
+		return new L2Character[]
+		{
+			target
+		};
 	}
 	
 	@Override

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetOwnerPet.java

@@ -29,11 +29,16 @@ public class TargetOwnerPet implements ITargetTypeHandler
 	@Override
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
-		if (activeChar instanceof L2Summon)
+		if (activeChar.isSummon())
 		{
 			target = ((L2Summon) activeChar).getOwner();
-			if (target != null && !target.isDead())
-				return new L2Character[] { target };
+			if ((target != null) && !target.isDead())
+			{
+				return new L2Character[]
+				{
+					target
+				};
+			}
 		}
 		
 		return _emptyTargetList;

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetParty.java

@@ -21,7 +21,6 @@ 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.L2Summon;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
@@ -36,22 +35,31 @@ public class TargetParty implements ITargetTypeHandler
 	{
 		List<L2Character> targetList = new FastList<>();
 		if (onlyFirst)
-			return new L2Character[] { activeChar };
+		{
+			return new L2Character[]
+			{
+				activeChar
+			};
+		}
 		
 		targetList.add(activeChar);
 		
 		final int radius = skill.getSkillRadius();
 		
 		L2PcInstance player = activeChar.getActingPlayer();
-		if (activeChar instanceof L2Summon)
+		if (activeChar.isSummon())
 		{
 			if (L2Skill.addCharacter(activeChar, player, radius, false))
+			{
 				targetList.add(player);
+			}
 		}
-		else if (activeChar instanceof L2PcInstance)
+		else if (activeChar.isPlayer())
 		{
 			if (L2Skill.addSummon(activeChar, player, radius, false))
+			{
 				targetList.add(player.getSummon());
+			}
 		}
 		
 		if (activeChar.isInParty())
@@ -59,17 +67,25 @@ public class TargetParty implements ITargetTypeHandler
 			// Get a list of Party Members
 			for (L2PcInstance partyMember : activeChar.getParty().getMembers())
 			{
-				if (partyMember == null || partyMember == player)
+				if ((partyMember == null) || (partyMember == player))
+				{
 					continue;
+				}
 				
-				if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+				if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+				{
 					break;
+				}
 				
 				if (L2Skill.addCharacter(activeChar, partyMember, radius, false))
+				{
 					targetList.add(partyMember);
+				}
 				
 				if (L2Skill.addSummon(activeChar, partyMember, radius, false))
+				{
 					targetList.add(partyMember.getSummon());
+				}
 			}
 		}
 		return targetList.toArray(new L2Character[targetList.size()]);

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyClan.java

@@ -37,12 +37,19 @@ public class TargetPartyClan implements ITargetTypeHandler
 	{
 		List<L2Character> targetList = new FastList<>();
 		if (onlyFirst)
-			return new L2Character[] { activeChar };
+		{
+			return new L2Character[]
+			{
+				activeChar
+			};
+		}
 		
 		final L2PcInstance player = activeChar.getActingPlayer();
 		
 		if (player == null)
+		{
 			return _emptyTargetList;
+		}
 		
 		targetList.add(player);
 		
@@ -51,61 +58,94 @@ public class TargetPartyClan implements ITargetTypeHandler
 		final boolean hasParty = player.isInParty();
 		
 		if (L2Skill.addSummon(activeChar, player, radius, false))
+		{
 			targetList.add(player.getSummon());
+		}
 		
 		// if player in clan and not in party
 		if (!(hasClan || hasParty))
+		{
 			return targetList.toArray(new L2Character[targetList.size()]);
+		}
 		
 		// Get all visible objects in a spherical area near the L2Character
 		final Collection<L2PcInstance> objs = activeChar.getKnownList().getKnownPlayersInRadius(radius);
 		for (L2PcInstance obj : objs)
 		{
 			if (obj == null)
+			{
 				continue;
+			}
 			
 			// olympiad mode - adding only own side
 			if (player.isInOlympiadMode())
 			{
 				if (!obj.isInOlympiadMode())
+				{
 					continue;
+				}
 				if (player.getOlympiadGameId() != obj.getOlympiadGameId())
+				{
 					continue;
+				}
 				if (player.getOlympiadSide() != obj.getOlympiadSide())
+				{
 					continue;
+				}
 			}
 			
 			if (player.isInDuel())
 			{
 				if (player.getDuelId() != obj.getDuelId())
+				{
 					continue;
+				}
 				
-				if (hasParty && obj.isInParty() && player.getParty().getLeaderObjectId() != obj.getParty().getLeaderObjectId())
+				if (hasParty && obj.isInParty() && (player.getParty().getLeaderObjectId() != obj.getParty().getLeaderObjectId()))
+				{
 					continue;
+				}
 			}
 			
-			if (!((hasClan && obj.getClanId() == player.getClanId()) || (hasParty && obj.isInParty() && player.getParty().getLeaderObjectId() == obj.getParty().getLeaderObjectId())))
+			if (!((hasClan && (obj.getClanId() == player.getClanId())) || (hasParty && obj.isInParty() && (player.getParty().getLeaderObjectId() == obj.getParty().getLeaderObjectId()))))
+			{
 				continue;
+			}
 			
 			// Don't add this target if this is a Pc->Pc pvp
 			// casting and pvp condition not met
 			if (!player.checkPvpSkill(obj, skill))
+			{
 				continue;
+			}
 			
 			if (!TvTEvent.checkForTvTSkill(player, obj, skill))
+			{
 				continue;
+			}
 			
 			if (!onlyFirst && L2Skill.addSummon(activeChar, obj, radius, false))
+			{
 				targetList.add(obj.getSummon());
+			}
 			
 			if (!L2Skill.addCharacter(activeChar, obj, radius, false))
+			{
 				continue;
+			}
 			
 			if (onlyFirst)
-				return new L2Character[] { obj };
+			{
+				return new L2Character[]
+				{
+					obj
+				};
+			}
 			
-			if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+			if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+			{
 				break;
+			}
 			
 			targetList.add(obj);
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyMember.java

@@ -36,12 +36,12 @@ public class TargetPartyMember implements ITargetTypeHandler
 		}
 		if (!target.isDead())
 		{
-			if ((target == activeChar) ||
-				(activeChar.isInParty() && target.isInParty() && (activeChar.getParty().getLeaderObjectId() == target.getParty().getLeaderObjectId())) ||
-				(activeChar.isPlayer() && target.isSummon() && (activeChar.getSummon() == target)) ||
-				(activeChar.isSummon() && target.isPlayer() && (activeChar == target.getSummon())))
+			if ((target == activeChar) || (activeChar.isInParty() && target.isInParty() && (activeChar.getParty().getLeaderObjectId() == target.getParty().getLeaderObjectId())) || (activeChar.isPlayer() && target.isSummon() && (activeChar.getSummon() == target)) || (activeChar.isSummon() && target.isPlayer() && (activeChar == target.getSummon())))
 			{
-				return new L2Character[] { target };
+				return new L2Character[]
+				{
+					target
+				};
 			}
 		}
 		return _emptyTargetList;

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyNotMe.java

@@ -37,20 +37,27 @@ public class TargetPartyNotMe implements ITargetTypeHandler
 	{
 		List<L2Character> targetList = new FastList<>();
 		if (onlyFirst)
-			return new L2Character[] { activeChar };
+		{
+			return new L2Character[]
+			{
+				activeChar
+			};
+		}
 		
 		L2PcInstance player = null;
 		
-		if (activeChar instanceof L2Summon)
+		if (activeChar.isSummon())
 		{
 			player = ((L2Summon) activeChar).getOwner();
 			targetList.add(player);
 		}
-		else if (activeChar instanceof L2PcInstance)
+		else if (activeChar.isPlayer())
 		{
-			player = (L2PcInstance) activeChar;
+			player = activeChar.getActingPlayer();
 			if (activeChar.getSummon() != null)
+			{
 				targetList.add(activeChar.getSummon());
+			}
 		}
 		
 		if (activeChar.getParty() != null)
@@ -60,17 +67,23 @@ public class TargetPartyNotMe implements ITargetTypeHandler
 			for (L2PcInstance partyMember : partyList)
 			{
 				if (partyMember == null)
+				{
 					continue;
+				}
 				else if (partyMember == player)
+				{
 					continue;
+				}
 				else if (!partyMember.isDead() && Util.checkIfInRange(skill.getSkillRadius(), activeChar, partyMember, true))
 				{
-					if (skill.getMaxTargets() > -1 && targetList.size() >= skill.getMaxTargets())
+					if ((skill.getMaxTargets() > -1) && (targetList.size() >= skill.getMaxTargets()))
+					{
 						break;
+					}
 					
 					targetList.add(partyMember);
 					
-					if (partyMember.getSummon() != null && !partyMember.getSummon().isDead())
+					if ((partyMember.getSummon() != null) && !partyMember.getSummon().isDead())
 					{
 						targetList.add(partyMember.getSummon());
 					}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPartyOther.java

@@ -17,7 +17,6 @@ package handlers.targethandlers;
 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.targets.L2TargetType;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -30,32 +29,39 @@ public class TargetPartyOther implements ITargetTypeHandler
 	@Override
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
-		if (target != null && target != activeChar
-				&& activeChar.isInParty() && target.isInParty()
-				&& activeChar.getParty().getLeaderObjectId() == target.getParty().getLeaderObjectId())
+		if ((target != null) && (target != activeChar) && activeChar.isInParty() && target.isInParty() && (activeChar.getParty().getLeaderObjectId() == target.getParty().getLeaderObjectId()))
 		{
 			if (!target.isDead())
 			{
-				if (target instanceof L2PcInstance)
+				if (target.isPlayer())
 				{
 					switch (skill.getId())
 					{
-						// FORCE BUFFS may cancel here but there should be a proper condition
+					// FORCE BUFFS may cancel here but there should be a proper condition
 						case 426:
-							if (!((L2PcInstance) target).isMageClass())
+							if (!target.getActingPlayer().isMageClass())
 							{
-								return new L2Character[] { target };
+								return new L2Character[]
+								{
+									target
+								};
 							}
 							return _emptyTargetList;
 						case 427:
-							if (((L2PcInstance) target).isMageClass())
+							if (target.getActingPlayer().isMageClass())
 							{
-								return new L2Character[] { target };
+								return new L2Character[]
+								{
+									target
+								};
 							}
 							return _emptyTargetList;
 					}
 				}
-				return new L2Character[] { target };
+				return new L2Character[]
+				{
+					target
+				};
 			}
 			return _emptyTargetList;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetPet.java

@@ -29,8 +29,13 @@ public class TargetPet implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		target = activeChar.getSummon();
-		if (target != null && !target.isDead())
-			return new L2Character[] { target };
+		if ((target != null) && !target.isDead())
+		{
+			return new L2Character[]
+			{
+				target
+			};
+		}
 		
 		return _emptyTargetList;
 	}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSelf.java

@@ -29,7 +29,10 @@ public class TargetSelf implements ITargetTypeHandler
 	@Override
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
-		return new L2Character[] { activeChar };
+		return new L2Character[]
+		{
+			activeChar
+		};
 	}
 	
 	@Override

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetSummon.java

@@ -29,8 +29,13 @@ public class TargetSummon implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		target = activeChar.getSummon();
-		if (target != null && !target.isDead() && target.isServitor())
-			return new L2Character[] { target };
+		if ((target != null) && !target.isDead() && target.isServitor())
+		{
+			return new L2Character[]
+			{
+				target
+			};
+		}
 		
 		return _emptyTargetList;
 	}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/targethandlers/TargetUnlockable.java

@@ -22,7 +22,6 @@ 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.L2ChestInstance;
-import com.l2jserver.gameserver.model.actor.instance.L2DoorInstance;
 import com.l2jserver.gameserver.model.skills.L2Skill;
 import com.l2jserver.gameserver.model.skills.targets.L2TargetType;
 
@@ -35,7 +34,7 @@ public class TargetUnlockable implements ITargetTypeHandler
 	public L2Object[] getTargetList(L2Skill skill, L2Character activeChar, boolean onlyFirst, L2Character target)
 	{
 		List<L2Character> targetList = new FastList<>();
-		if (!(target instanceof L2DoorInstance) && !(target instanceof L2ChestInstance))
+		if (!target.isDoor() && !(target instanceof L2ChestInstance))
 		{
 			return _emptyTargetList;
 		}
@@ -45,7 +44,10 @@ public class TargetUnlockable implements ITargetTypeHandler
 			targetList.add(target);
 			return targetList.toArray(new L2Object[targetList.size()]);
 		}
-		return new L2Character[] { target };
+		return new L2Character[]
+		{
+			target
+		};
 	}
 	
 	@Override