From d805412c9e0762989bbb6fbd8c88f98f503a0d0f Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Fri, 29 Sep 2017 12:53:10 +0000 Subject: [PATCH] Clan entry improvements. Contributed by Liamxroy. --- .../RequestPledgeRecruitApplyInfo.java | 7 +++-- .../RequestPledgeRecruitInfo.java | 3 +- .../ExPledgeRecruitBoardSearch.java | 4 +-- .../serverpackets/ExPledgeRecruitInfo.java | 28 +++++++------------ .../RequestPledgeRecruitApplyInfo.java | 7 +++-- .../RequestPledgeRecruitInfo.java | 3 +- .../ExPledgeRecruitBoardSearch.java | 4 +-- .../serverpackets/ExPledgeRecruitInfo.java | 28 +++++++------------ .../RequestPledgeRecruitApplyInfo.java | 7 +++-- .../RequestPledgeRecruitInfo.java | 3 +- .../ExPledgeRecruitBoardSearch.java | 4 +-- .../serverpackets/ExPledgeRecruitInfo.java | 28 +++++++------------ .../RequestPledgeRecruitApplyInfo.java | 7 +++-- .../RequestPledgeRecruitInfo.java | 3 +- .../ExPledgeRecruitBoardSearch.java | 4 +-- .../serverpackets/ExPledgeRecruitInfo.java | 28 +++++++------------ 16 files changed, 72 insertions(+), 96 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java index 2fab1b0b95..4cee4b06ff 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java @@ -43,7 +43,7 @@ public class RequestPledgeRecruitApplyInfo implements IClientIncomingPacket return; } - ClanEntryStatus status = ClanEntryStatus.DEFAULT; + final ClanEntryStatus status; if ((activeChar.getClan() != null) && activeChar.isClanLeader() && ClanEntryManager.getInstance().isClanRegistred(activeChar.getClanId())) { @@ -53,8 +53,11 @@ public class RequestPledgeRecruitApplyInfo implements IClientIncomingPacket { status = ClanEntryStatus.WAITING; } + else + { + status = ClanEntryStatus.DEFAULT; + } activeChar.sendPacket(new ExPledgeRecruitApplyInfo(status)); } - } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java index d60c38bee0..ea904f82a4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java @@ -52,7 +52,6 @@ public class RequestPledgeRecruitInfo implements IClientIncomingPacket return; } - client.sendPacket(new ExPledgeRecruitInfo(_clanId)); + activeChar.sendPacket(new ExPledgeRecruitInfo(_clanId)); } - } diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index bfeb2ac50d..ba1cd8ab85 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -64,8 +64,8 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket for (int i = _startIndex; i < _endIndex; i++) { final L2Clan clan = _clanList.get(i).getClan(); - packet.writeD(clan.getRank()); - packet.writeD(clan.getReputationScore()); + packet.writeD(clan.getCrestId()); + packet.writeD(clan.getAllyCrestId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getLevel()); diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 905e3be7f2..0862cdc33b 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -18,9 +18,8 @@ package com.l2jmobius.gameserver.network.serverpackets; import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.gameserver.data.sql.impl.ClanTable; -import com.l2jmobius.gameserver.instancemanager.ClanEntryManager; import com.l2jmobius.gameserver.model.L2Clan; -import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo; +import com.l2jmobius.gameserver.model.L2Clan.SubPledge; import com.l2jmobius.gameserver.network.OutgoingPackets; /** @@ -28,12 +27,10 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { - private final PledgeRecruitInfo _pledgeRecruitInfo; private final L2Clan _clan; public ExPledgeRecruitInfo(int clanId) { - _pledgeRecruitInfo = ClanEntryManager.getInstance().getClanById(clanId); _clan = ClanTable.getInstance().getClan(clanId); } @@ -42,21 +39,16 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - if (_pledgeRecruitInfo == null) + final SubPledge[] subPledges = _clan.getAllSubPledges(); + packet.writeS(_clan.getName()); + packet.writeS(_clan.getLeaderName()); + packet.writeD(_clan.getLevel()); + packet.writeD(_clan.getMembersCount()); + packet.writeD(subPledges.length); + for (SubPledge subPledge : subPledges) { - packet.writeS(_clan.getName()); - packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getLevel()); - packet.writeD(_clan.getMembersCount()); - packet.writeD(0x00); - } - else - { - packet.writeS(_pledgeRecruitInfo.getClan().getName()); - packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); - packet.writeD(_pledgeRecruitInfo.getClan().getLevel()); - packet.writeD(_pledgeRecruitInfo.getClan().getMembersCount()); - packet.writeD(_pledgeRecruitInfo.getKarma()); + packet.writeD(subPledge.getId()); + packet.writeS(subPledge.getName()); } return true; } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java index 2fab1b0b95..4cee4b06ff 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java @@ -43,7 +43,7 @@ public class RequestPledgeRecruitApplyInfo implements IClientIncomingPacket return; } - ClanEntryStatus status = ClanEntryStatus.DEFAULT; + final ClanEntryStatus status; if ((activeChar.getClan() != null) && activeChar.isClanLeader() && ClanEntryManager.getInstance().isClanRegistred(activeChar.getClanId())) { @@ -53,8 +53,11 @@ public class RequestPledgeRecruitApplyInfo implements IClientIncomingPacket { status = ClanEntryStatus.WAITING; } + else + { + status = ClanEntryStatus.DEFAULT; + } activeChar.sendPacket(new ExPledgeRecruitApplyInfo(status)); } - } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java index d60c38bee0..ea904f82a4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java @@ -52,7 +52,6 @@ public class RequestPledgeRecruitInfo implements IClientIncomingPacket return; } - client.sendPacket(new ExPledgeRecruitInfo(_clanId)); + activeChar.sendPacket(new ExPledgeRecruitInfo(_clanId)); } - } diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index bfeb2ac50d..ba1cd8ab85 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -64,8 +64,8 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket for (int i = _startIndex; i < _endIndex; i++) { final L2Clan clan = _clanList.get(i).getClan(); - packet.writeD(clan.getRank()); - packet.writeD(clan.getReputationScore()); + packet.writeD(clan.getCrestId()); + packet.writeD(clan.getAllyCrestId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getLevel()); diff --git a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 905e3be7f2..0862cdc33b 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -18,9 +18,8 @@ package com.l2jmobius.gameserver.network.serverpackets; import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.gameserver.data.sql.impl.ClanTable; -import com.l2jmobius.gameserver.instancemanager.ClanEntryManager; import com.l2jmobius.gameserver.model.L2Clan; -import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo; +import com.l2jmobius.gameserver.model.L2Clan.SubPledge; import com.l2jmobius.gameserver.network.OutgoingPackets; /** @@ -28,12 +27,10 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { - private final PledgeRecruitInfo _pledgeRecruitInfo; private final L2Clan _clan; public ExPledgeRecruitInfo(int clanId) { - _pledgeRecruitInfo = ClanEntryManager.getInstance().getClanById(clanId); _clan = ClanTable.getInstance().getClan(clanId); } @@ -42,21 +39,16 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - if (_pledgeRecruitInfo == null) + final SubPledge[] subPledges = _clan.getAllSubPledges(); + packet.writeS(_clan.getName()); + packet.writeS(_clan.getLeaderName()); + packet.writeD(_clan.getLevel()); + packet.writeD(_clan.getMembersCount()); + packet.writeD(subPledges.length); + for (SubPledge subPledge : subPledges) { - packet.writeS(_clan.getName()); - packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getLevel()); - packet.writeD(_clan.getMembersCount()); - packet.writeD(0x00); - } - else - { - packet.writeS(_pledgeRecruitInfo.getClan().getName()); - packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); - packet.writeD(_pledgeRecruitInfo.getClan().getLevel()); - packet.writeD(_pledgeRecruitInfo.getClan().getMembersCount()); - packet.writeD(_pledgeRecruitInfo.getKarma()); + packet.writeD(subPledge.getId()); + packet.writeS(subPledge.getName()); } return true; } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java index 2fab1b0b95..4cee4b06ff 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java @@ -43,7 +43,7 @@ public class RequestPledgeRecruitApplyInfo implements IClientIncomingPacket return; } - ClanEntryStatus status = ClanEntryStatus.DEFAULT; + final ClanEntryStatus status; if ((activeChar.getClan() != null) && activeChar.isClanLeader() && ClanEntryManager.getInstance().isClanRegistred(activeChar.getClanId())) { @@ -53,8 +53,11 @@ public class RequestPledgeRecruitApplyInfo implements IClientIncomingPacket { status = ClanEntryStatus.WAITING; } + else + { + status = ClanEntryStatus.DEFAULT; + } activeChar.sendPacket(new ExPledgeRecruitApplyInfo(status)); } - } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java index d60c38bee0..ea904f82a4 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java @@ -52,7 +52,6 @@ public class RequestPledgeRecruitInfo implements IClientIncomingPacket return; } - client.sendPacket(new ExPledgeRecruitInfo(_clanId)); + activeChar.sendPacket(new ExPledgeRecruitInfo(_clanId)); } - } diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index 37f91dc7d5..e21f221114 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -64,8 +64,8 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket for (int i = _startIndex; i < _endIndex; i++) { final L2Clan clan = _clanList.get(i).getClan(); - packet.writeD(clan.getRank()); - packet.writeD(clan.getReputationScore()); + packet.writeD(clan.getCrestId()); + packet.writeD(clan.getAllyCrestId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getLevel()); diff --git a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 905e3be7f2..0862cdc33b 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -18,9 +18,8 @@ package com.l2jmobius.gameserver.network.serverpackets; import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.gameserver.data.sql.impl.ClanTable; -import com.l2jmobius.gameserver.instancemanager.ClanEntryManager; import com.l2jmobius.gameserver.model.L2Clan; -import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo; +import com.l2jmobius.gameserver.model.L2Clan.SubPledge; import com.l2jmobius.gameserver.network.OutgoingPackets; /** @@ -28,12 +27,10 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { - private final PledgeRecruitInfo _pledgeRecruitInfo; private final L2Clan _clan; public ExPledgeRecruitInfo(int clanId) { - _pledgeRecruitInfo = ClanEntryManager.getInstance().getClanById(clanId); _clan = ClanTable.getInstance().getClan(clanId); } @@ -42,21 +39,16 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - if (_pledgeRecruitInfo == null) + final SubPledge[] subPledges = _clan.getAllSubPledges(); + packet.writeS(_clan.getName()); + packet.writeS(_clan.getLeaderName()); + packet.writeD(_clan.getLevel()); + packet.writeD(_clan.getMembersCount()); + packet.writeD(subPledges.length); + for (SubPledge subPledge : subPledges) { - packet.writeS(_clan.getName()); - packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getLevel()); - packet.writeD(_clan.getMembersCount()); - packet.writeD(0x00); - } - else - { - packet.writeS(_pledgeRecruitInfo.getClan().getName()); - packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); - packet.writeD(_pledgeRecruitInfo.getClan().getLevel()); - packet.writeD(_pledgeRecruitInfo.getClan().getMembersCount()); - packet.writeD(_pledgeRecruitInfo.getKarma()); + packet.writeD(subPledge.getId()); + packet.writeS(subPledge.getName()); } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java index 2fab1b0b95..4cee4b06ff 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java @@ -43,7 +43,7 @@ public class RequestPledgeRecruitApplyInfo implements IClientIncomingPacket return; } - ClanEntryStatus status = ClanEntryStatus.DEFAULT; + final ClanEntryStatus status; if ((activeChar.getClan() != null) && activeChar.isClanLeader() && ClanEntryManager.getInstance().isClanRegistred(activeChar.getClanId())) { @@ -53,8 +53,11 @@ public class RequestPledgeRecruitApplyInfo implements IClientIncomingPacket { status = ClanEntryStatus.WAITING; } + else + { + status = ClanEntryStatus.DEFAULT; + } activeChar.sendPacket(new ExPledgeRecruitApplyInfo(status)); } - } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java index d60c38bee0..ea904f82a4 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java @@ -52,7 +52,6 @@ public class RequestPledgeRecruitInfo implements IClientIncomingPacket return; } - client.sendPacket(new ExPledgeRecruitInfo(_clanId)); + activeChar.sendPacket(new ExPledgeRecruitInfo(_clanId)); } - } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java index 37f91dc7d5..e21f221114 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java @@ -64,8 +64,8 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket for (int i = _startIndex; i < _endIndex; i++) { final L2Clan clan = _clanList.get(i).getClan(); - packet.writeD(clan.getRank()); - packet.writeD(clan.getReputationScore()); + packet.writeD(clan.getCrestId()); + packet.writeD(clan.getAllyCrestId()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getLevel()); diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java index 905e3be7f2..0862cdc33b 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java @@ -18,9 +18,8 @@ package com.l2jmobius.gameserver.network.serverpackets; import com.l2jmobius.commons.network.PacketWriter; import com.l2jmobius.gameserver.data.sql.impl.ClanTable; -import com.l2jmobius.gameserver.instancemanager.ClanEntryManager; import com.l2jmobius.gameserver.model.L2Clan; -import com.l2jmobius.gameserver.model.clan.entry.PledgeRecruitInfo; +import com.l2jmobius.gameserver.model.L2Clan.SubPledge; import com.l2jmobius.gameserver.network.OutgoingPackets; /** @@ -28,12 +27,10 @@ import com.l2jmobius.gameserver.network.OutgoingPackets; */ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { - private final PledgeRecruitInfo _pledgeRecruitInfo; private final L2Clan _clan; public ExPledgeRecruitInfo(int clanId) { - _pledgeRecruitInfo = ClanEntryManager.getInstance().getClanById(clanId); _clan = ClanTable.getInstance().getClan(clanId); } @@ -42,21 +39,16 @@ public class ExPledgeRecruitInfo implements IClientOutgoingPacket { OutgoingPackets.EX_PLEDGE_RECRUIT_INFO.writeId(packet); - if (_pledgeRecruitInfo == null) + final SubPledge[] subPledges = _clan.getAllSubPledges(); + packet.writeS(_clan.getName()); + packet.writeS(_clan.getLeaderName()); + packet.writeD(_clan.getLevel()); + packet.writeD(_clan.getMembersCount()); + packet.writeD(subPledges.length); + for (SubPledge subPledge : subPledges) { - packet.writeS(_clan.getName()); - packet.writeS(_clan.getLeaderName()); - packet.writeD(_clan.getLevel()); - packet.writeD(_clan.getMembersCount()); - packet.writeD(0x00); - } - else - { - packet.writeS(_pledgeRecruitInfo.getClan().getName()); - packet.writeS(_pledgeRecruitInfo.getClan().getLeaderName()); - packet.writeD(_pledgeRecruitInfo.getClan().getLevel()); - packet.writeD(_pledgeRecruitInfo.getClan().getMembersCount()); - packet.writeD(_pledgeRecruitInfo.getKarma()); + packet.writeD(subPledge.getId()); + packet.writeS(subPledge.getName()); } return true; }