lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed enchant_enabled values to boolean.

Browse Source
This commit is contained in:
MobiusDevelopment
2020-12-03 19:25:39 +00:00
parent 6130ef32b9
commit 1534972501
3379 changed files with 141979 additions and 142087 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/Item.java
View File

@@ -139,7 +139,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
private boolean _destroyable;
private boolean _tradeable;
private boolean _depositable;
private int _enchantable;
private boolean _enchantable;
private int _enchantLimit;
private boolean _elementable;
private boolean _questItem;
@@ -214,7 +214,7 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
}
_elementable = set.getBoolean("element_enabled", false);
_enchantable = set.getInt("enchant_enabled", 0);
_enchantable = set.getBoolean("enchant_enabled", false);
_enchantLimit = set.getInt("enchant_limit", 0);
_freightable = set.getBoolean("is_freightable", false);
_allowSelfResurrection = set.getBoolean("allow_self_resurrection", false);
@@ -613,9 +613,9 @@ public abstract class Item extends ListenersContainer implements IIdentifiable
* This method also check the enchant blacklist.
* @return {@code true} if the item can be enchanted, {@code false} otherwise.
*/
public int isEnchantable()
public boolean isEnchantable()
{
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : 0;
return Arrays.binarySearch(Config.ENCHANT_BLACKLIST, _itemId) < 0 ? _enchantable : false;
}
/**

2
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/enchant/AbstractEnchantItem.java
View File

@@ -142,7 +142,7 @@ public abstract class AbstractEnchantItem
{
return false;
}
else if ((itemToEnchant.isEnchantable() == 0) || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit())))
else if (!itemToEnchant.isEnchantable() || (!(itemToEnchant.getItem().getEnchantLimit() == 0) && (itemToEnchant.getEnchantLevel() == itemToEnchant.getItem().getEnchantLimit())))
{
return false;
}

4
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/items/instance/ItemInstance.java
View File

@@ -540,13 +540,13 @@ public class ItemInstance extends WorldObject
* Return true if item can be enchanted
* @return boolean
*/
public int isEnchantable()
public boolean isEnchantable()
{
if ((_loc == ItemLocation.INVENTORY) || (_loc == ItemLocation.PAPERDOLL))
{
return _item.isEnchantable();
}
return 0;
return false;
}
/**

2
L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/clientpackets/RequestEnchantItem.java
View File

@@ -158,7 +158,7 @@ public class RequestEnchantItem implements IClientIncomingPacket
synchronized (item)
{
// last validation check
if ((item.getOwnerId() != player.getObjectId()) || (item.isEnchantable() == 0))
if ((item.getOwnerId() != player.getObjectId()) || !item.isEnchantable())
{
client.sendPacket(SystemMessageId.INAPPROPRIATE_ENCHANT_CONDITIONS);
player.removeRequest(request.getClass());