From f27afeb01840ead10b28f3818b03bcf789cba3b3 Mon Sep 17 00:00:00 2001 From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com> Date: Mon, 14 Sep 2020 22:28:54 +0000 Subject: [PATCH] Manage client limit for ExPVPMatchCCRecord. --- .../network/serverpackets/ExPVPMatchCCRecord.java | 8 +++++++- .../network/serverpackets/ExPVPMatchCCRecord.java | 8 +++++++- .../network/serverpackets/ExPVPMatchCCRecord.java | 8 +++++++- .../network/serverpackets/ExPVPMatchCCRecord.java | 8 +++++++- .../network/serverpackets/ExPVPMatchCCRecord.java | 8 +++++++- .../network/serverpackets/ExPVPMatchCCRecord.java | 8 +++++++- .../network/serverpackets/ExPVPMatchCCRecord.java | 8 +++++++- .../network/serverpackets/ExPVPMatchCCRecord.java | 8 +++++++- .../network/serverpackets/ExPVPMatchCCRecord.java | 8 +++++++- .../network/serverpackets/ExPVPMatchCCRecord.java | 8 +++++++- .../network/serverpackets/ExPVPMatchCCRecord.java | 8 +++++++- .../network/serverpackets/ExPVPMatchCCRecord.java | 8 +++++++- .../network/serverpackets/ExPVPMatchCCRecord.java | 8 +++++++- .../network/serverpackets/ExPVPMatchCCRecord.java | 8 +++++++- .../network/serverpackets/ExPVPMatchCCRecord.java | 8 +++++++- 15 files changed, 105 insertions(+), 15 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java index 368d070357..bba93345ac 100644 --- a/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java +++ b/L2J_Mobius_1.0_Ertheia/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java @@ -46,9 +46,15 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket { OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet); packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish - packet.writeD(_players.size()); + packet.writeD(Math.min(_players.size(), 25)); + int counter = 0; for (Entry entry : _players.entrySet()) { + counter++; + if (counter > 25) + { + break; + } packet.writeS(entry.getKey().getName()); packet.writeD(entry.getValue()); } diff --git a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java index 368d070357..bba93345ac 100644 --- a/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java +++ b/L2J_Mobius_2.5_Underground/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java @@ -46,9 +46,15 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket { OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet); packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish - packet.writeD(_players.size()); + packet.writeD(Math.min(_players.size(), 25)); + int counter = 0; for (Entry entry : _players.entrySet()) { + counter++; + if (counter > 25) + { + break; + } packet.writeS(entry.getKey().getName()); packet.writeD(entry.getValue()); } diff --git a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java index 368d070357..bba93345ac 100644 --- a/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java +++ b/L2J_Mobius_3.0_Helios/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java @@ -46,9 +46,15 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket { OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet); packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish - packet.writeD(_players.size()); + packet.writeD(Math.min(_players.size(), 25)); + int counter = 0; for (Entry entry : _players.entrySet()) { + counter++; + if (counter > 25) + { + break; + } packet.writeS(entry.getKey().getName()); packet.writeD(entry.getValue()); } diff --git a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java index 368d070357..bba93345ac 100644 --- a/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java +++ b/L2J_Mobius_4.0_GrandCrusade/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java @@ -46,9 +46,15 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket { OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet); packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish - packet.writeD(_players.size()); + packet.writeD(Math.min(_players.size(), 25)); + int counter = 0; for (Entry entry : _players.entrySet()) { + counter++; + if (counter > 25) + { + break; + } packet.writeS(entry.getKey().getName()); packet.writeD(entry.getValue()); } diff --git a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java index 368d070357..bba93345ac 100644 --- a/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java +++ b/L2J_Mobius_5.0_Salvation/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java @@ -46,9 +46,15 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket { OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet); packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish - packet.writeD(_players.size()); + packet.writeD(Math.min(_players.size(), 25)); + int counter = 0; for (Entry entry : _players.entrySet()) { + counter++; + if (counter > 25) + { + break; + } packet.writeS(entry.getKey().getName()); packet.writeD(entry.getValue()); } diff --git a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java index 368d070357..bba93345ac 100644 --- a/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java +++ b/L2J_Mobius_5.5_EtinasFate/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java @@ -46,9 +46,15 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket { OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet); packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish - packet.writeD(_players.size()); + packet.writeD(Math.min(_players.size(), 25)); + int counter = 0; for (Entry entry : _players.entrySet()) { + counter++; + if (counter > 25) + { + break; + } packet.writeS(entry.getKey().getName()); packet.writeD(entry.getValue()); } diff --git a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java index 368d070357..bba93345ac 100644 --- a/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java +++ b/L2J_Mobius_6.0_Fafurion/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java @@ -46,9 +46,15 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket { OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet); packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish - packet.writeD(_players.size()); + packet.writeD(Math.min(_players.size(), 25)); + int counter = 0; for (Entry entry : _players.entrySet()) { + counter++; + if (counter > 25) + { + break; + } packet.writeS(entry.getKey().getName()); packet.writeD(entry.getValue()); } diff --git a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java index 368d070357..bba93345ac 100644 --- a/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java +++ b/L2J_Mobius_7.0_PreludeOfWar/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java @@ -46,9 +46,15 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket { OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet); packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish - packet.writeD(_players.size()); + packet.writeD(Math.min(_players.size(), 25)); + int counter = 0; for (Entry entry : _players.entrySet()) { + counter++; + if (counter > 25) + { + break; + } packet.writeS(entry.getKey().getName()); packet.writeD(entry.getValue()); } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java index 368d070357..bba93345ac 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java @@ -46,9 +46,15 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket { OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet); packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish - packet.writeD(_players.size()); + packet.writeD(Math.min(_players.size(), 25)); + int counter = 0; for (Entry entry : _players.entrySet()) { + counter++; + if (counter > 25) + { + break; + } packet.writeS(entry.getKey().getName()); packet.writeD(entry.getValue()); } diff --git a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java index 368d070357..bba93345ac 100644 --- a/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java +++ b/L2J_Mobius_Classic_2.1_Zaken/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java @@ -46,9 +46,15 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket { OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet); packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish - packet.writeD(_players.size()); + packet.writeD(Math.min(_players.size(), 25)); + int counter = 0; for (Entry entry : _players.entrySet()) { + counter++; + if (counter > 25) + { + break; + } packet.writeS(entry.getKey().getName()); packet.writeD(entry.getValue()); } diff --git a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java index 368d070357..bba93345ac 100644 --- a/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java +++ b/L2J_Mobius_Classic_2.2_Antharas/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java @@ -46,9 +46,15 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket { OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet); packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish - packet.writeD(_players.size()); + packet.writeD(Math.min(_players.size(), 25)); + int counter = 0; for (Entry entry : _players.entrySet()) { + counter++; + if (counter > 25) + { + break; + } packet.writeS(entry.getKey().getName()); packet.writeD(entry.getValue()); } diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java index 368d070357..bba93345ac 100644 --- a/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java +++ b/L2J_Mobius_Classic_2.3_SevenSigns/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java @@ -46,9 +46,15 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket { OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet); packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish - packet.writeD(_players.size()); + packet.writeD(Math.min(_players.size(), 25)); + int counter = 0; for (Entry entry : _players.entrySet()) { + counter++; + if (counter > 25) + { + break; + } packet.writeS(entry.getKey().getName()); packet.writeD(entry.getValue()); } diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java index 368d070357..bba93345ac 100644 --- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java +++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java @@ -46,9 +46,15 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket { OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet); packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish - packet.writeD(_players.size()); + packet.writeD(Math.min(_players.size(), 25)); + int counter = 0; for (Entry entry : _players.entrySet()) { + counter++; + if (counter > 25) + { + break; + } packet.writeS(entry.getKey().getName()); packet.writeD(entry.getValue()); } diff --git a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java index 368d070357..bba93345ac 100644 --- a/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java +++ b/L2J_Mobius_Classic_3.0_TheKamael/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java @@ -46,9 +46,15 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket { OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet); packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish - packet.writeD(_players.size()); + packet.writeD(Math.min(_players.size(), 25)); + int counter = 0; for (Entry entry : _players.entrySet()) { + counter++; + if (counter > 25) + { + break; + } packet.writeS(entry.getKey().getName()); packet.writeD(entry.getValue()); } diff --git a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java index 368d070357..bba93345ac 100644 --- a/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java +++ b/L2J_Mobius_Classic_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/ExPVPMatchCCRecord.java @@ -46,9 +46,15 @@ public class ExPVPMatchCCRecord implements IClientOutgoingPacket { OutgoingPackets.EX_PVP_MATCH_CCRECORD.writeId(packet); packet.writeD(_state); // 0 - initialize, 1 - update, 2 - finish - packet.writeD(_players.size()); + packet.writeD(Math.min(_players.size(), 25)); + int counter = 0; for (Entry entry : _players.entrySet()) { + counter++; + if (counter > 25) + { + break; + } packet.writeS(entry.getKey().getName()); packet.writeD(entry.getValue()); }