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

Add name to ask join pledge.

Browse Source
This commit is contained in:
MobiusDev
2017-09-30 15:27:18 +00:00
parent 291b59aa9e
commit 5f8301af70
12 changed files with 36 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestClanAskJoinByName.java
View File

@@ -57,6 +57,6 @@ public class RequestClanAskJoinByName implements IClientIncomingPacket
return;
}
invitedPlayer.sendPacket(new AskJoinPledge(activeChar.getObjectId(), activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null, _pledgeType, activeChar.getClan().getName()));
invitedPlayer.sendPacket(new AskJoinPledge(activeChar, activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null, _pledgeType, activeChar.getClan().getName()));
}
}

2
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/clientpackets/RequestJoinPledge.java
View File

@@ -75,7 +75,7 @@ public final class RequestJoinPledge implements IClientIncomingPacket
final String pledgeName = activeChar.getClan().getName();
final String subPledgeName = (activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null);
target.sendPacket(new AskJoinPledge(activeChar.getObjectId(), subPledgeName, _pledgeType, pledgeName));
target.sendPacket(new AskJoinPledge(activeChar, subPledgeName, _pledgeType, pledgeName));
}
public int getPledgeType()

11
L2J_Mobius_3.0_Helios/java/com/l2jmobius/gameserver/network/serverpackets/AskJoinPledge.java
View File

@@ -17,18 +17,19 @@
package com.l2jmobius.gameserver.network.serverpackets;
import com.l2jmobius.commons.network.PacketWriter;
import com.l2jmobius.gameserver.model.actor.instance.L2PcInstance;
import com.l2jmobius.gameserver.network.OutgoingPackets;
public final class AskJoinPledge implements IClientOutgoingPacket
{
private final int _requestorObjId;
private final L2PcInstance _requestor;
private final String _subPledgeName;
private final int _pledgeType;
private final String _pledgeName;
public AskJoinPledge(int requestorObjId, String subPledgeName, int pledgeType, String pledgeName)
public AskJoinPledge(L2PcInstance requestor, String subPledgeName, int pledgeType, String pledgeName)
{
_requestorObjId = requestorObjId;
_requestor = requestor;
_subPledgeName = subPledgeName;
_pledgeType = pledgeType;
_pledgeName = pledgeName;
@@ -39,7 +40,9 @@ public final class AskJoinPledge implements IClientOutgoingPacket
{
OutgoingPackets.ASK_JOIN_PLEDGE.writeId(packet);
packet.writeD(_requestorObjId);
packet.writeD(_requestor.getObjectId());
packet.writeS(_requestor.getName());
if (_subPledgeName != null)
{
packet.writeS(_pledgeType > 0 ? _subPledgeName : _pledgeName);