Use of isEmpty method when possible.

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

View File

@@ -446,7 +446,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)

View File

@@ -388,7 +388,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
}
final List<SkillLearn> skills = SkillTreeData.getInstance().getAvailableRevelationSkills(player, SubclassType.BASECLASS);
if (skills.size() > 0)
if (!skills.isEmpty())
{
player.sendPacket(new ExAcquirableSkillListByClass(skills, AcquireSkillType.REVELATION));
}
@@ -438,7 +438,7 @@ public class RequestAcquireSkill implements IClientIncomingPacket
}
final List<SkillLearn> skills = SkillTreeData.getInstance().getAvailableRevelationSkills(player, SubclassType.DUALCLASS);
if (skills.size() > 0)
if (!skills.isEmpty())
{
player.sendPacket(new ExAcquirableSkillListByClass(skills, AcquireSkillType.REVELATION_DUALCLASS));
}

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);

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))

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()))

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()))
{

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())

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())
{

View File

@@ -66,7 +66,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));
@@ -159,7 +159,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()))