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

12
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionChangeWeapon.java
View File

@@ -53,17 +53,7 @@ public class ConditionChangeWeapon extends Condition
if (_required)
{
final L2Weapon weaponItem = effector.getActiveWeaponItem();
if (weaponItem == null)
{
return false;
}
if (weaponItem.getChangeWeaponId() == 0)
{
return false;
}
if (effector.getActingPlayer().hasItemRequest())
if ((weaponItem == null) || (weaponItem.getChangeWeaponId() == 0) || effector.getActingPlayer().hasItemRequest())
{
return false;
}

9
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionLogicNot.java
View File

@@ -44,14 +44,7 @@ public class ConditionLogicNot extends Condition
@Override
void setListener(ConditionListener listener)
{
if (listener != null)
{
_condition.setListener(this);
}
else
{
_condition.setListener(null);
}
_condition.setListener(listener != null ? this : null);
super.setListener(listener);
}

10
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerActiveSkillId.java
View File

@@ -55,15 +55,9 @@ public class ConditionPlayerActiveSkillId extends Condition
{
for (Skill sk : effector.getAllSkills())
{
if (sk != null)
if ((sk != null) && (sk.getId() == _skillId) && ((_skillLevel == -1) || (_skillLevel <= sk.getLevel())))
{
if (sk.getId() == _skillId)
{
if ((_skillLevel == -1) || (_skillLevel <= sk.getLevel()))
{
return true;
}
}
return true;
}
}
return false;

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

@@ -52,12 +52,7 @@ public class ConditionPlayerCanCreateBase extends Condition
}
final L2PcInstance player = effector.getActingPlayer();
boolean canCreateBase = true;
if (player.isAlikeDead() || player.isCursedWeaponEquipped() || (player.getClan() == null))
{
canCreateBase = false;
}
boolean canCreateBase = !player.isAlikeDead() && !player.isCursedWeaponEquipped() && (player.getClan() != null);
final Castle castle = CastleManager.getInstance().getCastle(player);
final Fort fort = FortManager.getInstance().getFort(player);
final SystemMessage sm;

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

@@ -49,12 +49,7 @@ public class ConditionPlayerCanCreateOutpost extends Condition
}
final L2PcInstance player = effector.getActingPlayer();
boolean canCreateOutpost = true;
if (player.isAlikeDead() || player.isCursedWeaponEquipped() || (player.getClan() == null))
{
canCreateOutpost = false;
}
boolean canCreateOutpost = !player.isAlikeDead() && !player.isCursedWeaponEquipped() && (player.getClan() != null);
final Castle castle = CastleManager.getInstance().getCastle(player);
final Fort fort = FortManager.getInstance().getFort(player);
if ((castle == null) && (fort == null))

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

@@ -48,12 +48,7 @@ public class ConditionPlayerCanSummonSiegeGolem extends Condition
}
final L2PcInstance player = effector.getActingPlayer();
boolean canSummonSiegeGolem = true;
if (player.isAlikeDead() || player.isCursedWeaponEquipped() || (player.getClan() == null))
{
canSummonSiegeGolem = false;
}
boolean canSummonSiegeGolem = !player.isAlikeDead() && !player.isCursedWeaponEquipped() && (player.getClan() != null);
final Castle castle = CastleManager.getInstance().getCastle(player);
final Fort fort = FortManager.getInstance().getFort(player);
if ((castle == null) && (fort == null))

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

@@ -48,12 +48,7 @@ public class ConditionPlayerCanTakeFort extends Condition
}
final L2PcInstance player = effector.getActingPlayer();
boolean canTakeFort = true;
if (player.isAlikeDead() || player.isCursedWeaponEquipped() || !player.isClanLeader())
{
canTakeFort = false;
}
boolean canTakeFort = !player.isAlikeDead() && !player.isCursedWeaponEquipped() && player.isClanLeader();
final Fort fort = FortManager.getInstance().getFort(player);
final SystemMessage sm;
if ((fort == null) || (fort.getResidenceId() <= 0) || !fort.getSiege().isInProgress() || (fort.getSiege().getAttackerClan(player.getClan()) == null))

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

@@ -40,6 +40,6 @@ public class ConditionPlayerFlyMounted extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
return (effector.getActingPlayer() != null) ? effector.getActingPlayer().isFlyingMounted() == _val : true;
return (effector.getActingPlayer() == null) || (effector.getActingPlayer().isFlyingMounted() == _val);
}
}

