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

Use of isEmpty method when possible.

Browse Source
This commit is contained in:
MobiusDevelopment
2021-05-25 02:32:37 +00:00
parent b88e59b956
commit bf4066d68e
141 changed files with 210 additions and 213 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/scripts/ai/areas/TowerOfInsolence/EnergyOfInsolence.java vendored
View File

@@ -181,7 +181,7 @@ public class EnergyOfInsolence extends AbstractNpcAI
if (CommonUtil.contains(ENERGY_OF_INSOLENCE_MINIONS, npc.getId()))
{
final MonsterInstance leader = ((MonsterInstance) npc).getLeader();
if ((leader != null) && (leader.getMinionList().getSpawnedMinions().size() == 0) && !leader.isDead())
if ((leader != null) && (leader.getMinionList().getSpawnedMinions().isEmpty()) && !leader.isDead())
{
makeMortal(leader);
}

2
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java
View File

@@ -450,7 +450,7 @@ public class Attackable extends Npc
final PartyContainer mostDamageParty;
damagingParties.sort(Comparator.comparingLong(c -> c.damage));
mostDamageParty = damagingParties.size() > 0 ? damagingParties.get(0) : null;
mostDamageParty = !damagingParties.isEmpty() ? damagingParties.get(0) : null;
// Calculate raidboss points
if (_isRaid && !_isRaidMinion)

4
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/RequestAcquireSkill.java
View File

@@ -396,7 +396,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
* Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while not being level 85 or awaken!", IllegalActionPunishmentType.NONE); return; } int count = 0; for (String varName : REVELATION_VAR_NAMES) { if
* (player.getVariables().getInt(varName, 0) > 0) { count++; } } if (count >= 2) { player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL); Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level "
* + _level + " while having already learned 2 skills!", IllegalActionPunishmentType.NONE); return; } if (checkPlayerSkill(player, trainer, s)) { final String varName = count == 0 ? REVELATION_VAR_NAMES[0] : REVELATION_VAR_NAMES[1]; player.getVariables().set(varName, skill.getId());
* giveSkill(player, trainer, skill); } final List<SkillLearn> skills = SkillTreesData.getInstance().getAvailableRevelationSkills(player, SubclassType.BASECLASS); if (skills.size() > 0) { player.sendPacket(new ExAcquirableSkillListByClass(skills, AcquireSkillType.REVELATION)); } else
* giveSkill(player, trainer, skill); } final List<SkillLearn> skills = SkillTreesData.getInstance().getAvailableRevelationSkills(player, SubclassType.BASECLASS); if (!skills.isEmpty()) { player.sendPacket(new ExAcquirableSkillListByClass(skills, AcquireSkillType.REVELATION)); } else
* { player.sendPacket(SystemMessageId.THERE_ARE_NO_OTHER_SKILLS_TO_LEARN); }
*/
return;
@@ -410,7 +410,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
* IllegalActionPunishmentType.NONE); return; } int count = 0; for (String varName : DUALCLASS_REVELATION_VAR_NAMES) { if (player.getVariables().getInt(varName, 0) > 0) { count++; } } if (count >= 2) {
* player.sendPacket(SystemMessageId.YOU_DO_NOT_HAVE_ENOUGH_ITEMS_TO_LEARN_THIS_SKILL); Util.handleIllegalPlayerAction(player, "Player " + player.getName() + " is requesting skill Id: " + _id + " level " + _level + " while having already learned 2 skills!",
* IllegalActionPunishmentType.NONE); return; } if (checkPlayerSkill(player, trainer, s)) { final String varName = count == 0 ? DUALCLASS_REVELATION_VAR_NAMES[0] : DUALCLASS_REVELATION_VAR_NAMES[1]; player.getVariables().set(varName, skill.getId()); giveSkill(player, trainer, skill);
* } final List<SkillLearn> skills = SkillTreesData.getInstance().getAvailableRevelationSkills(player, SubclassType.DUALCLASS); if (skills.size() > 0) { player.sendPacket(new ExAcquirableSkillListByClass(skills, AcquireSkillType.REVELATION_DUALCLASS)); } else {
* } final List<SkillLearn> skills = SkillTreesData.getInstance().getAvailableRevelationSkills(player, SubclassType.DUALCLASS); if (!skills.isEmpty()) { player.sendPacket(new ExAcquirableSkillListByClass(skills, AcquireSkillType.REVELATION_DUALCLASS)); } else {
* player.sendPacket(SystemMessageId.THERE_ARE_NO_OTHER_SKILLS_TO_LEARN); } break;
*/
return;

2
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/clientpackets/luckygame/RequestLuckyGamePlay.java
View File

