Fix non-dev servers not loading, attempt to fix EntityPlayerMP patch, some minor style changes