3
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerImmobile.java
View File

@@ -35,7 +35,6 @@ public class ConditionPlayerImmobile extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
final boolean isImmobile = !effector.isMovementDisabled();
return _val == isImmobile;
return _val == !effector.isMovementDisabled();
}
}

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

@@ -55,10 +55,6 @@ public class ConditionPlayerInstanceId extends Condition
}
final InstanceWorld world = InstanceManager.getInstance().getPlayerWorld(effector.getActingPlayer());
if ((world == null) || (world.getInstanceId() != instanceId))
{
return false; // player in the different instance
}
return _instanceIds.contains(world.getTemplateId());
return (world != null) && (world.getInstanceId() == instanceId) && _instanceIds.contains(world.getTemplateId());
}
}

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

@@ -39,10 +39,6 @@ public class ConditionPlayerIsClanLeader extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if (effector.getActingPlayer() == null)
{
return false;
}
return (effector.getActingPlayer().isClanLeader() == _val);
return (effector.getActingPlayer() != null) && (effector.getActingPlayer().isClanLeader() == _val);
}
}

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

@@ -39,10 +39,6 @@ public class ConditionPlayerIsHero extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if (effector.getActingPlayer() == null)
{
return false;
}
return (effector.getActingPlayer().isHero() == _val);
return (effector.getActingPlayer() != null) && (effector.getActingPlayer().isHero() == _val);
}
}

3
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerIsInCombat.java
View File

@@ -36,7 +36,6 @@ public class ConditionPlayerIsInCombat extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
final boolean isInCombat = !AttackStanceTaskManager.getInstance().hasAttackStanceTask(effector);
return _val == isInCombat;
return _val == !AttackStanceTaskManager.getInstance().hasAttackStanceTask(effector);
}
}

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

@@ -41,10 +41,6 @@ public class ConditionPlayerIsOnSide extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if ((effector == null) || !effector.isPlayer())
{
return false;
}
return effector.getActingPlayer().getPlayerSide() == _side;
return (effector != null) && effector.isPlayer() && (effector.getActingPlayer().getPlayerSide() == _side);
}
}

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

@@ -40,10 +40,6 @@ public class ConditionPlayerIsPvpFlagged extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if (effector.getActingPlayer() == null)
{
return false;
}
return ((effector.getActingPlayer().getPvpFlag() > 0) == _val);
return (effector.getActingPlayer() != null) && ((effector.getActingPlayer().getPvpFlag() > 0) == _val);
}
}

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

@@ -39,10 +39,6 @@ public class ConditionPlayerPkCount extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if (effector.getActingPlayer() == null)
{
return false;
}
return effector.getActingPlayer().getPkKills() <= _pk;
return (effector.getActingPlayer() != null) && (effector.getActingPlayer().getPkKills() <= _pk);
}
}

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

@@ -42,10 +42,6 @@ public class ConditionPlayerRace extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if ((effector == null) || !effector.isPlayer())
{
return false;
}
return Util.contains(_races, effector.getActingPlayer().getRace());
return (effector != null) && effector.isPlayer() && Util.contains(_races, effector.getActingPlayer().getRace());
}
}

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

@@ -40,10 +40,6 @@ public class ConditionPlayerSex extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if (effector.getActingPlayer() == null)
{
return false;
}
return (effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex;
return (effector.getActingPlayer() != null) && ((effector.getActingPlayer().getAppearance().getSex() ? 1 : 0) == _sex);
}
}

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

@@ -39,10 +39,6 @@ public class ConditionPlayerSiegeSide extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if (effector.getActingPlayer() == null)
{
return false;
}
return effector.getActingPlayer().getSiegeSide() == _siegeSide;
return (effector.getActingPlayer() != null) && (effector.getActingPlayer().getSiegeSide() == _siegeSide);
}
}

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

