Fixed PvP not working, closes #31