made changes to player/world/etc to handle things needed in battlesys

won't be able to work on actual functionality til you two are done
working on your current classes so there won't be merge conflicts