Moved some methods from Entity to Player.
Removed player setWeapon calls from Main.