Likely fix for #1758, redo of [1421]

L2_GameServer_It/java/net/sf/l2j/gameserver/clientpackets/RequestBuyItem.java

@@ -91,7 +91,7 @@ public final class RequestBuyItem extends L2GameClientPacket
 
         L2Object target = player.getTarget();
         if (!player.isGM() && (target == null								// No target (ie GM Shop)
-        		|| !(target instanceof L2MerchantInstance || target instanceof L2FishermanInstance || target instanceof L2MercManagerInstance || target instanceof L2ClanHallManagerInstance)|| target instanceof L2CastleChamberlainInstance	// Target not a merchant, fisherman or mercmanager
+        		|| !(target instanceof L2MerchantInstance || target instanceof L2FishermanInstance || target instanceof L2MercManagerInstance || target instanceof L2ClanHallManagerInstance || target instanceof L2CastleChamberlainInstance)	// Target not a merchant, fisherman or mercmanager
 			    || !player.isInsideRadius(target, L2NpcInstance.INTERACTION_DISTANCE, false, false) 	// Distance is too far
 			        )) return;
 

L2_GameServer_It/java/net/sf/l2j/gameserver/model/actor/instance/L2ManorManagerInstance.java

@@ -57,7 +57,8 @@ public class L2ManorManagerInstance extends L2MerchantInstance {
     public void onAction(L2PcInstance player)
     {
         if (!canTarget(player)) return;
-
+        player.setLastFolkNPC(this);
+        
         // Check if the L2PcInstance already target the L2NpcInstance
         if (this != player.getTarget())
         {