From f6d7d83fce5be7b5162e7dc07905a6606eb19100 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Tue, 30 Aug 2022 00:38:08 +0000 Subject: [PATCH] RequestCollectionRegister should use getCompleteCount method. --- .../clientpackets/collection/RequestCollectionRegister.java | 2 +- .../dist/game/data/spawns/Aden/AdenSquareMerchants.xml | 2 +- .../dist/game/data/spawns/Giran/GiranSquareMerchants.xml | 2 +- .../clientpackets/collection/RequestCollectionRegister.java | 2 +- .../dist/game/data/spawns/Aden/AdenSquareMerchants.xml | 2 +- .../dist/game/data/spawns/Giran/GiranSquareMerchants.xml | 2 +- .../clientpackets/collection/RequestCollectionRegister.java | 2 +- .../dist/game/data/spawns/Aden/AdenSquareMerchants.xml | 2 +- .../dist/game/data/spawns/Giran/GiranSquareMerchants.xml | 2 +- .../clientpackets/collection/RequestCollectionRegister.java | 2 +- 10 files changed, 10 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 e78a554fe4..1548c6fed6 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 @@ -92,7 +92,7 @@ public class RequestCollectionRegister implements IClientIncomingPacket player.getCollections().add(new PlayerCollectionData(_collectionId, item.getId(), _index)); - if (player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).count() == collection.getItems().size()) + if (player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).count() == collection.getCompleteCount()) { player.sendPacket(new ExCollectionComplete(_collectionId)); diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Aden/AdenSquareMerchants.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Aden/AdenSquareMerchants.xml index 9688221485..249eb59338 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Aden/AdenSquareMerchants.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Aden/AdenSquareMerchants.xml @@ -1,4 +1,4 @@ -ο»Ώ + diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Giran/GiranSquareMerchants.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Giran/GiranSquareMerchants.xml index 83025942dd..93424dd8d5 100644 --- a/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Giran/GiranSquareMerchants.xml +++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/spawns/Giran/GiranSquareMerchants.xml @@ -1,4 +1,4 @@ -ο»Ώ + 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 e78a554fe4..1548c6fed6 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 @@ -92,7 +92,7 @@ public class RequestCollectionRegister implements IClientIncomingPacket player.getCollections().add(new PlayerCollectionData(_collectionId, item.getId(), _index)); - if (player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).count() == collection.getItems().size()) + if (player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).count() == collection.getCompleteCount()) { player.sendPacket(new ExCollectionComplete(_collectionId)); diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Aden/AdenSquareMerchants.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Aden/AdenSquareMerchants.xml index 5d3763faeb..c699f98c10 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Aden/AdenSquareMerchants.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Aden/AdenSquareMerchants.xml @@ -1,4 +1,4 @@ -ο»Ώ + diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/GiranSquareMerchants.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/GiranSquareMerchants.xml index 03e7f7d54f..f4daa8866e 100644 --- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/GiranSquareMerchants.xml +++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/GiranSquareMerchants.xml @@ -1,4 +1,4 @@ -ο»Ώ + 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 e78a554fe4..1548c6fed6 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 @@ -92,7 +92,7 @@ public class RequestCollectionRegister implements IClientIncomingPacket player.getCollections().add(new PlayerCollectionData(_collectionId, item.getId(), _index)); - if (player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).count() == collection.getItems().size()) + if (player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).count() == collection.getCompleteCount()) { player.sendPacket(new ExCollectionComplete(_collectionId)); diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Aden/AdenSquareMerchants.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Aden/AdenSquareMerchants.xml index 5d3763faeb..c699f98c10 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Aden/AdenSquareMerchants.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Aden/AdenSquareMerchants.xml @@ -1,4 +1,4 @@ -ο»Ώ + diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/GiranSquareMerchants.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/GiranSquareMerchants.xml index 03e7f7d54f..f4daa8866e 100644 --- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/GiranSquareMerchants.xml +++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/GiranSquareMerchants.xml @@ -1,4 +1,4 @@ -ο»Ώ + 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 e78a554fe4..1548c6fed6 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 @@ -92,7 +92,7 @@ public class RequestCollectionRegister implements IClientIncomingPacket player.getCollections().add(new PlayerCollectionData(_collectionId, item.getId(), _index)); - if (player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).count() == collection.getItems().size()) + if (player.getCollections().stream().filter(it -> it.getCollectionId() == _collectionId).count() == collection.getCompleteCount()) { player.sendPacket(new ExCollectionComplete(_collectionId));