Added setLastFolkNpc() to all folk classes. Several classes moved from L2Npc to L2NpcInstance.

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2CastleBlacksmithInstance.java

@@ -42,6 +42,8 @@ public class L2CastleBlacksmithInstance extends L2NpcInstance
 	{
 		if (!canTarget(player)) return;
 
+		player.setLastFolkNPC(this);
+
 		// Check if the L2PcInstance already target the L2NpcInstance
 		if (this != player.getTarget())
 		{

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2CastleTeleporterInstance.java

@@ -134,6 +134,8 @@ public final class L2CastleTeleporterInstance extends L2NpcInstance
 	{
 		if (!canTarget(player)) return;
 
+		player.setLastFolkNPC(this);
+
 		// Check if the L2PcInstance already target the L2NpcInstance
 		if (this != player.getTarget())
 		{

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2ClanHallManagerInstance.java

@@ -1375,10 +1375,10 @@ public class L2ClanHallManagerInstance extends L2MerchantInstance
 	@Override
 	public void onAction(L2PcInstance player)
 	{
-		player.setLastFolkNPC(this);
-		
 		if (!canTarget(player)) return;
 
+		player.setLastFolkNPC(this);
+
 		// Check if the L2PcInstance already target the L2NpcInstance
 		if (this != player.getTarget())
 		{

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2ClassMasterInstance.java

@@ -63,6 +63,8 @@ public final class L2ClassMasterInstance extends L2NpcInstance
 	{
 		if (!canTarget(player)) return;
 
+		player.setLastFolkNPC(this);
+
 		// Check if the L2PcInstance already target the L2NpcInstance
 		if (getObjectId() != player.getTargetId())
 		{

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2DoormenInstance.java

@@ -201,6 +201,8 @@ public class L2DoormenInstance extends L2NpcInstance
 		if (!canTarget(player))
 			return;
 
+		player.setLastFolkNPC(this);
+
 		// Check if the L2PcInstance already target the L2NpcInstance
 		if (this != player.getTarget())
 		{

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2FameManagerInstance.java

@@ -17,7 +17,6 @@ package net.sf.l2j.gameserver.model.actor.instance;
 import java.util.StringTokenizer;
 
 import net.sf.l2j.gameserver.ai.CtrlIntention;
-import net.sf.l2j.gameserver.model.actor.L2Npc;
 import net.sf.l2j.gameserver.network.SystemMessageId;
 import net.sf.l2j.gameserver.network.serverpackets.ActionFailed;
 import net.sf.l2j.gameserver.network.serverpackets.ExBrExtraUserInfo;
@@ -32,7 +31,7 @@ import net.sf.l2j.gameserver.templates.chars.L2NpcTemplate;
  * Reputation score manager
  * @author Kerberos
  */
-public class L2FameManagerInstance extends L2Npc
+public class L2FameManagerInstance extends L2NpcInstance
 {
 	public L2FameManagerInstance(int objectId, L2NpcTemplate template)
 	{
@@ -47,7 +46,9 @@ public class L2FameManagerInstance extends L2Npc
 	public void onAction(L2PcInstance player)
 	{
 		if (!canTarget(player)) return;
-		
+
+		player.setLastFolkNPC(this);
+
 		// Check if the L2PcInstance already target the L2NpcInstance
 		if (this != player.getTarget())
 		{

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2FortEnvoyInstance.java

@@ -18,14 +18,13 @@ import java.util.StringTokenizer;
 
 import net.sf.l2j.gameserver.ai.CtrlIntention;
 import net.sf.l2j.gameserver.instancemanager.CastleManager;
-import net.sf.l2j.gameserver.model.actor.L2Npc;
 import net.sf.l2j.gameserver.network.serverpackets.ActionFailed;
 import net.sf.l2j.gameserver.network.serverpackets.MyTargetSelected;
 import net.sf.l2j.gameserver.network.serverpackets.NpcHtmlMessage;
 import net.sf.l2j.gameserver.network.serverpackets.ValidateLocation;
 import net.sf.l2j.gameserver.templates.chars.L2NpcTemplate;
 
-public class L2FortEnvoyInstance extends L2Npc
+public class L2FortEnvoyInstance extends L2NpcInstance
 {
     public L2FortEnvoyInstance(int objectID, L2NpcTemplate template)
     {
@@ -35,7 +34,9 @@ public class L2FortEnvoyInstance extends L2Npc
     public void onAction(L2PcInstance player)
     {
         if (!canTarget(player)) return;
-        
+
+		player.setLastFolkNPC(this);
+
         // Check if the L2PcInstance already target the L2NpcInstance
         if (this != player.getTarget())
         {

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2PetManagerInstance.java

@@ -55,7 +55,9 @@ public class L2PetManagerInstance extends L2MerchantInstance
 	{
 		if (!canTarget(player))
 			return;
-		
+
+		player.setLastFolkNPC(this);
+
 		// Check if the L2PcInstance already target the L2NpcInstance
 		if (this != player.getTarget())
 		{

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2SiegeNpcInstance.java

@@ -44,6 +44,8 @@ public class L2SiegeNpcInstance extends L2NpcInstance
 	{
 		if (!canTarget(player)) return;
 
+		player.setLastFolkNPC(this);
+
 		// Check if the L2PcInstance already target the L2NpcInstance
 		if (this != player.getTarget())
 		{

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2WeddingManagerInstance.java

@@ -22,7 +22,6 @@ import net.sf.l2j.gameserver.instancemanager.CoupleManager;
 import net.sf.l2j.gameserver.model.L2ItemInstance;
 import net.sf.l2j.gameserver.model.L2Skill;
 import net.sf.l2j.gameserver.model.L2World;
-import net.sf.l2j.gameserver.model.actor.L2Npc;
 import net.sf.l2j.gameserver.model.entity.Couple;
 import net.sf.l2j.gameserver.model.itemcontainer.Inventory;
 import net.sf.l2j.gameserver.network.serverpackets.ActionFailed;
@@ -32,7 +31,7 @@ import net.sf.l2j.gameserver.network.serverpackets.NpcHtmlMessage;
 import net.sf.l2j.gameserver.network.serverpackets.ValidateLocation;
 import net.sf.l2j.gameserver.templates.chars.L2NpcTemplate;
 
-public class L2WeddingManagerInstance extends L2Npc
+public class L2WeddingManagerInstance extends L2NpcInstance
 {
 	/**
 	* @author evill33t & squeezed
@@ -47,6 +46,8 @@ public class L2WeddingManagerInstance extends L2Npc
 	{
 		if (!canTarget(player)) return;
 
+		player.setLastFolkNPC(this);
+
 		// Check if the L2PcInstance already target the L2NpcInstance
 		if (this != player.getTarget())
 		{

L2_GameServer/java/net/sf/l2j/gameserver/model/actor/instance/L2WyvernManagerInstance.java

@@ -104,6 +104,8 @@ public class L2WyvernManagerInstance extends L2CastleChamberlainInstance
 	{
 		if (!canTarget(player)) return;
 
+		player.setLastFolkNPC(this);
+
 		// Check if the L2PcInstance already target the L2NpcInstance
 		if (this != player.getTarget())
 		{