Code cleanup/check

[mathiascode]

The code seems a bit inconsistent and outdated in some places, and would benefit from a cleanup/thorough check, especially after recent Cuberite updates.