Pārlūkot izejas kodu

Common Items cannot be enchanted - tnx Censor

nBd 16 gadi atpakaļ
vecāks
revīzija
0a80658463

+ 5 - 0
L2_GameServer/java/net/sf/l2j/gameserver/model/L2ItemInstance.java

@@ -607,6 +607,11 @@ public final class L2ItemInstance extends L2Object
     {
         return ((_itemId >= 6611 && _itemId <= 6621) || (_itemId >= 9388 && _itemId <= 9390) || _itemId == 6842);
     }
+
+    public boolean isCommonItem()
+    {
+        return ((_itemId >= 12006 && _itemId <= 12361) || (_itemId >= 11605 && _itemId <= 12308));
+    }
     
     public boolean isOlyRestrictedItem()
     {

+ 6 - 0
L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/RequestConfirmRefinerItem.java

@@ -69,6 +69,12 @@ public class RequestConfirmRefinerItem extends L2GameClientPacket
 			activeChar.sendPacket(new SystemMessage(SystemMessageId.THIS_IS_NOT_A_SUITABLE_ITEM));
 			return;
 		}
+		// check if target is common item
+		if (targetItem.isCommonItem())
+		{
+			activeChar.sendPacket(new SystemMessage(SystemMessageId.THIS_IS_NOT_A_SUITABLE_ITEM));
+			return;
+		}
 
 		int gemstoneCount=0;
 		int gemstoneItemId=0;

+ 2 - 2
L2_GameServer/java/net/sf/l2j/gameserver/network/clientpackets/RequestEnchantItem.java

@@ -77,8 +77,8 @@ public final class RequestEnchantItem extends L2GameClientPacket
 			return;
 		}
 		
-		// can't enchant rods, hero weapons, adventurers' and shadow items
-		if (item.getItem().getItemType() == L2WeaponType.ROD || item.isHeroItem() || item.getItemId() >= 7816 && item.getItemId() <= 7831 || item.isShadowItem())
+		// can't enchant rods, hero weapons, adventurers' items,shadow and common items
+		if (item.getItem().getItemType() == L2WeaponType.ROD || item.isHeroItem() || item.getItemId() >= 7816 && item.getItemId() <= 7831 || item.isShadowItem() || item.isCommonItem())
 		{
 			activeChar.sendPacket(new SystemMessage(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITION));
 			activeChar.setActiveEnchantItem(null);