From 6b4183beee4598ad5ea8f065884f3af4e05a1986 Mon Sep 17 00:00:00 2001
From: mobius <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 11 Feb 2015 03:16:28 +0000
Subject: [PATCH] Fixed clan crest issues.

---
 .../clientpackets/RequestPledgeCrest.java     | 20 ++++++++++++++++---
 .../network/serverpackets/PledgeCrest.java    |  9 ---------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeCrest.java b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeCrest.java
index 367144434f..847bf4ce96 100644
--- a/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeCrest.java
+++ b/trunk/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeCrest.java
@@ -18,28 +18,42 @@
  */
 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;
 
 /**
- * This class ...
- * @version $Revision: 1.4.4.4 $ $Date: 2005/03/27 15:29:30 $
+ * @author Mobius
  */
 public final class RequestPledgeCrest extends L2GameClientPacket
 {
 	private static final String _C__68_REQUESTPLEDGECREST = "[C] 68 RequestPledgeCrest";
 	
 	private int _crestId;
+	private int _clanId;
 	
 	@Override
 	protected void readImpl()
 	{
 		_crestId = readD();
+		_clanId = readD();
 	}
 	
 	@Override
 	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
diff --git a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeCrest.java b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeCrest.java
index 10891035e0..d39407ea7e 100644
--- a/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeCrest.java
+++ b/trunk/java/com/l2jserver/gameserver/network/serverpackets/PledgeCrest.java
@@ -19,21 +19,12 @@
 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 final class PledgeCrest extends L2GameServerPacket
 {
 	private final int _crestId;
 	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)
 	{
 		_crestId = crestId;