BETA: Fixing minor typo causing buy lists used from L2MerchantSummonInstance to sell items with x51 price instead of x1.5

    * Removing code duplicates after [6149]
    * L2Crest now implements IIdentifiable interface

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

@@ -20,6 +20,7 @@ package com.l2jserver.gameserver.model;
 
 import com.l2jserver.Config;
 import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
+import com.l2jserver.gameserver.model.interfaces.IIdentifiable;
 import com.l2jserver.gameserver.network.serverpackets.AllyCrest;
 import com.l2jserver.gameserver.network.serverpackets.ExPledgeCrestLarge;
 import com.l2jserver.gameserver.network.serverpackets.PledgeCrest;
@@ -27,7 +28,7 @@ import com.l2jserver.gameserver.network.serverpackets.PledgeCrest;
 /**
  * @author Nos
  */
-public final class L2Crest
+public final class L2Crest implements IIdentifiable
 {
 	public enum CrestType
 	{
@@ -71,6 +72,7 @@ public final class L2Crest
 		_type = type;
 	}
 	
+	@Override
 	public int getId()
 	{
 		return _id;

L2J_Server_BETA/java/com/l2jserver/gameserver/model/actor/instance/L2MerchantSummonInstance.java

@@ -224,7 +224,7 @@ public class L2MerchantSummonInstance extends L2ServitorInstance
 			return;
 		}
 		
-		double taxRate = 50;
+		double taxRate = 0.50;
 		
 		player.setInventoryBlockingStatus(true);
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestBuyItem.java

@@ -140,24 +140,20 @@ public final class RequestBuyItem extends L2GameClientPacket
 		
 		if (merchant != null)
 		{
+			if (!buyList.isNpcAllowed(merchant.getId()))
+			{
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
+			}
+			
 			if (merchant instanceof L2MerchantInstance)
 			{
-				if (!buyList.isNpcAllowed(merchant.getId()))
-				{
-					sendPacket(ActionFailed.STATIC_PACKET);
-					return;
-				}
 				castleTaxRate = ((L2MerchantInstance) merchant).getMpc().getCastleTaxRate();
 				baseTaxRate = ((L2MerchantInstance) merchant).getMpc().getBaseTaxRate();
 			}
 			else
 			{
-				if (!buyList.isNpcAllowed(merchant.getId()))
-				{
-					sendPacket(ActionFailed.STATIC_PACKET);
-					return;
-				}
-				baseTaxRate = 50;
+				baseTaxRate = 0.5;
 			}
 		}
 		

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestRefundItem.java

@@ -124,21 +124,10 @@ public final class RequestRefundItem extends L2GameClientPacket
 			return;
 		}
 		
-		if (merchant instanceof L2MerchantInstance)
+		if (!buyList.isNpcAllowed(merchant.getId()))
 		{
-			if (!buyList.isNpcAllowed(merchant.getId()))
-			{
-				sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
-		}
-		else
-		{
-			if (!buyList.isNpcAllowed(merchant.getId()))
-			{
-				sendPacket(ActionFailed.STATIC_PACKET);
-				return;
-			}
+			sendPacket(ActionFailed.STATIC_PACKET);
+			return;
 		}
 		
 		long weight = 0;

L2J_Server_BETA/java/com/l2jserver/gameserver/network/clientpackets/RequestSellItem.java

@@ -146,21 +146,10 @@ public final class RequestSellItem extends L2GameClientPacket
 		
 		if (merchant != null)
 		{
-			if (merchant instanceof L2MerchantInstance)
+			if (!buyList.isNpcAllowed(merchant.getId()))
 			{
-				if (!buyList.isNpcAllowed(merchant.getId()))
-				{
-					sendPacket(ActionFailed.STATIC_PACKET);
-					return;
-				}
-			}
-			else
-			{
-				if (!buyList.isNpcAllowed(merchant.getId()))
-				{
-					sendPacket(ActionFailed.STATIC_PACKET);
-					return;
-				}
+				sendPacket(ActionFailed.STATIC_PACKET);
+				return;
 			}
 		}