Sync with old Bukkit project