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

Fixed clan crest issues.

Browse Source
This commit is contained in:
mobius
2015-02-11 03:16:28 +00:00
parent 750bd4d4e4
commit 6b4183beee
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeCrest.java
View File

@@ -18,28 +18,42 @@
*/ */
package com.l2jserver.gameserver.network.clientpackets; package com.l2jserver.gameserver.network.clientpackets;
import com.l2jserver.gameserver.data.sql.impl.CrestTable;
import com.l2jserver.gameserver.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.PledgeCrest; import com.l2jserver.gameserver.network.serverpackets.PledgeCrest;
/** /**
* This class ... * @author Mobius
* @version $Revision: 1.4.4.4 $ $Date: 2005/03/27 15:29:30 $
*/ */
public final class RequestPledgeCrest extends L2GameClientPacket public final class RequestPledgeCrest extends L2GameClientPacket
{ {
private static final String _C__68_REQUESTPLEDGECREST = "[C] 68 RequestPledgeCrest"; private static final String _C__68_REQUESTPLEDGECREST = "[C] 68 RequestPledgeCrest";
private int _crestId; private int _crestId;
private int _clanId;
@Override @Override
protected void readImpl() protected void readImpl()
{ {
_crestId = readD(); _crestId = readD();
_clanId = readD();
} }
@Override @Override
protected void runImpl() protected void runImpl()
{ {
sendPacket(new PledgeCrest(_crestId)); final L2PcInstance activeChar = getClient().getActiveChar();
if (activeChar.getClan().getId() == _clanId)
{
return;
}
if (_crestId == 0)
{
return;
}
sendPacket(new PledgeCrest(_crestId, CrestTable.getInstance().getCrest(_crestId).getData()));
} }
@Override @Override

9
trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeCrest.java
View File

@@ -19,21 +19,12 @@
package com.l2jserver.gameserver.network.serverpackets; package com.l2jserver.gameserver.network.serverpackets;
import com.l2jserver.Config; import com.l2jserver.Config;
import com.l2jserver.gameserver.data.sql.impl.CrestTable;
import com.l2jserver.gameserver.model.L2Crest;
public final class PledgeCrest extends L2GameServerPacket public final class PledgeCrest extends L2GameServerPacket
{ {
private final int _crestId; private final int _crestId;
private final byte[] _data; private final byte[] _data;
public PledgeCrest(int crestId)
{
_crestId = crestId;
final L2Crest crest = CrestTable.getInstance().getCrest(crestId);
_data = crest != null ? crest.getData() : null;
}
public PledgeCrest(int crestId, byte[] data) public PledgeCrest(int crestId, byte[] data)
{ {
_crestId = crestId; _crestId = crestId;