@@ -51,11 +51,7 @@ public class ConditionPlayerState extends Condition
{
case RESTING:
{
if (player != null)
{
return (player.isSitting() == _required);
}
return !_required;
return player != null ? player.isSitting() == _required : !_required;
}
case MOVING:
{
@@ -67,11 +63,7 @@ public class ConditionPlayerState extends Condition
}
case STANDING:
{
if (player != null)
{
return (_required != (player.isSitting() || player.isMoving()));
}
return (_required != character.isMoving());
return player != null ? _required != (player.isSitting() || player.isMoving()) : _required != character.isMoving();
}
case FLYING:
{
@@ -87,19 +79,11 @@ public class ConditionPlayerState extends Condition
}
case CHAOTIC:
{
if (player != null)
{
return ((player.getReputation() < 0) == _required);
}
return !_required;
return player != null ? (player.getReputation() < 0) == _required : !_required;
}
case OLYMPIAD:
{
if (player != null)
{
return (player.isInOlympiadMode() == _required);
}
return !_required;
return player != null ? player.isInOlympiadMode() == _required : !_required;
}
}
return !_required;

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

@@ -39,10 +39,6 @@ public class ConditionPlayerSubclass extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if (effector.getActingPlayer() == null)
{
return true;
}
return effector.getActingPlayer().isSubClassActive() == _val;
return (effector.getActingPlayer() == null) || (effector.getActingPlayer().isSubClassActive() == _val);
}
}

10
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionPlayerTransformationId.java
View File

@@ -43,14 +43,6 @@ public class ConditionPlayerTransformationId extends Condition
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
final L2PcInstance player = effector.getActingPlayer();
if (player == null)
{
return false;
}
if (_id == -1)
{
return player.isTransformed();
}
return player.getTransformationId() == _id;
return (player != null) && (_id == -1 ? player.isTransformed() : player.getTransformationId() == _id);
}
}

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

@@ -42,10 +42,6 @@ public class ConditionPlayerTvTEvent extends Condition
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
final L2PcInstance player = effector.getActingPlayer();
if ((player == null) || !TvTEvent.isStarted())
{
return !_val;
}
return (TvTEvent.isPlayerParticipant(player.getObjectId()) == _val);
return (player == null) || !TvTEvent.isStarted() ? !_val : TvTEvent.isPlayerParticipant(player.getObjectId()) == _val;
}
}

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

@@ -38,10 +38,6 @@ public class ConditionPlayerVehicleMounted extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if (effector.getActingPlayer() == null)
{
return true;
}
return (effector.getActingPlayer().isInVehicle() == _val);
return (effector.getActingPlayer() == null) || (effector.getActingPlayer().isInVehicle() == _val);
}
}

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

@@ -163,5 +163,4 @@ public final class ConditionSiegeZone extends Condition
return false;
}
}

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

@@ -49,10 +49,6 @@ public final class ConditionSlotItemType extends ConditionInventory
}
final L2ItemInstance itemSlot = effector.getInventory().getPaperdollItem(_slot);
if (itemSlot == null)
{
return false;
}
return (itemSlot.getItem().getItemMask() & _mask) != 0;
return (itemSlot != null) && ((itemSlot.getItem().getItemMask() & _mask) != 0);
}
}

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

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

10
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetActiveSkillId.java
View File

@@ -54,15 +54,9 @@ public class ConditionTargetActiveSkillId extends Condition
{
for (Skill sk : effected.getAllSkills())
{
if (sk != null)
if ((sk != null) && (sk.getId() == _skillId) && ((_skillLevel == -1) || (_skillLevel <= sk.getLevel())))
{
if (sk.getId() == _skillId)
{
if ((_skillLevel == -1) || (_skillLevel <= sk.getLevel()))
{
return true;
}
}
return true;
}
}
return false;

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

@@ -19,7 +19,6 @@ package com.l2jmobius.gameserver.model.conditions;
import java.util.List;
import com.l2jmobius.gameserver.model.actor.L2Character;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.model.items.L2Item;
import com.l2jmobius.gameserver.model.skills.Skill;
@@ -42,10 +41,6 @@ public class ConditionTargetClassIdRestriction extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if (!(effected instanceof L2PcInstance))
{
return false;
}
return (_classIds.contains((effected.getActingPlayer()).getClassId().getId()));
return effected.isPlayer() && _classIds.contains((effected.getActingPlayer()).getClassId().getId());
}
}

1
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetHp.java
View File

@@ -41,5 +41,4 @@ public class ConditionTargetHp extends Condition
{
return (effected != null) && (((effected.getCurrentHp() * 100) / effected.getMaxHp()) <= _hp);
}
}

8
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetInvSize.java
View File

