Fixed unbuildable
fix stuffs
Merge branch 'master' of https://github.com/EterniaLogic/EssencePVPMod

Conflicts: