Fixes issues #510, and #156, as well as issues brought up in PR #373.
Minimizes impact on code structure due to lack of scope.
Changed to better reflect original code structure.

Conflicts:
	src/main/java/net/glowstone/entity/GlowPlayer.java