Reapply diffs of MinecraftServer on mc-dev. Fixes BUKKIT-3378