From e0e47e55c9da02cea119d49f6c99d97d9f8a06b5 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 16 Mar 2021 08:01:40 +0000 Subject: [PATCH] Removed Stream usage from Creature. --- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- .../gameserver/model/actor/Creature.java | 17 ++++++++++++++--- 19 files changed, 266 insertions(+), 57 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java index b02137c274..b644c502d8 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2886,7 +2886,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3897,9 +3904,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java index b02137c274..b644c502d8 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2886,7 +2886,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3897,9 +3904,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8e055dd384..4e1a992b17 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2886,7 +2886,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3897,9 +3904,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8e055dd384..4e1a992b17 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2886,7 +2886,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3897,9 +3904,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java index b78fa80c2f..7a22a5a688 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2886,7 +2886,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3897,9 +3904,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java index b78fa80c2f..7a22a5a688 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2886,7 +2886,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3897,9 +3904,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java index b78fa80c2f..7a22a5a688 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2886,7 +2886,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3897,9 +3904,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java index 8cc967837e..ab3b821e2e 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2885,7 +2885,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3896,9 +3903,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java index 03a5202a57..2271329177 100644 --- a/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_8.0_Homunculus/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2885,7 +2885,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3896,9 +3903,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java index 03a5202a57..2271329177 100644 --- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2885,7 +2885,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3896,9 +3903,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java index 45bc166811..bac2c00ec7 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2886,7 +2886,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3897,9 +3904,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java index 45bc166811..bac2c00ec7 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2886,7 +2886,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3897,9 +3904,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java index c29b3df063..b14290a063 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2886,7 +2886,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3897,9 +3904,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java index 40907e3520..f7daa1670a 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2899,7 +2899,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3910,9 +3917,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java index 40907e3520..f7daa1670a 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2899,7 +2899,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3910,9 +3917,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java index a54bf9d582..d7ed439f88 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2898,7 +2898,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3909,9 +3916,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java index 45bc166811..bac2c00ec7 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2886,7 +2886,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3897,9 +3904,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java index ee70c98c90..1d77cd171d 100644 --- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2901,7 +2901,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3919,9 +3926,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack diff --git a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java index 14add0b05e..8974843bb8 100644 --- a/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java +++ b/L2J_Mobius_Essence_5.0_Sylph/java/org/l2jmobius/gameserver/model/actor/Creature.java @@ -2908,7 +2908,14 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe public boolean isCastingNow(Predicate filter) { - return _skillCasters.values().stream().anyMatch(filter); + for (SkillCaster skillCaster : _skillCasters.values()) + { + if (filter.test(skillCaster)) + { + return true; + } + } + return false; } /** @@ -3926,9 +3933,13 @@ public abstract class Creature extends WorldObject implements ISkillsHolder, IDe private void onAttackFinish(Attack attack) { // Recharge any active auto-soulshot tasks for current creature after the attack has successfully hit. - if (attack.getHits().stream().anyMatch(h -> !h.isMiss())) + for (Hit hit : attack.getHits()) { - rechargeShots(true, false, false); + if (!hit.isMiss()) + { + rechargeShots(true, false, false); + break; + } } // Notify that this character is ready to act for the next attack