@@ -129,7 +129,7 @@ public class RequestLuckyGamePlay implements IClientIncomingPacket
final int totalWeight = rewards.values().stream().mapToInt(list -> list.stream().mapToInt(item -> ItemTable.getInstance().getTemplate(item.getId()).getWeight()).sum()).sum();
// Check inventory capacity
if ((rewards.size() > 0) && (!player.getInventory().validateCapacity(rewards.size()) || !player.getInventory().validateWeight(totalWeight)))
if (!rewards.isEmpty() && (!player.getInventory().validateCapacity(rewards.size()) || !player.getInventory().validateWeight(totalWeight)))
{
player.sendPacket(_type == LuckyGameType.LUXURY ? ExBettingLuckyGameResult.LUXURY_INVALID_CAPACITY : ExBettingLuckyGameResult.NORMAL_INVALID_CAPACITY);
player.sendPacket(SystemMessageId.YOUR_INVENTORY_IS_EITHER_FULL_OR_OVERWEIGHT);

2
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/AcquireSkillList.java
View File

@@ -67,7 +67,7 @@ public class AcquireSkillList implements IClientOutgoingPacket
packet.writeC(skill.getGetLevel());
packet.writeC(0x00); // Skill dual class level.
packet.writeC(_player.getKnownSkill(skill.getSkillId()) != null ? 0x00 : 0x01);
if (skill.getRequiredItems().size() > 0)
if (!skill.getRequiredItems().isEmpty())
{
for (ItemHolder item : skill.getRequiredItems())
{

2
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadHeroAndLegendInfo.java
View File

@@ -47,7 +47,7 @@ public class ExOlympiadHeroAndLegendInfo implements IClientOutgoingPacket
{
OutgoingPackets.EX_OLYMPIAD_HERO_AND_LEGEND_INFO.writeId(packet);
if (Hero.getInstance().getHeroes().size() > 0)
if (!Hero.getInstance().getHeroes().isEmpty())
{
try (Connection con = DatabaseFactory.getConnection();
PreparedStatement statement = con.prepareStatement(GET_HEROES))

4
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExOlympiadRankingInfo.java
View File

@@ -72,7 +72,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket
packet.writeD(_serverId); // 0 - all servers, server id - for caller server
packet.writeD(933); // unk, 933 all time
if (_playerList.size() > 0)
if (!_playerList.isEmpty())
{
final RankingOlympiadCategory category = RankingOlympiadCategory.values()[_tabId];
writeFilteredRankingData(packet, category, category.getScopeByGroup(_rankingType), ClassId.getClassId(_classId));
@@ -144,7 +144,7 @@ public class ExOlympiadRankingInfo implements IClientOutgoingPacket
packet.writeString(player.getString("clanName")); // clan name
packet.writeD(scope == RankingOlympiadScope.SELF ? data.getKey() : curRank); // rank
if (snapshot.size() > 0)
if (!snapshot.isEmpty())
{
int snapshotRank = 1;
for (Entry<Integer, StatSet> ssData : snapshot.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList()))

4
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingList.java
View File

@@ -65,7 +65,7 @@ public class ExPvpRankingList implements IClientOutgoingPacket
packet.writeC(_tabId);
packet.writeC(_type);
packet.writeD(_race);
if ((_playerList.size() > 0) && (_type != 255) && (_race != 255))
if (!_playerList.isEmpty() && (_type != 255) && (_race != 255))
{
final RankingCategory category = RankingCategory.values()[_tabId];
writeFilteredRankingData(packet, category, category.getScopeByGroup(_type), Race.values()[_race]);
@@ -152,7 +152,7 @@ public class ExPvpRankingList implements IClientOutgoingPacket
packet.writeD(player.getInt("race"));
packet.writeD(player.getInt("classId"));
packet.writeQ(player.getInt("points")); // server rank
if (snapshot.size() > 0)
if (!snapshot.isEmpty())
{
for (Entry<Integer, StatSet> ssData : snapshot.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList()))
{

2
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExPvpRankingMyInfo.java
View File

@@ -46,7 +46,7 @@ public class ExPvpRankingMyInfo implements IClientOutgoingPacket
public boolean write(PacketWriter packet)
{
OutgoingPackets.EX_PVP_RANKING_MY_INFO.writeId(packet);
if (_playerList.size() > 0)
if (!_playerList.isEmpty())
{
boolean found = false;
for (Integer id : _playerList.keySet())

2
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharInfo.java
View File

@@ -49,7 +49,7 @@ public class ExRankingCharInfo implements IClientOutgoingPacket
{
OutgoingPackets.EX_RANKING_CHAR_INFO.writeId(packet);
if (_playerList.size() > 0)
if (!_playerList.isEmpty())
{
for (Integer id : _playerList.keySet())
{

4
L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/network/serverpackets/ranking/ExRankingCharRankers.java
View File

@@ -65,7 +65,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
packet.writeD(_ordinal);
packet.writeD(_player.getClassId().getId());
if (_playerList.size() > 0)
if (!_playerList.isEmpty())
{
final RankingCategory category = RankingCategory.values()[_group];
writeFilteredRankingData(packet, category, category.getScopeByGroup(_scope));
@@ -152,7 +152,7 @@ public class ExRankingCharRankers implements IClientOutgoingPacket
packet.writeD(player.getInt("classId"));
packet.writeD(player.getInt("race"));
packet.writeD(scope == RankingScope.SELF ? data.getKey() : curRank); // server rank
if (snapshot.size() > 0)
if (!snapshot.isEmpty())
{
int snapshotRank = 1;
for (Entry<Integer, StatSet> ssData : snapshot.stream().sorted(Entry.comparingByKey()).collect(Collectors.toList()))