Inemia's Suggested Changes for the next PVP Dev to fix PVP

I like Spicyj’s suggestion. Simple and elegant: