remove some duplication, moved pvp event to its own file