Optimizations of the previous mcmmo xp fix