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

14
trunk/java/com/l2jmobius/gameserver/model/L2ArmorSet.java
View File

@@ -292,12 +292,7 @@ public final class L2ArmorSet
public boolean containShield(int shield_id)
{
if (_shield.isEmpty())
{
return false;
}
return _shield.contains(Integer.valueOf(shield_id));
return !_shield.isEmpty() && _shield.contains(Integer.valueOf(shield_id));
}
public List<SkillHolder> getShieldSkills()
@@ -334,12 +329,9 @@ public final class L2ArmorSet
for (int armorSlot : ARMORSET_SLOTS)
{
final L2ItemInstance itemPart = inv.getPaperdollItem(armorSlot);
if (itemPart != null)
if ((itemPart != null) && (enchantLevel > itemPart.getEnchantLevel()))
{
if (enchantLevel > itemPart.getEnchantLevel())
{
enchantLevel = itemPart.getEnchantLevel();
}
enchantLevel = itemPart.getEnchantLevel();
}
}
if (enchantLevel == Byte.MAX_VALUE)