Partially fixing pvp logic
More updating and fixing