More checks in clan management: rights of the CL can't be changed.

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

@@ -62,11 +62,11 @@ public final class RequestPledgeReorganizeMember extends L2GameClientPacket
 			return;
 
 		final L2ClanMember member1 = clan.getClanMember(_memberName);
-		if (member1 == null)
+		if (member1 == null || member1.getObjectId() == clan.getLeaderId())
 			return;
 
 		final L2ClanMember member2 = clan.getClanMember(_selectedMember);
-		if (member2 == null)
+		if (member2 == null || member2.getObjectId() == clan.getLeaderId())
 			return;
 
 		final int oldPledgeType = member1.getPledgeType();

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

@@ -43,21 +43,24 @@ public final class RequestPledgeSetMemberPowerGrade extends L2GameClientPacket
 	protected void runImpl()
 	{
 		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 member = clan.getClanMember(_member);
-		if(member == null)
+		if (member == null)
 			return;
 
-		if(member.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
+		if (member.getObjectId() == clan.getLeaderId())
+			return;
+
+		if (member.getPledgeType() == L2Clan.SUBUNIT_ACADEMY)
 		{
 			// also checked from client side
 			activeChar.sendMessage("You cannot change academy member grade");