diff --git a/trunk/java/com/l2jserver/gameserver/model/L2Crest.java b/trunk/java/com/l2jserver/gameserver/model/L2Crest.java index 7c33330b94..90a7219b29 100644 --- a/trunk/java/com/l2jserver/gameserver/model/L2Crest.java +++ b/trunk/java/com/l2jserver/gameserver/model/L2Crest.java @@ -100,7 +100,7 @@ public final class L2Crest implements IIdentifiable { case PLEDGE: { - activeChar.sendPacket(new PledgeCrest(getId(), getData())); + activeChar.sendPacket(new PledgeCrest(getId())); path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); break; } @@ -130,7 +130,7 @@ public final class L2Crest implements IIdentifiable } case ALLY: { - activeChar.sendPacket(new AllyCrest(getId(), getData())); + activeChar.sendPacket(new AllyCrest(getId())); path = "Crest.crest_" + Config.SERVER_ID + "_" + getId(); break; } diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeCrest.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeCrest.java index b112f9edbb..dd34e510d9 100644 --- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeCrest.java +++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeCrest.java @@ -18,7 +18,6 @@ */ 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; @@ -53,7 +52,7 @@ public final class RequestPledgeCrest extends L2GameClientPacket return; } - sendPacket(new PledgeCrest(_crestId, CrestTable.getInstance().getCrest(_crestId).getData())); + sendPacket(new PledgeCrest(_crestId)); } @Override diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/AllyCrest.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/AllyCrest.java index ad1df46f4c..1b3aabec86 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/AllyCrest.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/AllyCrest.java @@ -20,7 +20,6 @@ package com.l2jserver.gameserver.network.serverpackets; import com.l2jserver.Config; import com.l2jserver.gameserver.data.sql.impl.CrestTable; -import com.l2jserver.gameserver.model.L2Crest; public class AllyCrest extends L2GameServerPacket { @@ -30,14 +29,7 @@ public class AllyCrest extends L2GameServerPacket public AllyCrest(int crestId) { _crestId = crestId; - final L2Crest crest = CrestTable.getInstance().getCrest(crestId); - _data = crest != null ? crest.getData() : null; - } - - public AllyCrest(int crestId, byte[] data) - { - _crestId = crestId; - _data = data; + _data = CrestTable.getInstance().getCrest(crestId).getData(); } @Override diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeCrest.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeCrest.java index d39407ea7e..ceb4b29714 100644 --- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeCrest.java +++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeCrest.java @@ -19,16 +19,17 @@ package com.l2jserver.gameserver.network.serverpackets; import com.l2jserver.Config; +import com.l2jserver.gameserver.data.sql.impl.CrestTable; public final class PledgeCrest extends L2GameServerPacket { private final int _crestId; private final byte[] _data; - public PledgeCrest(int crestId, byte[] data) + public PledgeCrest(int crestId) { _crestId = crestId; - _data = data; + _data = CrestTable.getInstance().getCrest(crestId).getData(); } @Override