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

Code improvements.

Browse Source
This commit is contained in:
MobiusDev
2016-04-24 16:30:15 +00:00
parent 8bd51aba1c
commit 2dd14bef9b
860 changed files with 8865 additions and 17041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/java/com/l2jmobius/gameserver/model/multisell/Ingredient.java
View File

@ -136,12 +136,12 @@ public class Ingredient
public final boolean isStackable()
{
return _template == null ? true : _template.isStackable();
return (_template == null) || _template.isStackable();
}
public final boolean isArmorOrWeapon()
{
return _template == null ? false : (_template instanceof L2Armor) || (_template instanceof L2Weapon);
return (_template != null) && ((_template instanceof L2Armor) || (_template instanceof L2Weapon));
}
public final int getWeight()

5
trunk/java/com/l2jmobius/gameserver/model/multisell/PreparedEntry.java
View File

@ -61,7 +61,7 @@ public class PreparedEntry extends Entry
// do not yet add this adena amount to the list as non-taxIngredient adena might be entered later (order not guaranteed)
continue;
}
else if (maintainEnchantment && (item != null) && ing.isArmorOrWeapon())
if (maintainEnchantment && (item != null) && ing.isArmorOrWeapon())
{
info = new ItemInfo(item);
final Ingredient newIngredient = ing.getCopy();
@ -70,8 +70,7 @@ public class PreparedEntry extends Entry
}
else
{
final Ingredient newIngredient = ing.getCopy();
_ingredients.add(newIngredient);
_ingredients.add(ing.getCopy());
}
}

2
trunk/java/com/l2jmobius/gameserver/model/multisell/PreparedListContainer.java
View File

@ -103,6 +103,6 @@ public class PreparedListContainer extends ListContainer
public final boolean checkNpcObjectId(int npcObjectId)
{
return _npcObjectId != 0 ? _npcObjectId == npcObjectId : true;
return (_npcObjectId == 0) || (_npcObjectId == npcObjectId);
}
}