From c79c89d95efbd1daab7a60dff63b738a7a2a8c6b Mon Sep 17 00:00:00 2001 From: MobiusDev <8391001+MobiusDevelopment@users.noreply.github.com> Date: Sat, 9 Sep 2017 19:33:17 +0000 Subject: [PATCH] Proper fix for RequestPledgeRecruitBoardSearch packet. --- .../clientpackets/RequestPledgeRecruitBoardSearch.java | 3 --- .../network/serverpackets/ExPledgeRecruitBoardSearch.java | 4 ++-- .../clientpackets/RequestPledgeRecruitBoardSearch.java | 3 --- .../network/serverpackets/ExPledgeRecruitBoardSearch.java | 4 ++-- .../clientpackets/RequestPledgeRecruitBoardSearch.java | 3 --- .../network/serverpackets/ExPledgeRecruitBoardSearch.java | 8 ++++---- .../clientpackets/RequestPledgeRecruitBoardSearch.java | 3 --- .../network/serverpackets/ExPledgeRecruitBoardSearch.java | 8 ++++---- 8 files changed, 12 insertions(+), 24 deletions(-) diff --git a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java index 596efb9e47..b7d2a736b4 100644 --- a/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java @@ -73,8 +73,5 @@ public class RequestPledgeRecruitBoardSearch implements IClientIncomingPacket { activeChar.sendPacket(new ExPledgeRecruitBoardSearch(ClanEntryManager.getInstance().getSortedClanListByName(_query.toLowerCase(), _type), _page)); } - - // tempfix for clan entry hiding clan crest - activeChar.sendInfo(activeChar); } } 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 cdec29a9ef..bfeb2ac50d 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.getAllyCrestId()); - packet.writeD(clan.getCrestId()); + packet.writeD(clan.getRank()); + packet.writeD(clan.getReputationScore()); 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/clientpackets/RequestPledgeRecruitBoardSearch.java b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java index 596efb9e47..b7d2a736b4 100644 --- a/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java @@ -73,8 +73,5 @@ public class RequestPledgeRecruitBoardSearch implements IClientIncomingPacket { activeChar.sendPacket(new ExPledgeRecruitBoardSearch(ClanEntryManager.getInstance().getSortedClanListByName(_query.toLowerCase(), _type), _page)); } - - // tempfix for clan entry hiding clan crest - activeChar.sendInfo(activeChar); } } 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 cdec29a9ef..bfeb2ac50d 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.getAllyCrestId()); - packet.writeD(clan.getCrestId()); + packet.writeD(clan.getRank()); + packet.writeD(clan.getReputationScore()); 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/clientpackets/RequestPledgeRecruitBoardSearch.java b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java index 0d808d8535..5de5673b57 100644 --- a/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java @@ -76,8 +76,5 @@ public class RequestPledgeRecruitBoardSearch implements IClientIncomingPacket { activeChar.sendPacket(new ExPledgeRecruitBoardSearch(ClanEntryManager.getInstance().getSortedClanListByName(_query.toLowerCase(), _type), _page)); } - - // tempfix for clan entry hiding clan crest - activeChar.sendInfo(activeChar); } } 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 cdec29a9ef..37f91dc7d5 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,16 +64,16 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket for (int i = _startIndex; i < _endIndex; i++) { final L2Clan clan = _clanList.get(i).getClan(); - packet.writeD(clan.getAllyCrestId()); - packet.writeD(clan.getCrestId()); + packet.writeD(clan.getRank()); + packet.writeD(clan.getReputationScore()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getLevel()); packet.writeD(clan.getMembersCount()); packet.writeD(_clanList.get(i).getKarma()); packet.writeS(_clanList.get(i).getInformation()); - packet.writeD(_clanList.get(i).getApplicationType()); - packet.writeD(_clanList.get(i).getRecruitType()); + packet.writeD(_clanList.get(i).getApplicationType()); // Helios + packet.writeD(_clanList.get(i).getRecruitType()); // Helios } return true; } diff --git a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java index 0d808d8535..5de5673b57 100644 --- a/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java +++ b/L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitBoardSearch.java @@ -76,8 +76,5 @@ public class RequestPledgeRecruitBoardSearch implements IClientIncomingPacket { activeChar.sendPacket(new ExPledgeRecruitBoardSearch(ClanEntryManager.getInstance().getSortedClanListByName(_query.toLowerCase(), _type), _page)); } - - // tempfix for clan entry hiding clan crest - activeChar.sendInfo(activeChar); } } 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 cdec29a9ef..37f91dc7d5 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,16 +64,16 @@ public class ExPledgeRecruitBoardSearch implements IClientOutgoingPacket for (int i = _startIndex; i < _endIndex; i++) { final L2Clan clan = _clanList.get(i).getClan(); - packet.writeD(clan.getAllyCrestId()); - packet.writeD(clan.getCrestId()); + packet.writeD(clan.getRank()); + packet.writeD(clan.getReputationScore()); packet.writeS(clan.getName()); packet.writeS(clan.getLeaderName()); packet.writeD(clan.getLevel()); packet.writeD(clan.getMembersCount()); packet.writeD(_clanList.get(i).getKarma()); packet.writeS(_clanList.get(i).getInformation()); - packet.writeD(_clanList.get(i).getApplicationType()); - packet.writeD(_clanList.get(i).getRecruitType()); + packet.writeD(_clanList.get(i).getApplicationType()); // Helios + packet.writeD(_clanList.get(i).getRecruitType()); // Helios } return true; }