From b4c8bb7bfcc9d509e45e97b1394847093362dfce Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 8 Jan 2023 14:44:11 +0000 Subject: [PATCH] Removed stream usage from MultisellEntryHolder. --- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- .../model/holders/MultisellEntryHolder.java | 15 ++++++++++++--- 26 files changed, 312 insertions(+), 78 deletions(-) diff --git a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_01.0_Ertheia/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_02.5_Underground/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_03.0_Helios/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_04.0_GrandCrusade/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_05.0_Salvation/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_05.5_EtinasFate/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_06.0_Fafurion/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_07.0_PreludeOfWar/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_08.2_Homunculus/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_1.0/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_1.5_AgeOfSplendor/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_2.5_Zaken/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_2.7_Antharas/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_2.8_SevenSigns/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_2.9.5_Saviors/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_2.9_SecretOfEmpire/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients() diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java index cf692041e0..fdff325775 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/holders/MultisellEntryHolder.java @@ -18,13 +18,12 @@ package org.l2jmobius.gameserver.model.holders; import java.util.Collections; import java.util.List; -import java.util.Objects; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.model.item.ItemTemplate; /** - * @author Nik + * @author Nik, Mobius */ public class MultisellEntryHolder { @@ -36,7 +35,17 @@ public class MultisellEntryHolder { _ingredients = Collections.unmodifiableList(ingredients); _products = Collections.unmodifiableList(products); - _stackable = products.stream().map(i -> ItemTable.getInstance().getTemplate(i.getId())).filter(Objects::nonNull).allMatch(ItemTemplate::isStackable); + + for (ItemChanceHolder product : products) + { + final ItemTemplate item = ItemTable.getInstance().getTemplate(product.getId()); + if ((item == null) || !item.isStackable()) + { + _stackable = false; + return; + } + } + _stackable = true; } public List getIngredients()