BETA: Bypasshandlers cleanup.

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ArenaBuff.java

@@ -21,12 +21,11 @@ package handlers.bypasshandlers;
 import java.util.StringTokenizer;
 import java.util.logging.Level;
 
-import com.l2jserver.gameserver.datatables.SkillTable;
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
-import com.l2jserver.gameserver.model.skills.L2Skill;
+import com.l2jserver.gameserver.model.holders.SkillHolder;
 import com.l2jserver.gameserver.model.zone.ZoneId;
 
 /**
@@ -41,7 +40,7 @@ public class ArenaBuff implements IBypassHandler
 		"CPRecovery"
 	};
 	
-	private final int[][] _Buffs =
+	private final int[][] BUFFS =
 	{
 		{ // Fighter Buffs
 			6803,
@@ -63,7 +62,7 @@ public class ArenaBuff implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}
@@ -81,14 +80,14 @@ public class ArenaBuff implements IBypassHandler
 					return false;
 				}
 				
-				for (int skillId : _Buffs[activeChar.isMageClass() ? 1 : 0])
+				for (int skillId : BUFFS[activeChar.isMageClass() ? 1 : 0])
 				{
-					L2Skill skill = SkillTable.getInstance().getInfo(skillId, 1);
+					SkillHolder skill = new SkillHolder(skillId, 1);
 					
-					if (skill != null)
+					if (skill.getSkill() != null)
 					{
 						npc.setTarget(activeChar);
-						npc.doCast(skill);
+						npc.doCast(skill.getSkill());
 					}
 				}
 				return true;
@@ -104,11 +103,11 @@ public class ArenaBuff implements IBypassHandler
 					return false;
 				}
 				
-				L2Skill skill = SkillTable.getInstance().getInfo(6817, 1);
-				if (skill != null)
+				SkillHolder skill = new SkillHolder(6817, 1);
+				if (skill.getSkill() != null)
 				{
 					npc.setTarget(activeChar);
-					npc.doCast(skill);
+					npc.doCast(skill.getSkill());
 				}
 				return true;
 			}
@@ -123,11 +122,11 @@ public class ArenaBuff implements IBypassHandler
 					return false;
 				}
 				
-				L2Skill skill = SkillTable.getInstance().getInfo(4380, 1);
-				if (skill != null)
+				SkillHolder skill = new SkillHolder(4380, 1);
+				if (skill.getSkill() != null)
 				{
 					npc.setTarget(activeChar);
-					npc.doCast(skill);
+					npc.doCast(skill.getSkill());
 				}
 				return true;
 			}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Augment.java

@@ -22,7 +22,6 @@ import java.util.logging.Level;
 
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.ExShowVariationCancelWindow;
 import com.l2jserver.gameserver.network.serverpackets.ExShowVariationMakeWindow;
@@ -37,7 +36,7 @@ public class Augment implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ChatLink.java

@@ -33,7 +33,7 @@ public class ChatLink implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/EventEngine.java

@@ -22,7 +22,6 @@ import java.util.logging.Level;
 
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.entity.L2Event;
 
@@ -37,7 +36,7 @@ public class EventEngine implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Freight.java

@@ -20,7 +20,6 @@ package handlers.bypasshandlers;
 
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.itemcontainer.PcFreight;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -41,7 +40,7 @@ public class Freight implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ItemAuctionLink.java

@@ -46,7 +46,7 @@ public class ItemAuctionLink implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Link.java

@@ -36,7 +36,7 @@ public class Link implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Loto.java

@@ -44,7 +44,7 @@ public class Loto implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Multisell.java

@@ -37,7 +37,7 @@ public class Multisell implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Observation.java

@@ -42,7 +42,7 @@ public class Observation implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/PrivateWarehouse.java

@@ -45,7 +45,7 @@ public class PrivateWarehouse implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/QuestLink.java

@@ -48,7 +48,7 @@ public class QuestLink implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ReceivePremium.java

@@ -19,7 +19,6 @@
 package handlers.bypasshandlers;
 
 import com.l2jserver.gameserver.handler.IBypassHandler;
-import com.l2jserver.gameserver.model.L2Object.InstanceType;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.SystemMessageId;
@@ -35,7 +34,7 @@ public class ReceivePremium implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target.isInstanceType(InstanceType.L2Npc)))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/ReleaseAttribute.java

@@ -20,7 +20,6 @@ package handlers.bypasshandlers;
 
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.ExShowBaseAttributeCancelWindow;
 
@@ -34,7 +33,7 @@ public class ReleaseAttribute implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RemoveDeathPenalty.java

@@ -34,7 +34,7 @@ public class RemoveDeathPenalty implements IBypassHandler
 		"remove_dp"
 	};
 	
-	private static final int[] pen_clear_price =
+	private static final int[] PEN_CLEAR_PRICE =
 	{
 		3600,
 		8640,
@@ -49,7 +49,7 @@ public class RemoveDeathPenalty implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}
@@ -65,7 +65,7 @@ public class RemoveDeathPenalty implements IBypassHandler
 					NpcHtmlMessage html = new NpcHtmlMessage(npc.getObjectId());
 					html.setFile(activeChar.getHtmlPrefix(), filename);
 					html.replace("%objectId%", String.valueOf(npc.getObjectId()));
-					html.replace("%dp_price%", String.valueOf(pen_clear_price[activeChar.getExpertiseLevel()]));
+					html.replace("%dp_price%", String.valueOf(PEN_CLEAR_PRICE[activeChar.getExpertiseLevel()]));
 					activeChar.sendPacket(html);
 					break;
 				case 2:
@@ -74,9 +74,9 @@ public class RemoveDeathPenalty implements IBypassHandler
 					
 					if (activeChar.getDeathPenaltyBuffLevel() > 0)
 					{
-						if (activeChar.getAdena() >= pen_clear_price[activeChar.getExpertiseLevel()])
+						if (activeChar.getAdena() >= PEN_CLEAR_PRICE[activeChar.getExpertiseLevel()])
 						{
-							if (!activeChar.reduceAdena("DeathPenality", pen_clear_price[activeChar.getExpertiseLevel()], npc, true))
+							if (!activeChar.reduceAdena("DeathPenality", PEN_CLEAR_PRICE[activeChar.getExpertiseLevel()], npc, true))
 							{
 								return false;
 							}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/RideWyvern.java

@@ -25,6 +25,7 @@ import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.actor.L2Character;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2WyvernManagerInstance;
+import com.l2jserver.gameserver.network.SystemMessageId;
 import com.l2jserver.gameserver.util.Util;
 
 public class RideWyvern implements IBypassHandler
@@ -76,7 +77,7 @@ public class RideWyvern implements IBypassHandler
 		{
 			if (activeChar.isMounted())
 			{
-				activeChar.sendMessage("You already have a pet.");
+				activeChar.sendPacket(SystemMessageId.YOU_ALREADY_HAVE_A_PET);
 			}
 			else
 			{

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Rift.java

@@ -38,7 +38,7 @@ public class Rift implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportBlessing.java

@@ -36,16 +36,11 @@ public class SupportBlessing implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}
 		
-		// Blessing of protection - author kerberos_20. Used codes from Rayan - L2Emu project.
-		// Prevent a cursed weapon weilder of being buffed - I think no need of that becouse karma check > 0
-		// if (player.isCursedWeaponEquiped())
-		// return;
-		
 		int player_level = activeChar.getLevel();
 		// Select the player
 		((L2Npc) target).setTarget(activeChar);

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/SupportMagic.java

@@ -39,7 +39,7 @@ public class SupportMagic implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/TerritoryStatus.java

@@ -36,7 +36,7 @@ public class TerritoryStatus implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/TerritoryWar.java

@@ -25,7 +25,6 @@ import com.l2jserver.gameserver.datatables.MultiSell;
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.instancemanager.TerritoryWarManager;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2MercenaryManagerInstance;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
@@ -45,7 +44,7 @@ public class TerritoryWar implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}

L2J_DataPack_BETA/dist/game/data/scripts/handlers/bypasshandlers/Wear.java

@@ -26,7 +26,6 @@ import com.l2jserver.gameserver.TradeController;
 import com.l2jserver.gameserver.handler.IBypassHandler;
 import com.l2jserver.gameserver.model.L2TradeList;
 import com.l2jserver.gameserver.model.actor.L2Character;
-import com.l2jserver.gameserver.model.actor.L2Npc;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
 import com.l2jserver.gameserver.network.serverpackets.ActionFailed;
 import com.l2jserver.gameserver.network.serverpackets.ShopPreviewList;
@@ -41,7 +40,7 @@ public class Wear implements IBypassHandler
 	@Override
 	public boolean useBypass(String command, L2PcInstance activeChar, L2Character target)
 	{
-		if (!(target instanceof L2Npc))
+		if (!target.isNpc())
 		{
 			return false;
 		}