From 1d450d87d881fbf8160d44a4c8551dc0d1506e41 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 8 Jan 2023 14:55:41 +0000 Subject: [PATCH] Removed stream usage from RecipeHolder. --- .../l2jmobius/gameserver/model/holders/RecipeHolder.java | 9 ++++++--- .../l2jmobius/gameserver/model/holders/RecipeHolder.java | 9 ++++++--- .../l2jmobius/gameserver/model/holders/RecipeHolder.java | 9 ++++++--- .../l2jmobius/gameserver/model/holders/RecipeHolder.java | 9 ++++++--- .../l2jmobius/gameserver/model/holders/RecipeHolder.java | 9 ++++++--- .../l2jmobius/gameserver/model/holders/RecipeHolder.java | 9 ++++++--- .../l2jmobius/gameserver/model/holders/RecipeHolder.java | 9 ++++++--- .../l2jmobius/gameserver/model/holders/RecipeHolder.java | 9 ++++++--- .../l2jmobius/gameserver/model/holders/RecipeHolder.java | 9 ++++++--- 9 files changed, 54 insertions(+), 27 deletions(-) diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java index 00d6725dd3..2c688fda6a 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java @@ -309,10 +309,13 @@ public class RecipeHolder implements IIdentifiable } } - // Take necessary ingredients. If there was problem destroying item, return null to insicate that process didn't go well. - if (_materials.stream().anyMatch(i -> !player.destroyItemByItemId("Recipe " + getId(), i.getId(), i.getCount(), manufacturer, sendMessage))) + // Take necessary ingredients. If there was problem destroying item, return null to indicate that process didn't go well. + for (ItemHolder material : _materials) { - return null; + if (!player.destroyItemByItemId("Recipe " + getId(), material.getId(), material.getCount(), manufacturer, sendMessage)) + { + return null; + } } // Check if success. Luck triggers no matter the success rate - even with 100% craft. Luck chance is taken from your stat and not manufacturer's stat. diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java index 00d6725dd3..2c688fda6a 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java @@ -309,10 +309,13 @@ public class RecipeHolder implements IIdentifiable } } - // Take necessary ingredients. If there was problem destroying item, return null to insicate that process didn't go well. - if (_materials.stream().anyMatch(i -> !player.destroyItemByItemId("Recipe " + getId(), i.getId(), i.getCount(), manufacturer, sendMessage))) + // Take necessary ingredients. If there was problem destroying item, return null to indicate that process didn't go well. + for (ItemHolder material : _materials) { - return null; + if (!player.destroyItemByItemId("Recipe " + getId(), material.getId(), material.getCount(), manufacturer, sendMessage)) + { + return null; + } } // Check if success. Luck triggers no matter the success rate - even with 100% craft. Luck chance is taken from your stat and not manufacturer's stat. diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java index 00d6725dd3..2c688fda6a 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java @@ -309,10 +309,13 @@ public class RecipeHolder implements IIdentifiable } } - // Take necessary ingredients. If there was problem destroying item, return null to insicate that process didn't go well. - if (_materials.stream().anyMatch(i -> !player.destroyItemByItemId("Recipe " + getId(), i.getId(), i.getCount(), manufacturer, sendMessage))) + // Take necessary ingredients. If there was problem destroying item, return null to indicate that process didn't go well. + for (ItemHolder material : _materials) { - return null; + if (!player.destroyItemByItemId("Recipe " + getId(), material.getId(), material.getCount(), manufacturer, sendMessage)) + { + return null; + } } // Check if success. Luck triggers no matter the success rate - even with 100% craft. Luck chance is taken from your stat and not manufacturer's stat. diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java index 00d6725dd3..2c688fda6a 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java @@ -309,10 +309,13 @@ public class RecipeHolder implements IIdentifiable } } - // Take necessary ingredients. If there was problem destroying item, return null to insicate that process didn't go well. - if (_materials.stream().anyMatch(i -> !player.destroyItemByItemId("Recipe " + getId(), i.getId(), i.getCount(), manufacturer, sendMessage))) + // Take necessary ingredients. If there was problem destroying item, return null to indicate that process didn't go well. + for (ItemHolder material : _materials) { - return null; + if (!player.destroyItemByItemId("Recipe " + getId(), material.getId(), material.getCount(), manufacturer, sendMessage)) + { + return null; + } } // Check if success. Luck triggers no matter the success rate - even with 100% craft. Luck chance is taken from your stat and not manufacturer's stat. diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java index 00d6725dd3..2c688fda6a 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java @@ -309,10 +309,13 @@ public class RecipeHolder implements IIdentifiable } } - // Take necessary ingredients. If there was problem destroying item, return null to insicate that process didn't go well. - if (_materials.stream().anyMatch(i -> !player.destroyItemByItemId("Recipe " + getId(), i.getId(), i.getCount(), manufacturer, sendMessage))) + // Take necessary ingredients. If there was problem destroying item, return null to indicate that process didn't go well. + for (ItemHolder material : _materials) { - return null; + if (!player.destroyItemByItemId("Recipe " + getId(), material.getId(), material.getCount(), manufacturer, sendMessage)) + { + return null; + } } // Check if success. Luck triggers no matter the success rate - even with 100% craft. Luck chance is taken from your stat and not manufacturer's stat. diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java index 00d6725dd3..2c688fda6a 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java @@ -309,10 +309,13 @@ public class RecipeHolder implements IIdentifiable } } - // Take necessary ingredients. If there was problem destroying item, return null to insicate that process didn't go well. - if (_materials.stream().anyMatch(i -> !player.destroyItemByItemId("Recipe " + getId(), i.getId(), i.getCount(), manufacturer, sendMessage))) + // Take necessary ingredients. If there was problem destroying item, return null to indicate that process didn't go well. + for (ItemHolder material : _materials) { - return null; + if (!player.destroyItemByItemId("Recipe " + getId(), material.getId(), material.getCount(), manufacturer, sendMessage)) + { + return null; + } } // Check if success. Luck triggers no matter the success rate - even with 100% craft. Luck chance is taken from your stat and not manufacturer's stat. diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java index 00d6725dd3..2c688fda6a 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java @@ -309,10 +309,13 @@ public class RecipeHolder implements IIdentifiable } } - // Take necessary ingredients. If there was problem destroying item, return null to insicate that process didn't go well. - if (_materials.stream().anyMatch(i -> !player.destroyItemByItemId("Recipe " + getId(), i.getId(), i.getCount(), manufacturer, sendMessage))) + // Take necessary ingredients. If there was problem destroying item, return null to indicate that process didn't go well. + for (ItemHolder material : _materials) { - return null; + if (!player.destroyItemByItemId("Recipe " + getId(), material.getId(), material.getCount(), manufacturer, sendMessage)) + { + return null; + } } // Check if success. Luck triggers no matter the success rate - even with 100% craft. Luck chance is taken from your stat and not manufacturer's stat. diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java index 00d6725dd3..2c688fda6a 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java @@ -309,10 +309,13 @@ public class RecipeHolder implements IIdentifiable } } - // Take necessary ingredients. If there was problem destroying item, return null to insicate that process didn't go well. - if (_materials.stream().anyMatch(i -> !player.destroyItemByItemId("Recipe " + getId(), i.getId(), i.getCount(), manufacturer, sendMessage))) + // Take necessary ingredients. If there was problem destroying item, return null to indicate that process didn't go well. + for (ItemHolder material : _materials) { - return null; + if (!player.destroyItemByItemId("Recipe " + getId(), material.getId(), material.getCount(), manufacturer, sendMessage)) + { + return null; + } } // Check if success. Luck triggers no matter the success rate - even with 100% craft. Luck chance is taken from your stat and not manufacturer's stat. diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java index 00d6725dd3..2c688fda6a 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/holders/RecipeHolder.java @@ -309,10 +309,13 @@ public class RecipeHolder implements IIdentifiable } } - // Take necessary ingredients. If there was problem destroying item, return null to insicate that process didn't go well. - if (_materials.stream().anyMatch(i -> !player.destroyItemByItemId("Recipe " + getId(), i.getId(), i.getCount(), manufacturer, sendMessage))) + // Take necessary ingredients. If there was problem destroying item, return null to indicate that process didn't go well. + for (ItemHolder material : _materials) { - return null; + if (!player.destroyItemByItemId("Recipe " + getId(), material.getId(), material.getCount(), manufacturer, sendMessage)) + { + return null; + } } // Check if success. Luck triggers no matter the success rate - even with 100% craft. Luck chance is taken from your stat and not manufacturer's stat.