From c579f6be4f57b29d505908088fc18302513a710a Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 8 Jan 2023 18:30:16 +0000 Subject: [PATCH] Removed stream usage from PetInventory. --- .../model/itemcontainer/PetInventory.java | 13 +++++++++++-- .../model/itemcontainer/PetInventory.java | 13 +++++++++++-- .../model/itemcontainer/PetInventory.java | 13 +++++++++++-- .../model/itemcontainer/PetInventory.java | 13 +++++++++++-- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 9ff10dead6..17f0760db4 100644 --- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -17,7 +17,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import java.util.Collection; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -59,7 +60,15 @@ public class PetInventory extends Inventory @Override public Collection getItems() { - return super.getItems().stream().filter(Item::isEquipped).collect(Collectors.toList()); + final List equippedItems = new LinkedList<>(); + for (Item item : super.getItems()) + { + if (item.isEquipped()) + { + equippedItems.add(item); + } + } + return equippedItems; } public boolean validateCapacity(Item item) diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 9ff10dead6..17f0760db4 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -17,7 +17,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import java.util.Collection; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -59,7 +60,15 @@ public class PetInventory extends Inventory @Override public Collection getItems() { - return super.getItems().stream().filter(Item::isEquipped).collect(Collectors.toList()); + final List equippedItems = new LinkedList<>(); + for (Item item : super.getItems()) + { + if (item.isEquipped()) + { + equippedItems.add(item); + } + } + return equippedItems; } public boolean validateCapacity(Item item) diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 9ff10dead6..17f0760db4 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -17,7 +17,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import java.util.Collection; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -59,7 +60,15 @@ public class PetInventory extends Inventory @Override public Collection getItems() { - return super.getItems().stream().filter(Item::isEquipped).collect(Collectors.toList()); + final List equippedItems = new LinkedList<>(); + for (Item item : super.getItems()) + { + if (item.isEquipped()) + { + equippedItems.add(item); + } + } + return equippedItems; } public boolean validateCapacity(Item item) diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java index 9ff10dead6..17f0760db4 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/model/itemcontainer/PetInventory.java @@ -17,7 +17,8 @@ package org.l2jmobius.gameserver.model.itemcontainer; import java.util.Collection; -import java.util.stream.Collectors; +import java.util.LinkedList; +import java.util.List; import org.l2jmobius.gameserver.data.ItemTable; import org.l2jmobius.gameserver.enums.ItemLocation; @@ -59,7 +60,15 @@ public class PetInventory extends Inventory @Override public Collection getItems() { - return super.getItems().stream().filter(Item::isEquipped).collect(Collectors.toList()); + final List equippedItems = new LinkedList<>(); + for (Item item : super.getItems()) + { + if (item.isEquipped()) + { + equippedItems.add(item); + } + } + return equippedItems; } public boolean validateCapacity(Item item)