2
0
Эх сурвалжийг харах

BETA: CORE-Part for [DP9120].

MELERIX 12 жил өмнө
parent
commit
a74610a808

+ 3 - 2
L2J_Server_BETA/java/com/l2jserver/gameserver/model/itemauction/AuctionItem.java

@@ -48,7 +48,9 @@ public final class AuctionItem
 	{
 		final L2Item item = ItemTable.getInstance().getTemplate(_itemId);
 		if (item == null)
+		{
 			return false;
+		}
 		return true;
 	}
 	
@@ -81,8 +83,7 @@ public final class AuctionItem
 	{
 		final L2ItemInstance item = ItemTable.getInstance().createItem("ItemAuction", _itemId, _itemCount, null, null);
 		
-		final int enchantLevel = _itemExtra.getInteger("enchant_level", 0);
-		item.setEnchantLevel(enchantLevel);
+		item.setEnchantLevel(item.getDefaultEnchantLevel());
 		
 		final int augmentationId = _itemExtra.getInteger("augmentation_id", 0);
 		if (augmentationId != 0)

+ 7 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/L2Item.java

@@ -193,6 +193,7 @@ public abstract class L2Item
 	private final boolean _heroItem;
 	private final boolean _pvpItem;
 	private final boolean _ex_immediate_effect;
+	private final int _defaultEnchantLevel;
 	private final L2ActionType _defaultAction;
 	
 	protected int _type1; // needed for item list (inventory)
@@ -250,6 +251,7 @@ public abstract class L2Item
 		//used for custom type select
 		_defaultAction = set.getEnum("default_action", L2ActionType.class, L2ActionType.none);
 		_useSkillDisTime = set.getInteger("useSkillDisTime", 0);
+		_defaultEnchantLevel = set.getInteger("enchanted", 0);
 		_reuseDelay = set.getInteger("reuse_delay", 0);
 		_sharedReuseGroup = set.getInteger("shared_reuse_group", 0);
 		
@@ -1051,6 +1053,11 @@ public abstract class L2Item
 		return _questEvents;
 	}
 	
+	public int getDefaultEnchantLevel()
+	{
+		return _defaultEnchantLevel;
+	}
+	
 	public boolean isPetItem()
 	{
 		return getItemType() == L2EtcItemType.PET_COLLAR;

+ 5 - 0
L2J_Server_BETA/java/com/l2jserver/gameserver/model/items/instance/L2ItemInstance.java

@@ -1975,6 +1975,11 @@ public final class L2ItemInstance extends L2Object
 		return enchant;
 	}
 	
+	public int getDefaultEnchantLevel()
+	{
+		return _item.getDefaultEnchantLevel();
+	}
+	
 	public boolean hasPassiveSkills()
 	{
 		return getItemType() == L2EtcItemType.RUNE && getLocation() == ItemLocation.INVENTORY && getOwnerId() > 0 && getItem().hasSkills();