@@ -41,11 +41,11 @@ public class ConditionTargetInvSize extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if ((effected != null) && effected.isPlayer())
if ((effected == null) || !effected.isPlayer())
{
final L2PcInstance target = effected.getActingPlayer();
return target.getInventory().getSize(false) <= (target.getInventoryLimit() - _size);
return false;
}
return false;
final L2PcInstance target = effected.getActingPlayer();
return target.getInventory().getSize(false) <= (target.getInventoryLimit() - _size);
}
}

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

@@ -40,10 +40,6 @@ public class ConditionTargetLevel extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if (effected == null)
{
return false;
}
return effected.getLevel() >= _level;
return (effected != null) && (effected.getLevel() >= _level);
}
}

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

@@ -41,10 +41,6 @@ public class ConditionTargetNpcId extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if ((effected != null) && (effected.isNpc() || effected.isDoor()))
{
return _npcIds.contains(effected.getId());
}
return false;
return (effected != null) && (effected.isNpc() || effected.isDoor()) && _npcIds.contains(effected.getId());
}
}

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

@@ -40,10 +40,6 @@ public class ConditionTargetNpcType extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if (effected == null)
{
return false;
}
return effected.getInstanceType().isTypes(_npcType);
return (effected != null) && effected.getInstanceType().isTypes(_npcType);
}
}

8
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionTargetUsesWeaponKind.java
View File

@@ -45,13 +45,7 @@ public class ConditionTargetUsesWeaponKind extends Condition
{
return false;
}
final L2Weapon weapon = effected.getActiveWeaponItem();
if (weapon == null)
{
return false;
}
return (weapon.getItemType().mask() & _weaponMask) != 0;
return (weapon != null) && ((weapon.getItemType().mask() & _weaponMask) != 0);
}
}

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

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

61
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionUsingItemType.java
View File

@@ -52,40 +52,35 @@ public final class ConditionUsingItemType extends Condition
final Inventory inv = effector.getInventory();
// If ConditionUsingItemType is one between Light, Heavy or Magic
if (_armor)
if (!_armor)
{
// Get the itemMask of the weared chest (if exists)
final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST);
if (chest == null)
{
return false;
}
final int chestMask = chest.getItem().getItemMask();
// If chest armor is different from the condition one return false
if ((_mask & chestMask) == 0)
{
return false;
}
// So from here, chest armor matches conditions
final int chestBodyPart = chest.getItem().getBodyPart();
// return True if chest armor is a Full Armor
if (chestBodyPart == L2Item.SLOT_FULL_ARMOR)
{
return true;
}
// check legs armor
final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
if (legs == null)
{
return false;
}
final int legMask = legs.getItem().getItemMask();
// return true if legs armor matches too
return (_mask & legMask) != 0;
return (_mask & inv.getWearedMask()) != 0;
}
return (_mask & inv.getWearedMask()) != 0;
// Get the itemMask of the weared chest (if exists)
final L2ItemInstance chest = inv.getPaperdollItem(Inventory.PAPERDOLL_CHEST);
if (chest == null)
{
return false;
}
final int chestMask = chest.getItem().getItemMask();
// If chest armor is different from the condition one return false
if ((_mask & chestMask) == 0)
{
return false;
}
// So from here, chest armor matches conditions
final int chestBodyPart = chest.getItem().getBodyPart();
// return True if chest armor is a Full Armor
if (chestBodyPart == L2Item.SLOT_FULL_ARMOR)
{
return true;
}
// check legs armor
final L2ItemInstance legs = inv.getPaperdollItem(Inventory.PAPERDOLL_LEGS);
return (legs != null) && ((_mask & legs.getItem().getItemMask()) != 0);
}
}

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

@@ -40,10 +40,6 @@ public final class ConditionUsingSkill extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if (skill == null)
{
return false;
}
return skill.getId() == _skillId;
return (skill != null) && (skill.getId() == _skillId);
}
}

8
trunk/java/com/l2jmobius/gameserver/model/conditions/ConditionUsingSlotType.java
View File

@@ -35,12 +35,6 @@ public class ConditionUsingSlotType extends Condition
@Override
public boolean testImpl(L2Character effector, L2Character effected, Skill skill, L2Item item)
{
if ((effector == null) || !effector.isPlayer())
{
return false;
}
return (effector.getActiveWeaponItem().getBodyPart() & _mask) != 0;
return (effector != null) && effector.isPlayer() && ((effector.getActiveWeaponItem().getBodyPart() & _mask) != 0);
}
}