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

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionListener.java
View File

@@ -29,5 +29,5 @@ public interface ConditionListener
/**
* Notify changed.
*/
public void notifyChanged();
void notifyChanged();
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveEffectId.java
View File

@@ -54,6 +54,6 @@ public class ConditionPlayerActiveEffectId extends Condition
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
final BuffInfo info = effector.getEffectList().getBuffInfoBySkillId(_effectId);
return ((info != null) && ((_effectLvl == -1) || (_effectLvl <= info.getSkill().getLevel())));
return (info != null) && ((_effectLvl == -1) || (_effectLvl <= info.getSkill().getLevel()));
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCallPc.java
View File

@@ -65,6 +65,6 @@ public class ConditionPlayerCallPc extends Condition
player.sendPacket(SystemMessageId.YOU_CANNOT_USE_SUMMONING_OR_TELEPORTING_IN_THIS_AREA);
canCallPlayer = false;
}
return (_val == canCallPlayer);
return _val == canCallPlayer;
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateBase.java
View File

@@ -96,6 +96,6 @@ public class ConditionPlayerCanCreateBase extends Condition
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_UP_A_BASE_HERE);
canCreateBase = false;
}
return (_val == canCreateBase);
return _val == canCreateBase;
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanCreateOutpost.java
View File

@@ -77,6 +77,6 @@ public class ConditionPlayerCanCreateOutpost extends Condition
player.sendPacket(SystemMessageId.YOU_CANNOT_SET_UP_A_BASE_HERE);
canCreateOutpost = false;
}
return (_val == canCreateOutpost);
return _val == canCreateOutpost;
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanEscape.java
View File

@@ -74,6 +74,6 @@ public class ConditionPlayerCanEscape extends Condition
{
canTeleport = false;
}
return (_val == canTeleport);
return _val == canTeleport;
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanResurrect.java
View File

@@ -112,6 +112,6 @@ public class ConditionPlayerCanResurrect extends Condition
}
}
}
return (_val == canResurrect);
return _val == canResurrect;
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonPet.java
View File

@@ -62,6 +62,6 @@ public class ConditionPlayerCanSummonPet extends Condition
{
canSummon = false;
}
return (_val == canSummon);
return _val == canSummon;
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSummonSiegeGolem.java
View File

@@ -71,6 +71,6 @@ public class ConditionPlayerCanSummonSiegeGolem extends Condition
player.sendPacket(SystemMessageId.INVALID_TARGET);
canSummonSiegeGolem = false;
}
return (_val == canSummonSiegeGolem);
return _val == canSummonSiegeGolem;
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanSweep.java
View File

@@ -82,6 +82,6 @@ public class ConditionPlayerCanSweep extends Condition
}
}
}
return (_val == canSweep);
return _val == canSweep;
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTakeFort.java
View File

@@ -68,6 +68,6 @@ public class ConditionPlayerCanTakeFort extends Condition
player.sendPacket(SystemMessageId.THE_DISTANCE_IS_TOO_FAR_AND_SO_THE_CASTING_HAS_BEEN_STOPPED);
canTakeFort = false;
}
return (_val == canTakeFort);
return _val == canTakeFort;
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanTransform.java
View File

@@ -64,6 +64,6 @@ public class ConditionPlayerCanTransform extends Condition
player.sendPacket(SystemMessageId.YOU_CANNOT_TRANSFORM_WHILE_RIDING_A_PET);
canTransform = false;
}
return (_val == canTransform);
return _val == canTransform;
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCanUntransform.java
View File

@@ -54,6 +54,6 @@ public class ConditionPlayerCanUntransform extends Condition
player.sendPacket(SystemMessageId.YOU_ARE_TOO_HIGH_TO_PERFORM_THIS_ACTION_PLEASE_LOWER_YOUR_ALTITUDE_AND_TRY_AGAIN); // TODO: check if message is retail like.
canUntransform = false;
}
return (_val == canUntransform);
return _val == canUntransform;
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerCheckAbnormal.java
View File

@@ -56,6 +56,6 @@ public class ConditionPlayerCheckAbnormal extends Condition
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
final BuffInfo info = effector.getEffectList().getBuffInfoByAbnormalType(_type);
return ((info != null) && ((_level == -1) || (_level >= info.getSkill().getAbnormalLvl())));
return (info != null) && ((_level == -1) || (_level >= info.getSkill().getAbnormalLvl()));
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerClassIdRestriction.java
View File

@@ -41,6 +41,6 @@ public class ConditionPlayerClassIdRestriction extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
return (effector.getActingPlayer() != null) && (_classIds.contains(effector.getActingPlayer().getClassId().getId()));
return (effector.getActingPlayer() != null) && _classIds.contains(effector.getActingPlayer().getClassId().getId());
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerHasClanHall.java
View File

@@ -55,7 +55,7 @@ public final class ConditionPlayerHasClanHall extends Condition
final L2Clan clan = effector.getActingPlayer().getClan();
if (clan == null)
{
return ((_clanHall.size() == 1) && (_clanHall.get(0) == 0));
return (_clanHall.size() == 1) && (_clanHall.get(0) == 0);
}
// All Clan Hall

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerHasServitor.java
View File

@@ -30,7 +30,7 @@ public class ConditionPlayerHasServitor extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if ((effector.getActingPlayer() == null))
if (effector.getActingPlayer() == null)
{
return false;
}

6
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerInvSize.java
View File

