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

Code style changes.

Browse Source
This commit is contained in:
MobiusDev
2016-04-26 19:21:19 +00:00
parent 6a13705766
commit fc070c9238
768 changed files with 3338 additions and 4252 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
trunk/java/com/l2jmobius/gameserver/model/items/L2Item.java
View File

@ -313,7 +313,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
}
}
_common = ((_itemId >= 11605) && (_itemId <= 12361));
_common = (_itemId >= 11605) && (_itemId <= 12361);
_heroItem = ((_itemId >= 6611) && (_itemId <= 6621)) || ((_itemId >= 9388) && (_itemId <= 9390)) || (_itemId == 6842);
_pvpItem = ((_itemId >= 10667) && (_itemId <= 10835)) || ((_itemId >= 12852) && (_itemId <= 12977)) || ((_itemId >= 14363) && (_itemId <= 14525)) || (_itemId == 14528) || (_itemId == 14529) || (_itemId == 14558) || ((_itemId >= 15913) && (_itemId <= 16024)) || ((_itemId >= 16134) && (_itemId <= 16147)) || (_itemId == 16149) || (_itemId == 16151) || (_itemId == 16153) || (_itemId == 16155) || (_itemId == 16157) || (_itemId == 16159) || ((_itemId >= 16168) && (_itemId <= 16176)) || ((_itemId >= 16179) && (_itemId <= 16220));
}
@ -729,17 +729,17 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
public boolean isPotion()
{
return (getItemType() == EtcItemType.POTION);
return getItemType() == EtcItemType.POTION;
}
public boolean isElixir()
{
return (getItemType() == EtcItemType.ELIXIR);
return getItemType() == EtcItemType.ELIXIR;
}
public boolean isScroll()
{
return (getItemType() == EtcItemType.SCROLL);
return getItemType() == EtcItemType.SCROLL;
}
/**
@ -870,7 +870,7 @@ public abstract class L2Item extends ListenersContainer implements IIdentifiable
}
// Don't allow hero equipment and restricted items during Olympiad
if ((isOlyRestrictedItem() || isHeroItem()) && ((activeChar instanceof L2PcInstance) && activeChar.getActingPlayer().isInOlympiadMode()))
if ((isOlyRestrictedItem() || isHeroItem()) && (activeChar instanceof L2PcInstance) && activeChar.getActingPlayer().isInOlympiadMode())
{
if (isEquipable())
{

6
trunk/java/com/l2jmobius/gameserver/model/items/L2WarehouseItem.java
View File

@ -202,7 +202,7 @@ public class L2WarehouseItem
*/
public final boolean isWeapon()
{
return (_item instanceof L2Weapon);
return _item instanceof L2Weapon;
}
/**
@ -210,7 +210,7 @@ public class L2WarehouseItem
*/
public final boolean isArmor()
{
return (_item instanceof L2Armor);
return _item instanceof L2Armor;
}
/**
@ -218,7 +218,7 @@ public class L2WarehouseItem
*/
public final boolean isEtcItem()
{
return (_item instanceof L2EtcItem);
return _item instanceof L2EtcItem;
}
/**

2
trunk/java/com/l2jmobius/gameserver/model/items/L2Weapon.java
View File

@ -331,7 +331,7 @@ public final class L2Weapon extends L2Item
*/
public void castOnCriticalSkill(L2Character caster, L2Character target)
{
if ((_skillsOnCrit == null))
if (_skillsOnCrit == null)
{
return;
}

6
trunk/java/com/l2jmobius/gameserver/model/items/enchant/EnchantScroll.java
View File

@ -54,7 +54,7 @@ public final class EnchantScroll extends AbstractEnchantItem
_isBlessed = (type == EtcItemType.BLESS_SCRL_ENCHANT_AM) || (type == EtcItemType.BLESS_SCRL_ENCHANT_WP);
_isSafe = (type == EtcItemType.ANCIENT_CRYSTAL_ENCHANT_AM) || (type == EtcItemType.ANCIENT_CRYSTAL_ENCHANT_WP);
_isGiant = (type == EtcItemType.GIANT_SCRL_ENCHANT_AM) || (type == EtcItemType.GIANT_SCRL_ENCHANT_WP);
_isHair = (type == EtcItemType.SCRL_ENCHANT_HR);
_isHair = type == EtcItemType.SCRL_ENCHANT_HR;
}
@Override
@ -133,7 +133,7 @@ public final class EnchantScroll extends AbstractEnchantItem
_log.info("bodypart: " + itemToEnchant.getItem().getBodyPart());
return false;
}
else if ((supportItem != null))
else if (supportItem != null)
{
if (isBlessed() && (supportItem.getItem().getItemType() != EtcItemType.BLESS_SCRL_INC_ENCHANT_PROP_WP) && (supportItem.getItem().getItemType() != EtcItemType.BLESS_SCRL_INC_ENCHANT_PROP_AM) && (supportItem.getItem().getItemType() != EtcItemType.BLESS_DROP_SCRL_INC_ENCHANT_PROP_WP) && (supportItem.getItem().getItemType() != EtcItemType.BLESS_DROP_SCRL_INC_ENCHANT_PROP_AM))
{
@ -205,7 +205,7 @@ public final class EnchantScroll extends AbstractEnchantItem
final double finalChance = Math.min(chance + bonusRate + supportBonusRate, 100);
final double random = 100 * Rnd.nextDouble();
final boolean success = (random < finalChance);
final boolean success = random < finalChance;
if (player.isDebug())
{

32
trunk/java/com/l2jmobius/gameserver/model/items/instance/L2ItemInstance.java
View File

@ -330,13 +330,13 @@ public final class L2ItemInstance extends L2Object
String referenceName = "no-reference";
if (reference instanceof L2Object)
{
referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
referenceName = ((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name";
}
else if (reference instanceof String)
{
referenceName = (String) reference;
}
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
if (Config.GMAUDIT)
{
GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " name: " + getName() + ")", targetName, "L2Object referencing this action is: " + referenceName);
@ -492,13 +492,13 @@ public final class L2ItemInstance extends L2Object
String referenceName = "no-reference";
if (reference instanceof L2Object)
{
referenceName = (((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name");
referenceName = ((L2Object) reference).getName() != null ? ((L2Object) reference).getName() : "no-name";
}
else if (reference instanceof String)
{
referenceName = (String) reference;
}
final String targetName = (creator.getTarget() != null ? creator.getTarget().getName() : "no-target");
final String targetName = creator.getTarget() != null ? creator.getTarget().getName() : "no-target";
if (Config.GMAUDIT)
{
GMAudit.auditGMAction(creator.getName() + " [" + creator.getObjectId() + "]", process + "(id: " + getId() + " objId: " + getObjectId() + " name: " + getName() + " count: " + count + ")", targetName, "L2Object referencing this action is: " + referenceName);
@ -527,7 +527,7 @@ public final class L2ItemInstance extends L2Object
*/
public boolean isEquipable()
{
return !((_item.getBodyPart() == 0) || (_item.getItemType() == EtcItemType.ARROW) || (_item.getItemType() == EtcItemType.BOLT) || (_item.getItemType() == EtcItemType.LURE));
return (_item.getBodyPart() != 0) && (_item.getItemType() != EtcItemType.ARROW) && (_item.getItemType() != EtcItemType.BOLT) && (_item.getItemType() != EtcItemType.LURE);
}
/**
@ -619,7 +619,7 @@ public final class L2ItemInstance extends L2Object
*/
public boolean isEtcItem()
{
return (_item instanceof L2EtcItem);
return _item instanceof L2EtcItem;
}
/**
@ -627,7 +627,7 @@ public final class L2ItemInstance extends L2Object
*/
public boolean isWeapon()
{
return (_item instanceof L2Weapon);
return _item instanceof L2Weapon;
}
/**
@ -635,7 +635,7 @@ public final class L2ItemInstance extends L2Object
*/
public boolean isArmor()
{
return (_item instanceof L2Armor);
return _item instanceof L2Armor;
}
/**
@ -1247,7 +1247,7 @@ public final class L2ItemInstance extends L2Object
*/
public boolean isShadowItem()
{
return (_mana >= 0);
return _mana >= 0;
}
/**
@ -1422,7 +1422,7 @@ public final class L2ItemInstance extends L2Object
*/
public void updateDatabase()
{
this.updateDatabase(false);
updateDatabase(false);
}
/**
@ -1788,7 +1788,7 @@ public final class L2ItemInstance extends L2Object
public boolean isNightLure()
{
return (((_itemId >= 8505) && (_itemId <= 8513)) || (_itemId == 8485));
return ((_itemId >= 8505) && (_itemId <= 8513)) || (_itemId == 8485);
}
public void setCountDecrease(boolean decrease)
@ -1821,7 +1821,7 @@ public final class L2ItemInstance extends L2Object
public boolean isTimeLimitedItem()
{
return (_time > 0);
return _time > 0;
}
/**
@ -2349,7 +2349,7 @@ public final class L2ItemInstance extends L2Object
public void addCommonSoulCrystalOption(SoulCrystalOption option)
{
if ((isEquipped()) && (_commonSoulCrystalOptions[option.getSlot() - 1] != null) && (getActingPlayer() != null))
if (isEquipped() && (_commonSoulCrystalOptions[option.getSlot() - 1] != null) && (getActingPlayer() != null))
{
getActingPlayer().removeSkill(_commonSoulCrystalOptions[option.getSlot() - 1].getSkill(), true);
}
@ -2358,7 +2358,7 @@ public final class L2ItemInstance extends L2Object
public void setSpecialSoulCrystalOption(SoulCrystalOption special)
{
if ((isEquipped()) && (_specialSoulCrystalOption != null) && (getActingPlayer() != null))
if (isEquipped() && (_specialSoulCrystalOption != null) && (getActingPlayer() != null))
{
getActingPlayer().removeSkill(_specialSoulCrystalOption.getSkill(), true);
}
@ -2450,7 +2450,7 @@ public final class L2ItemInstance extends L2Object
public void applySoulCrystalOptionEffect()
{
final L2PcInstance owner = getActingPlayer();
if ((owner == null) || (!isEquipped()))
if ((owner == null) || !isEquipped())
{
return;
}
@ -2474,7 +2474,7 @@ public final class L2ItemInstance extends L2Object
public void removeSoulCrystalOptionEffect()
{
final L2PcInstance owner = getActingPlayer();
if ((owner == null) || (isEquipped()))
if ((owner == null) || isEquipped())
{
return;
}

2
trunk/java/com/l2jmobius/gameserver/model/items/type/ItemType.java
View File

@ -22,5 +22,5 @@ package com.l2jmobius.gameserver.model.items.type;
*/
public interface ItemType
{
public int mask();
int mask();
}