lineage2/l2j_mobius
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clan entry improvements.

Browse Source 
Contributed by Liamxroy.
This commit is contained in:
MobiusDev 2017-09-29 12:53:10 +00:00
parent e05e40c3f8
commit d805412c9e
16 changed files with 72 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java
View File

@ -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));
}
}

3
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java
View File

@ -52,7 +52,6 @@ public class RequestPledgeRecruitInfo implements IClientIncomingPacket
return;
}
client.sendPacket(new ExPledgeRecruitInfo(_clanId));
activeChar.sendPacket(new ExPledgeRecruitInfo(_clanId));
}
}

4
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java
View File

@ -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());

28
L2J_Mobius_1.0_Ertheia/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java
View File

@ -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;
}

7
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java
View File

@ -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));
}
}

3
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java
View File

@ -52,7 +52,6 @@ public class RequestPledgeRecruitInfo implements IClientIncomingPacket
return;
}
client.sendPacket(new ExPledgeRecruitInfo(_clanId));
activeChar.sendPacket(new ExPledgeRecruitInfo(_clanId));
}
}

4
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java
View File

@ -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());

28
L2J_Mobius_2.5_Underground/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java
View File

@ -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;
}

7
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java
View File

@ -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));
}
}

3
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java
View File

@ -52,7 +52,6 @@ public class RequestPledgeRecruitInfo implements IClientIncomingPacket
return;
}
client.sendPacket(new ExPledgeRecruitInfo(_clanId));
activeChar.sendPacket(new ExPledgeRecruitInfo(_clanId));
}
}

4
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java
View File

@ -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());

28
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java
View File

@ -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;
}

7
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitApplyInfo.java
View File

@ -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));
}
}

3
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/clientpackets/RequestPledgeRecruitInfo.java
View File

@ -52,7 +52,6 @@ public class RequestPledgeRecruitInfo implements IClientIncomingPacket
return;
}
client.sendPacket(new ExPledgeRecruitInfo(_clanId));
activeChar.sendPacket(new ExPledgeRecruitInfo(_clanId));
}
}

4
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitBoardSearch.java
View File

@ -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());

28
L2J_Mobius_Classic_2.0_Saviors/java/com/l2jmobius/gameserver/network/serverpackets/ExPledgeRecruitInfo.java
View File

@ -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;
}