@@ -40,10 +40,6 @@ public class ConditionPlayerInvSize extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if (effector.getActingPlayer() != null)
{
return effector.getActingPlayer().getInventory().getSize(false) <= (effector.getActingPlayer().getInventoryLimit() - _size);
}
return true;
return (effector.getActingPlayer() == null) || (effector.getActingPlayer().getInventory().getSize(false) <= (effector.getActingPlayer().getInventoryLimit() - _size));
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerLevelRange.java
View File

@@ -40,6 +40,6 @@ public class ConditionPlayerLevelRange extends Condition
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
final int level = effector.getLevel();
return ((level >= _levels[0]) && (level <= _levels[1]));
return (level >= _levels[0]) && (level <= _levels[1]);
}
}

6
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerPledgeClass.java
View File

@@ -44,10 +44,6 @@ public final class ConditionPlayerPledgeClass extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if ((effector.getActingPlayer() == null) || (effector.getActingPlayer().getClan() == null))
{
return false;
}
return (_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass);
return (effector.getActingPlayer() != null) && (effector.getActingPlayer().getClan() != null) && ((_pledgeClass == -1) ? effector.getActingPlayer().isClanLeader() : (effector.getActingPlayer().getPledgeClass() >= _pledgeClass));
}
}

6
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerState.java
View File

@@ -67,15 +67,15 @@ public class ConditionPlayerState extends Condition
}
case FLYING:
{
return (character.isFlying() == _required);
return character.isFlying() == _required;
}
case BEHIND:
{
return (character.isBehindTarget() == _required);
return character.isBehindTarget() == _required;
}
case FRONT:
{
return (character.isInFrontOfTarget() == _required);
return character.isInFrontOfTarget() == _required;
}
case CHAOTIC:
{

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerWeight.java
View File

@@ -44,7 +44,7 @@ public class ConditionPlayerWeight extends Condition
final L2PcInstance player = effector.getActingPlayer();
if ((player != null) && (player.getMaxLoad() > 0))
{
final int weightproc = (((player.getCurrentLoad() - player.getBonusWeightPenalty()) * 100) / player.getMaxLoad());
final int weightproc = ((player.getCurrentLoad() - player.getBonusWeightPenalty()) * 100) / player.getMaxLoad();
return (weightproc < _weight) || player.getDietMode();
}
return true;

4
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionSiegeZone.java
View File

@@ -88,7 +88,7 @@ public final class ConditionSiegeZone extends Condition
final L2PcInstance player = (L2PcInstance) activeChar;
if (((castle == null) || (castle.getResidenceId() <= 0)))
if ((castle == null) || (castle.getResidenceId() <= 0))
{
if ((value & COND_NOT_ZONE) != 0)
{
@@ -134,7 +134,7 @@ public final class ConditionSiegeZone extends Condition
final L2PcInstance player = (L2PcInstance) activeChar;
if (((fort == null) || (fort.getResidenceId() <= 0)))
if ((fort == null) || (fort.getResidenceId() <= 0))
{
if ((value & COND_NOT_ZONE) != 0)
{

6
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionSlotItemId.java
View File

@@ -52,10 +52,10 @@ public final class ConditionSlotItemId extends ConditionInventory
}
final L2ItemInstance itemSlot = effector.getInventory().getPaperdollItem(_slot);
if (itemSlot == null)
if (itemSlot != null)
{
return _itemId == 0;
return (itemSlot.getId() == _itemId) && (itemSlot.getEnchantLevel() >= _enchantLevel);
}
return (itemSlot.getId() == _itemId) && (itemSlot.getEnchantLevel() >= _enchantLevel);
return _itemId == 0;
}
}

6
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetAggro.java
View File

@@ -46,10 +46,6 @@ public class ConditionTargetAggro extends Condition
{
return ((L2MonsterInstance) effected).isAggressive() == _isAggro;
}
if (effected instanceof L2PcInstance)
{
return ((L2PcInstance) effected).getReputation() < 0;
}
return false;
return (effected instanceof L2PcInstance) && (((L2PcInstance) effected).getReputation() < 0);
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetClassIdRestriction.java
View File

@@ -41,6 +41,6 @@ public class ConditionTargetClassIdRestriction extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
return effected.isPlayer() && _classIds.contains((effected.getActingPlayer()).getClassId().getId());
return effected.isPlayer() && _classIds.contains(effected.getActingPlayer().getClassId().getId());
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetLevelRange.java
View File

@@ -44,6 +44,6 @@ public class ConditionTargetLevelRange extends Condition
return false;
}
final int level = effected.getLevel();
return ((level >= _levels[0]) && (level <= _levels[1]));
return (level >= _levels[0]) && (level <= _levels[1]);
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetMyPartyExceptMe.java
View File

@@ -57,6 +57,6 @@ public class ConditionTargetMyPartyExceptMe extends Condition
player.sendPacket(sm);
isPartyMember = false;
}
return (_val == isPartyMember);
return _val == isPartyMember;
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetNone.java
View File

@@ -37,6 +37,6 @@ public class ConditionTargetNone extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
return (effected == null);
return effected == null;
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetPlayable.java
View File

@@ -29,6 +29,6 @@ public class ConditionTargetPlayable extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
return (effected instanceof L2Playable);
return effected instanceof L2Playable;
}
}

2
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetWeight.java
View File

@@ -46,7 +46,7 @@ public class ConditionTargetWeight extends Condition
final L2PcInstance target = effected.getActingPlayer();
if (!target.getDietMode() && (target.getMaxLoad() > 0))
{
return ((((target.getCurrentLoad() - target.getBonusWeightPenalty()) * 100) / target.getMaxLoad()) < _weight);
return (((target.getCurrentLoad() - target.getBonusWeightPenalty()) * 100) / target.getMaxLoad()) < _weight;
}
}
return false;