More work
Fix problems
Merge branch 'master' of https://github.com/eddy5641/LegacyPVP.git