--

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestJoinPledge.java

@@ -33,8 +33,6 @@ public final class RequestJoinPledge extends L2GameClientPacket
 
 	private int _target;
 	private int _pledgeType;
-	private String _pledgeName;
-	private String _subPledgeName;
 
 	@Override
 	protected void readImpl()
@@ -46,28 +44,30 @@ public final class RequestJoinPledge extends L2GameClientPacket
 	@Override
 	protected void runImpl()
 	{
-		L2PcInstance activeChar = getClient().getActiveChar();
+		final L2PcInstance activeChar = getClient().getActiveChar();
 		if (activeChar == null)
 		    return;
 
-		L2Object ob = L2World.getInstance().findObject(_target);
-		if (!(ob instanceof L2PcInstance))
+		final L2Clan clan = activeChar.getClan();
+		if (clan == null)
+			return;
+
+		final L2PcInstance target = L2World.getInstance().getPlayer(_target);
+		if (target == null)
 		{
 			activeChar.sendPacket(new SystemMessage(SystemMessageId.YOU_HAVE_INVITED_THE_WRONG_TARGET));
 			return;
 		}
 
-		L2PcInstance target = (L2PcInstance) ob;
-		L2Clan clan = activeChar.getClan();
 		if (!clan.checkClanJoinCondition(activeChar, target, _pledgeType))
 			return;
 
 		if (!activeChar.getRequest().setRequest(target, this))
 			return;
 
-		_pledgeName = activeChar.getClan().getName();
-		_subPledgeName = (activeChar.getClan().getSubPledge(_pledgeType) != null ? activeChar.getClan().getSubPledge(_pledgeType).getName() : null);
-		target.sendPacket(new AskJoinPledge(activeChar.getObjectId(), _subPledgeName, _pledgeType, _pledgeName));
+		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));
 	}
 
 	public int getPledgeType()

L2_GameServer/java/com/l2jserver/gameserver/network/clientpackets/RequestPledgeReorganizeMember.java

@@ -51,14 +51,14 @@ public final class RequestPledgeReorganizeMember extends L2GameClientPacket
 			return;
 
 		final L2PcInstance activeChar = getClient().getActiveChar();
-		if(activeChar == null)
+		if (activeChar == null)
 			return;
 
 		final L2Clan clan = activeChar.getClan();
-		if(clan == null)
+		if (clan == null)
 			return;
 
-		if (!activeChar.isClanLeader()) // privileges check
+		if ((activeChar.getClanPrivileges() & L2Clan.CP_CL_MANAGE_RANKS) != L2Clan.CP_CL_MANAGE_RANKS)
 			return;
 
 		final L2ClanMember member1 = clan.getClanMember(_memberName);
@@ -66,7 +66,7 @@ public final class RequestPledgeReorganizeMember extends L2GameClientPacket
 			return;
 
 		final L2ClanMember member2 = clan.getClanMember(_selectedMember);
-		if(member2 == null)
+		if (member2 == null)
 			return;
 
 		final int oldPledgeType = member1.getPledgeType();