From 5f84007f7e44c26eb6385bd1da1b51025ac54e39 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Wed, 16 Mar 2022 09:31:30 +0000 Subject: [PATCH] Prefer to use Optional !isPresent than isEmpty. --- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- .../java/org/l2jmobius/gameserver/model/actor/Attackable.java | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 52e42adce7..e36bf08af9 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -441,7 +441,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 223fac3b14..268bf847c1 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -437,7 +437,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 223fac3b14..268bf847c1 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -437,7 +437,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 223fac3b14..268bf847c1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -437,7 +437,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 81d6620491..c489397a7c 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -436,7 +436,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 81d6620491..c489397a7c 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -436,7 +436,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 81d6620491..c489397a7c 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -436,7 +436,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 4e62906568..b3b59a01a8 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -436,7 +436,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 4e62906568..b3b59a01a8 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -436,7 +436,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 4e62906568..b3b59a01a8 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -436,7 +436,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java index ba1b8496aa..d878317338 100644 --- a/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_10.1_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -436,7 +436,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java index ba1b8496aa..d878317338 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -436,7 +436,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 6d660ffe47..5ddd4c106c 100644 --- a/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_CT_2.4_Epilogue/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -460,7 +460,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 6d660ffe47..5ddd4c106c 100644 --- a/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_CT_2.6_HighFive/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -460,7 +460,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 9a2e823e0f..00d1babb15 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -437,7 +437,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 9a2e823e0f..00d1babb15 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -437,7 +437,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 76d98d8839..e42f49d049 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -437,7 +437,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java index a8e4d34c5f..2e262f8e18 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -439,7 +439,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java index a8e4d34c5f..2e262f8e18 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -439,7 +439,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java index a8e4d34c5f..2e262f8e18 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -439,7 +439,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 9ff4316d6b..8dc3b4d52e 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -441,7 +441,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java index c74896206e..04038f3fc3 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -440,7 +440,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 3bcc0d3f0a..b34557d341 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -445,7 +445,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 5d7268e146..65d00d0744 100644 --- a/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_6.1_BattleChronicle/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -445,7 +445,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java index 5d7268e146..65d00d0744 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/actor/Attackable.java @@ -445,7 +445,7 @@ public class Attackable extends Npc } container.damage = totalMemberDamage; - if (partyContainerStream.isEmpty()) + if (!partyContainerStream.isPresent()) { damagingParties.add(container); }