From ce683c293877031838f030ca78b5f00eb60af34b Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Thu, 28 Oct 2021 21:36:06 +0000 Subject: [PATCH] Stream removal from skill checkConditions method. --- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- .../l2jmobius/gameserver/model/skills/Skill.java | 16 +++++++++++++++- 19 files changed, 285 insertions(+), 19 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java index 2572ee201d..095951ec31 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java index 2572ee201d..095951ec31 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java index 2572ee201d..095951ec31 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java index 2572ee201d..095951ec31 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java index 2572ee201d..095951ec31 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java index 2572ee201d..095951ec31 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java index 2572ee201d..095951ec31 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java index 18c80adc82..e4a4d9f174 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/Skill.java index 18c80adc82..e4a4d9f174 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/Skill.java index 18c80adc82..e4a4d9f174 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java index 2572ee201d..095951ec31 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java index 2572ee201d..095951ec31 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java index 2572ee201d..095951ec31 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java index 2572ee201d..095951ec31 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java index 2572ee201d..095951ec31 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java index 54af6cfc57..5107e14357 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1521,7 +1521,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java index 2572ee201d..095951ec31 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1514,7 +1514,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/Skill.java index 54af6cfc57..5107e14357 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1521,7 +1521,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/Skill.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/Skill.java index 54af6cfc57..5107e14357 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/Skill.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/skills/Skill.java @@ -1521,7 +1521,21 @@ public class Skill implements IIdentifiable */ public boolean checkConditions(SkillConditionScope skillConditionScope, Creature caster, WorldObject target) { - return _conditionLists.getOrDefault(skillConditionScope, Collections.emptyList()).stream().allMatch(c -> c.canUse(caster, this, target)); + final List conditions = _conditionLists.get(skillConditionScope); + if (conditions == null) + { + return true; + } + + for (ISkillCondition condition : conditions) + { + if (!condition.canUse(caster, this, target)) + { + return false; + } + } + + return true; } @Override