From 18ff6082be9d8367e40aafd96fe1860135fd6999 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 8 Jan 2023 13:31:09 +0000 Subject: [PATCH] Removed stream usage from OpHaveSummonedNpcSkillCondition. --- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- .../OpHaveSummonedNpcSkillCondition.java | 12 ++++++++++-- 26 files changed, 260 insertions(+), 52 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_01.0_Ertheia/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_02.5_Underground/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_03.0_Helios/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_04.0_GrandCrusade/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_05.0_Salvation/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_05.5_EtinasFate/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_06.0_Fafurion/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_07.0_PreludeOfWar/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_08.2_Homunculus/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_10.3_MasterClass/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_1.0/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.5_Zaken/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.7_Antharas/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Classic_Interlude/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } } diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java index 468680fb65..86aec4bdf1 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java +++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/scripts/handlers/skillconditionhandlers/OpHaveSummonedNpcSkillCondition.java @@ -19,11 +19,12 @@ package handlers.skillconditionhandlers; import org.l2jmobius.gameserver.model.StatSet; import org.l2jmobius.gameserver.model.WorldObject; import org.l2jmobius.gameserver.model.actor.Creature; +import org.l2jmobius.gameserver.model.actor.Npc; import org.l2jmobius.gameserver.model.skill.ISkillCondition; import org.l2jmobius.gameserver.model.skill.Skill; /** - * @author UnAfraid + * @author UnAfraid, Mobius */ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition { @@ -37,6 +38,13 @@ public class OpHaveSummonedNpcSkillCondition implements ISkillCondition @Override public boolean canUse(Creature caster, Skill skill, WorldObject target) { - return caster.getSummonedNpcs().stream().anyMatch(n -> n.getId() == _npcId); + for (Npc npc : caster.getSummonedNpcs()) + { + if (npc.getId() == _npcId) + { + return true; + } + } + return false; } }