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

Pledge related serverpacket cleanup.

Browse Source
This commit is contained in:
MobiusDevelopment 2021-12-04 01:37:24 +00:00
parent 3925ef205d
commit 01cada5a1f
21 changed files with 34 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
View File

@ -56,7 +56,7 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket
packet.writeS(_member.getClan().getAllyName());
packet.writeD(_member.getClan().getAllyCrestId());
packet.writeD(_member.getClan().isAtWar());// new c3
packet.writeD(_member.getClan().isAtWar()); // new c3
packet.writeD(_member.getClan().getMembers().size() - 1);
for (ClanMember m : _member.getClan().getMembers())

3
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java
View File

@ -28,9 +28,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket
{
private final ClanMember _member;
/**
* @param member
*/
public PledgeReceivePowerInfo(ClanMember member)
{
_member = member;

3
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
View File

@ -27,9 +27,6 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket
{
private final SubPledge _subPledge;
/**
* @param subPledge
*/
public PledgeReceiveSubPledgeCreated(SubPledge subPledge)
{
_subPledge = subPledge;

6
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
View File

@ -21,9 +21,6 @@ import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
* @version $Revision: 1.2.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
public class PledgeShowInfoUpdate implements IClientOutgoingPacket
{
private final Clan _clan;
@ -36,7 +33,6 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket
@Override
public boolean write(PacketWriter packet)
{
final int TOP = ClanTable.getInstance().getTopRate(_clan.getClanId());
// ddddddddddSdd
OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet);
// sending empty data so client will ask all the info in response ;)
@ -45,7 +41,7 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket
packet.writeD(_clan.getLevel()); // clan level
packet.writeD(_clan.getFortId() != 0 ? _clan.getFortId() : _clan.getCastleId());
packet.writeD(_clan.getHideoutId());
packet.writeD(TOP);
packet.writeD(ClanTable.getInstance().getTopRate(_clan.getClanId()));
packet.writeD(_clan.getReputationScore()); // clan reputation score
packet.writeD(0);
packet.writeD(0);

11
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java
View File

@ -21,15 +21,12 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.ClanMember;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
* @version $Revision: 1.3.2.1.2.4 $ $Date: 2005/03/27 15:29:39 $
*/
public class PledgeShowMemberListAdd implements IClientOutgoingPacket
{
private String _name;
private int _level;
private int _classId;
private int _objectId;
private int _isOnline;
private int _pledgeType;
public PledgeShowMemberListAdd(Player player)
@ -37,7 +34,7 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket
_name = player.getName();
_level = player.getLevel();
_classId = player.getClassId().getId();
_objectId = player.isOnline() ? player.getObjectId() : 0;
_isOnline = player.isOnline() ? player.getObjectId() : 0;
_pledgeType = player.getPledgeType();
}
@ -48,7 +45,7 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket
_name = cm.getName();
_level = cm.getLevel();
_classId = cm.getClassId();
_objectId = cm.isOnline() ? cm.getObjectId() : 0;
_isOnline = cm.isOnline() ? cm.getObjectId() : 0;
_pledgeType = cm.getPledgeType();
}
catch (Exception e)
@ -65,7 +62,7 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket
packet.writeD(_classId);
packet.writeD(0);
packet.writeD(1);
packet.writeD(_objectId); // 1=online 0=offline?
packet.writeD(_isOnline);
packet.writeD(_pledgeType);
return true;
}

11
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
View File

@ -23,13 +23,6 @@ import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.model.clan.ClanMember;
import org.l2jmobius.gameserver.network.OutgoingPackets;
//
/**
* sample 0000: 68 b1010000 48 00 61 00 6d 00 62 00 75 00 72 00 67 00 00 00 H.a.m.b.u.r.g... 43 00 61 00 6c 00 61 00 64 00 6f 00 6e 00 00 00 C.a.l.a.d.o.n... 00000000 crestid | not used (nuocnam) 00000000 00000000 00000000 00000000 22000000 00000000 00000000 00000000 ally id 00 00 ally name 00000000
* ally crrest id 02000000 6c 00 69 00 74 00 68 00 69 00 75 00 6d 00 31 00 00 00 l.i.t.h.i.u.m... 0d000000 level 12000000 class id 00000000 01000000 offline 1=true 00000000 45 00 6c 00 61 00 6e 00 61 00 00 00 E.l.a.n.a... 08000000 19000000 01000000 01000000 00000000 format dSS dddddddddSdd d
* (Sddddd) dddSS dddddddddSdd d (Sdddddd)
* @version $Revision: 1.6.2.2.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
public class PledgeShowMemberListAll implements IClientOutgoingPacket
{
private final Clan _clan;
@ -61,12 +54,12 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
packet.writeS(_clan.getAllyName());
packet.writeD(_clan.getAllyCrestId());
packet.writeD(_clan.isAtWar());// new c3
packet.writeD(_clan.isAtWar()); // new c3
packet.writeD(_clan.getMembers().size() - 1);
for (ClanMember m : _clan.getMembers())
{
// TODO is this c4?
// On C4 player is not shown.
if (m.getObjectId() == _player.getObjectId())
{
continue;

3
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java
View File

@ -19,9 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
* @version $Revision: 1.2.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
public class PledgeShowMemberListDelete implements IClientOutgoingPacket
{
private final String _player;

3
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java
View File

@ -19,9 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
* @version $Revision: 1.2.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
public class PledgeShowMemberListDeleteAll implements IClientOutgoingPacket
{
@Override

15
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
View File

@ -33,13 +33,12 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket
private final String _name;
private final int _level;
private final int _classId;
private final int _objectId;
private final boolean _isOnline;
private final int _isOnline;
public PledgeShowMemberListUpdate(Player player)
{
_player = player;
_pledgeType = player.getPledgeType();
_pledgeType = _player.getPledgeType();
if (_pledgeType == Clan.SUBUNIT_ACADEMY)
{
_hasSponsor = _player.getSponsor() != 0 ? 1 : 0;
@ -55,8 +54,7 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket
_name = _player.getName();
_level = _player.getLevel();
_classId = _player.getClassId().getId();
_objectId = _player.getObjectId();
_isOnline = _player.isOnline();
_isOnline = _player.isOnline() ? _player.getObjectId() : 0;
}
public PledgeShowMemberListUpdate(ClanMember player)
@ -65,8 +63,7 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket
_name = player.getName();
_level = player.getLevel();
_classId = player.getClassId();
_objectId = player.getObjectId();
_isOnline = _player.isOnline();
_isOnline = player.isOnline() ? player.getObjectId() : 0;
_pledgeType = player.getPledgeType();
if (_pledgeType == Clan.SUBUNIT_ACADEMY)
{
@ -90,8 +87,8 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket
packet.writeD(_level);
packet.writeD(_classId);
packet.writeD(0);
packet.writeD(_objectId);
packet.writeD(_isOnline ? 1 : 0); // 1=online 0=offline
packet.writeD(1);
packet.writeD(_isOnline);
packet.writeD(_pledgeType);
packet.writeD(_hasSponsor);
return true;

4
L2J_Mobius_C4_ScionsOfDestiny/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java
View File

@ -31,10 +31,6 @@ public class PledgeSkillList implements IClientOutgoingPacket
{
private final Collection<Skill> _skills;
/**
* Instantiates a new pledge skill list.
* @param clan the clan
*/
public PledgeSkillList(Clan clan)
{
_skills = clan.getAllSkills();

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveMemberInfo.java
View File

@ -27,9 +27,6 @@ public class PledgeReceiveMemberInfo implements IClientOutgoingPacket
{
private final ClanMember _member;
/**
* @param member
*/
public PledgeReceiveMemberInfo(ClanMember member)
{
_member = member;

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceivePowerInfo.java
View File

@ -28,9 +28,6 @@ public class PledgeReceivePowerInfo implements IClientOutgoingPacket
{
private final ClanMember _member;
/**
* @param member
*/
public PledgeReceivePowerInfo(ClanMember member)
{
_member = member;

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeReceiveSubPledgeCreated.java
View File

@ -27,9 +27,6 @@ public class PledgeReceiveSubPledgeCreated implements IClientOutgoingPacket
{
private final SubPledge _subPledge;
/**
* @param subPledge
*/
public PledgeReceiveSubPledgeCreated(SubPledge subPledge)
{
_subPledge = subPledge;

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowInfoUpdate.java
View File

@ -21,9 +21,6 @@ import org.l2jmobius.gameserver.data.sql.ClanTable;
import org.l2jmobius.gameserver.model.clan.Clan;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
* @version $Revision: 1.2.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
public class PledgeShowInfoUpdate implements IClientOutgoingPacket
{
private final Clan _clan;
@ -36,7 +33,6 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket
@Override
public boolean write(PacketWriter packet)
{
final int TOP = ClanTable.getInstance().getTopRate(_clan.getClanId());
// ddddddddddSdd
OutgoingPackets.PLEDGE_SHOW_INFO_UPDATE.writeId(packet);
// sending empty data so client will ask all the info in response ;)
@ -45,7 +41,7 @@ public class PledgeShowInfoUpdate implements IClientOutgoingPacket
packet.writeD(_clan.getLevel()); // clan level
packet.writeD(_clan.getFortId() != 0 ? _clan.getFortId() : _clan.getCastleId());
packet.writeD(_clan.getHideoutId());
packet.writeD(TOP);
packet.writeD(ClanTable.getInstance().getTopRate(_clan.getClanId()));
packet.writeD(_clan.getReputationScore()); // clan reputation score
packet.writeD(0);
packet.writeD(0);

11
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAdd.java
View File

@ -21,15 +21,12 @@ import org.l2jmobius.gameserver.model.actor.Player;
import org.l2jmobius.gameserver.model.clan.ClanMember;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
* @version $Revision: 1.3.2.1.2.4 $ $Date: 2005/03/27 15:29:39 $
*/
public class PledgeShowMemberListAdd implements IClientOutgoingPacket
{
private String _name;
private int _level;
private int _classId;
private int _objectId;
private int _isOnline;
private int _pledgeType;
public PledgeShowMemberListAdd(Player player)
@ -37,7 +34,7 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket
_name = player.getName();
_level = player.getLevel();
_classId = player.getClassId().getId();
_objectId = player.isOnline() ? player.getObjectId() : 0;
_isOnline = player.isOnline() ? player.getObjectId() : 0;
_pledgeType = player.getPledgeType();
}
@ -48,7 +45,7 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket
_name = cm.getName();
_level = cm.getLevel();
_classId = cm.getClassId();
_objectId = cm.isOnline() ? cm.getObjectId() : 0;
_isOnline = cm.isOnline() ? cm.getObjectId() : 0;
_pledgeType = cm.getPledgeType();
}
catch (Exception e)
@ -65,7 +62,7 @@ public class PledgeShowMemberListAdd implements IClientOutgoingPacket
packet.writeD(_classId);
packet.writeD(0);
packet.writeD(1);
packet.writeD(_objectId); // 1=online 0=offline?
packet.writeD(_isOnline);
packet.writeD(_pledgeType);
return true;
}

20
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListAll.java
View File

@ -26,13 +26,6 @@ import org.l2jmobius.gameserver.model.clan.Clan.SubPledge;
import org.l2jmobius.gameserver.model.clan.ClanMember;
import org.l2jmobius.gameserver.network.OutgoingPackets;
//
/**
* sample 0000: 68 b1010000 48 00 61 00 6d 00 62 00 75 00 72 00 67 00 00 00 H.a.m.b.u.r.g... 43 00 61 00 6c 00 61 00 64 00 6f 00 6e 00 00 00 C.a.l.a.d.o.n... 00000000 crestid | not used (nuocnam) 00000000 00000000 00000000 00000000 22000000 00000000 00000000 00000000 ally id 00 00 ally name 00000000
* ally crrest id 02000000 6c 00 69 00 74 00 68 00 69 00 75 00 6d 00 31 00 00 00 l.i.t.h.i.u.m... 0d000000 level 12000000 class id 00000000 01000000 offline 1=true 00000000 45 00 6c 00 61 00 6e 00 61 00 00 00 E.l.a.n.a... 08000000 19000000 01000000 01000000 00000000 format dSS dddddddddSdd d
* (Sddddd) dddSS dddddddddSdd d (Sdddddd)
* @version $Revision: 1.6.2.2.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
public class PledgeShowMemberListAll implements IClientOutgoingPacket
{
private final Clan _clan;
@ -40,8 +33,6 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
private final Collection<ClanMember> _members;
private int _pledgeType;
// private static final Logger LOGGER = Logger.getLogger(PledgeShowMemberListAll.class);
public PledgeShowMemberListAll(Clan clan, Player player)
{
_clan = clan;
@ -69,14 +60,13 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
_player.sendPacket(new PledgeShowMemberListAdd(m));
}
// unless this is sent sometimes, the client doesn't recognise the player as the leader
// unless this is sent sometimes, the client doesn't recognize the player as the leader
_player.sendPacket(new UserInfo(_player));
return true;
}
void writePledge(PacketWriter packet, int mainOrSubpledge)
{
final int TOP = ClanTable.getInstance().getTopRate(_clan.getClanId());
OutgoingPackets.PLEDGE_SHOW_MEMBER_LIST_ALL.writeId(packet);
packet.writeD(mainOrSubpledge); // c5 main clan 0 or any subpledge 1?
@ -89,7 +79,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
packet.writeD(_clan.getLevel());
packet.writeD(_clan.getCastleId());
packet.writeD(_clan.getHideoutId());
packet.writeD(TOP);
packet.writeD(ClanTable.getInstance().getTopRate(_clan.getClanId()));
packet.writeD(_clan.getReputationScore()); // was activechar level
packet.writeD(0); // 0
packet.writeD(0); // 0
@ -107,6 +97,7 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
{
continue;
}
if (m.getPledgeType() == -1)
{
yellow = m.getSponsor() != 0 ? 1 : 0;
@ -119,12 +110,13 @@ public class PledgeShowMemberListAll implements IClientOutgoingPacket
{
yellow = 0;
}
packet.writeS(m.getName());
packet.writeD(m.getLevel());
packet.writeD(m.getClassId());
packet.writeD(0);
packet.writeD(m.getObjectId());
packet.writeD(m.isOnline() ? 1 : 0);
packet.writeD(1);
packet.writeD(m.isOnline() || (_player.getObjectId() == m.getObjectId()) ? m.getObjectId() : 0);
packet.writeD(yellow);
}
}

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDelete.java
View File

@ -19,9 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
* @version $Revision: 1.2.2.1.2.3 $ $Date: 2005/03/27 15:29:39 $
*/
public class PledgeShowMemberListDelete implements IClientOutgoingPacket
{
private final String _player;

3
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListDeleteAll.java
View File

@ -19,9 +19,6 @@ package org.l2jmobius.gameserver.network.serverpackets;
import org.l2jmobius.commons.network.PacketWriter;
import org.l2jmobius.gameserver.network.OutgoingPackets;
/**
* @version $Revision: 1.2.2.1.2.3 $ $Date: 2005/03/27 15:29:57 $
*/
public class PledgeShowMemberListDeleteAll implements IClientOutgoingPacket
{
@Override

15
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeShowMemberListUpdate.java
View File

@ -33,13 +33,12 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket
private final String _name;
private final int _level;
private final int _classId;
private final int _objectId;
private final boolean _isOnline;
private final int _isOnline;
public PledgeShowMemberListUpdate(Player player)
{
_player = player;
_pledgeType = player.getPledgeType();
_pledgeType = _player.getPledgeType();
if (_pledgeType == Clan.SUBUNIT_ACADEMY)
{
_hasSponsor = _player.getSponsor() != 0 ? 1 : 0;
@ -55,8 +54,7 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket
_name = _player.getName();
_level = _player.getLevel();
_classId = _player.getClassId().getId();
_objectId = _player.getObjectId();
_isOnline = _player.isOnline();
_isOnline = _player.isOnline() ? _player.getObjectId() : 0;
}
public PledgeShowMemberListUpdate(ClanMember player)
@ -65,8 +63,7 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket
_name = player.getName();
_level = player.getLevel();
_classId = player.getClassId();
_objectId = player.getObjectId();
_isOnline = _player.isOnline();
_isOnline = player.isOnline() ? player.getObjectId() : 0;
_pledgeType = player.getPledgeType();
if (_pledgeType == Clan.SUBUNIT_ACADEMY)
{
@ -90,8 +87,8 @@ public class PledgeShowMemberListUpdate implements IClientOutgoingPacket
packet.writeD(_level);
packet.writeD(_classId);
packet.writeD(0);
packet.writeD(_objectId);
packet.writeD(_isOnline ? 1 : 0); // 1=online 0=offline
packet.writeD(1);
packet.writeD(_isOnline);
packet.writeD(_pledgeType);
packet.writeD(_hasSponsor);
return true;

4
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeSkillList.java
View File

@ -31,10 +31,6 @@ public class PledgeSkillList implements IClientOutgoingPacket
{
private final Collection<Skill> _skills;
/**
* Instantiates a new pledge skill list.
* @param clan the clan
*/
public PledgeSkillList(Clan clan)
{
_skills = clan.getAllSkills();

6
L2J_Mobius_C6_Interlude/java/org/l2jmobius/gameserver/network/serverpackets/PledgeStatusChanged.java
View File

@ -39,9 +39,9 @@ public class PledgeStatusChanged implements IClientOutgoingPacket
OutgoingPackets.PLEDGE_STATUS_CHANGED.writeId(packet);
packet.writeD(_clan.getLeaderId());
packet.writeD(_clan.getClanId());
packet.writeD(0);
packet.writeD(_clan.getLevel());
packet.writeD(0);
packet.writeD(_clan.getCrestId());
packet.writeD(_clan.getAllyId());
packet.writeD(_clan.getAllyCrestId());
packet.writeD(0);
packet.writeD(0);
return true;