Polearm Master (Revised)

You can keep your enemies at bay with reach weapons. You gain the following benefits:

• You have mastered the art of the polearm, so you can wield it while wearing a shield without imposing disadvantage on yourself. Additionally when an enemy is within 5ft of you it does not impose disadvantage.
• While you are wielding a glaive, halberd, pike, quarterstaff, or spear, other creatures provoke an opportunity attack from you when they enter your reach.