Multiple fixes
Merge branch 'master' of github.com:PocketMine/PocketMine-MP