From 7c8a32d266e0a587cb1129accba707d635e3dfce Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sun, 8 Jan 2023 12:19:27 +0000 Subject: [PATCH] Removed stream usage from RequestCollectionRegister clientpacket. --- .../collection/RequestCollectionRegister.java | 10 ++++++++- .../collection/RequestCollectionRegister.java | 21 +++++++++++++++++-- .../collection/RequestCollectionRegister.java | 21 +++++++++++++++++-- .../collection/RequestCollectionRegister.java | 10 ++++++++- .../collection/RequestCollectionRegister.java | 21 +++++++++++++++++-- .../collection/RequestCollectionRegister.java | 21 +++++++++++++++++-- 6 files changed, 94 insertions(+), 10 deletions(-) diff --git a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java index d32667bdc7..6d49195a72 100644 --- a/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java +++ b/L2J_Mobius_09.2_ReturnOfTheQueenAnt/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java @@ -91,7 +91,15 @@ public class RequestCollectionRegister implements ClientPacket player.getCollections().add(new PlayerCollectionData(_collectionId, item.getId(), _index)); - if (player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).count() == collection.getCompleteCount()) + int completeCount = 0; + for (PlayerCollectionData coll : player.getCollections()) + { + if (coll.getCollectionId() == _collectionId) + { + completeCount++; + } + } + if (completeCount == collection.getCompleteCount()) { player.sendPacket(new ExCollectionComplete(_collectionId)); diff --git a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java index 496e66610b..104b3a8af7 100644 --- a/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java +++ b/L2J_Mobius_10.2_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java @@ -88,7 +88,16 @@ public class RequestCollectionRegister implements ClientPacket return; } - PlayerCollectionData currentColl = player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).findAny().orElse(null); + PlayerCollectionData currentColl = null; + for (PlayerCollectionData coll : player.getCollections()) + { + if (coll.getCollectionId() == _collectionId) + { + currentColl = coll; + break; + } + } + if ((currentColl != null) && (currentColl.getIndex() == _index)) { player.sendPacket(new ExCollectionRegister(false, _collectionId, _index, new ItemEnchantHolder(item.getId(), count, item.getEnchantLevel()))); @@ -103,7 +112,15 @@ public class RequestCollectionRegister implements ClientPacket player.getCollections().add(new PlayerCollectionData(_collectionId, item.getId(), _index)); - if (player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).count() == collection.getCompleteCount()) + int completeCount = 0; + for (PlayerCollectionData coll : player.getCollections()) + { + if (coll.getCollectionId() == _collectionId) + { + completeCount++; + } + } + if (completeCount == collection.getCompleteCount()) { player.sendPacket(new ExCollectionComplete(_collectionId)); diff --git a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java index 496e66610b..104b3a8af7 100644 --- a/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java +++ b/L2J_Mobius_10.3_MasterClass/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java @@ -88,7 +88,16 @@ public class RequestCollectionRegister implements ClientPacket return; } - PlayerCollectionData currentColl = player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).findAny().orElse(null); + PlayerCollectionData currentColl = null; + for (PlayerCollectionData coll : player.getCollections()) + { + if (coll.getCollectionId() == _collectionId) + { + currentColl = coll; + break; + } + } + if ((currentColl != null) && (currentColl.getIndex() == _index)) { player.sendPacket(new ExCollectionRegister(false, _collectionId, _index, new ItemEnchantHolder(item.getId(), count, item.getEnchantLevel()))); @@ -103,7 +112,15 @@ public class RequestCollectionRegister implements ClientPacket player.getCollections().add(new PlayerCollectionData(_collectionId, item.getId(), _index)); - if (player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).count() == collection.getCompleteCount()) + int completeCount = 0; + for (PlayerCollectionData coll : player.getCollections()) + { + if (coll.getCollectionId() == _collectionId) + { + completeCount++; + } + } + if (completeCount == collection.getCompleteCount()) { player.sendPacket(new ExCollectionComplete(_collectionId)); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java index d32667bdc7..6d49195a72 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java +++ b/L2J_Mobius_Essence_5.2_FrostLord/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java @@ -91,7 +91,15 @@ public class RequestCollectionRegister implements ClientPacket player.getCollections().add(new PlayerCollectionData(_collectionId, item.getId(), _index)); - if (player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).count() == collection.getCompleteCount()) + int completeCount = 0; + for (PlayerCollectionData coll : player.getCollections()) + { + if (coll.getCollectionId() == _collectionId) + { + completeCount++; + } + } + if (completeCount == collection.getCompleteCount()) { player.sendPacket(new ExCollectionComplete(_collectionId)); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java index 496e66610b..104b3a8af7 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java +++ b/L2J_Mobius_Essence_6.2_Vanguard/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java @@ -88,7 +88,16 @@ public class RequestCollectionRegister implements ClientPacket return; } - PlayerCollectionData currentColl = player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).findAny().orElse(null); + PlayerCollectionData currentColl = null; + for (PlayerCollectionData coll : player.getCollections()) + { + if (coll.getCollectionId() == _collectionId) + { + currentColl = coll; + break; + } + } + if ((currentColl != null) && (currentColl.getIndex() == _index)) { player.sendPacket(new ExCollectionRegister(false, _collectionId, _index, new ItemEnchantHolder(item.getId(), count, item.getEnchantLevel()))); @@ -103,7 +112,15 @@ public class RequestCollectionRegister implements ClientPacket player.getCollections().add(new PlayerCollectionData(_collectionId, item.getId(), _index)); - if (player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).count() == collection.getCompleteCount()) + int completeCount = 0; + for (PlayerCollectionData coll : player.getCollections()) + { + if (coll.getCollectionId() == _collectionId) + { + completeCount++; + } + } + if (completeCount == collection.getCompleteCount()) { player.sendPacket(new ExCollectionComplete(_collectionId)); diff --git a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java index 496e66610b..104b3a8af7 100644 --- a/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java +++ b/L2J_Mobius_Essence_6.3_Crusader/java/org/l2jmobius/gameserver/network/clientpackets/collection/RequestCollectionRegister.java @@ -88,7 +88,16 @@ public class RequestCollectionRegister implements ClientPacket return; } - PlayerCollectionData currentColl = player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).findAny().orElse(null); + PlayerCollectionData currentColl = null; + for (PlayerCollectionData coll : player.getCollections()) + { + if (coll.getCollectionId() == _collectionId) + { + currentColl = coll; + break; + } + } + if ((currentColl != null) && (currentColl.getIndex() == _index)) { player.sendPacket(new ExCollectionRegister(false, _collectionId, _index, new ItemEnchantHolder(item.getId(), count, item.getEnchantLevel()))); @@ -103,7 +112,15 @@ public class RequestCollectionRegister implements ClientPacket player.getCollections().add(new PlayerCollectionData(_collectionId, item.getId(), _index)); - if (player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).count() == collection.getCompleteCount()) + int completeCount = 0; + for (PlayerCollectionData coll : player.getCollections()) + { + if (coll.getCollectionId() == _collectionId) + { + completeCount++; + } + } + if (completeCount == collection.getCompleteCount()) { player.sendPacket(new ExCollectionComplete(_collectionId));