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

More crest related improvements.

Browse Source
This commit is contained in:
mobius
2015-02-12 10:28:12 +00:00
parent 3d833d9521
commit e6573f120d
4 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/java/com/l2jserver/gameserver/model/L2Crest.java
View File

@@ -100,7 +100,7 @@ public final class L2Crest implements IIdentifiable
{ {
case PLEDGE: case PLEDGE:
{ {
activeChar.sendPacket(new PledgeCrest(getId(), getData())); activeChar.sendPacket(new PledgeCrest(getId()));
path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); path = "Crest.crest_" + Config.SERVER_ID + "_" + getId();
break; break;
} }
@@ -130,7 +130,7 @@ public final class L2Crest implements IIdentifiable
} }
case ALLY: case ALLY:
{ {
activeChar.sendPacket(new AllyCrest(getId(), getData())); activeChar.sendPacket(new AllyCrest(getId()));
path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); path = "Crest.crest_" + Config.SERVER_ID + "_" + getId();
break; break;
} }

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

@@ -18,7 +18,6 @@
*/ */
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.model.actor.instance.L2PcInstance;
import com.l2jserver.gameserver.network.serverpackets.PledgeCrest; import com.l2jserver.gameserver.network.serverpackets.PledgeCrest;
@@ -53,7 +52,7 @@ public final class RequestPledgeCrest extends L2GameClientPacket
return; return;
} }
sendPacket(new PledgeCrest(_crestId, CrestTable.getInstance().getCrest(_crestId).getData())); sendPacket(new PledgeCrest(_crestId));
} }
@Override @Override

10
trunk/java/com/l2jserver/gameserver/network/serverpackets/AllyCrest.java
View File

@@ -20,7 +20,6 @@ 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.data.sql.impl.CrestTable;
import com.l2jserver.gameserver.model.L2Crest;
public class AllyCrest extends L2GameServerPacket public class AllyCrest extends L2GameServerPacket
{ {
@@ -30,14 +29,7 @@ public class AllyCrest extends L2GameServerPacket
public AllyCrest(int crestId) public AllyCrest(int crestId)
{ {
_crestId = crestId; _crestId = crestId;
final L2Crest crest = CrestTable.getInstance().getCrest(crestId); _data = CrestTable.getInstance().getCrest(crestId).getData();
_data = crest != null ? crest.getData() : null;
}
public AllyCrest(int crestId, byte[] data)
{
_crestId = crestId;
_data = data;
} }
@Override @Override

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

@@ -19,16 +19,17 @@
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;
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, byte[] data) public PledgeCrest(int crestId)
{ {
_crestId = crestId; _crestId = crestId;
_data = data; _data = CrestTable.getInstance().getCrest(crestId).getData();
} }
@Override @Override