Upstream has released updates that appears to apply and compile correctly
Paper Changes:
cc0aeb73 Doubles the custom payload size limit imposed by bukkit, also creates a system property to allow customizing the size `paper.maxCustomChannelName`
0f2ea04c Updated Upstream (Bukkit/CraftBukkit/Spigot)
2c8d2040 Re-implement treasure-maps-return-already-discovered for 1.14 (#2636)
8260cdf8 Use getIfLoadedImmediately and not cached immediately for isLoa… (#2641)
ff8b9ef3 Really fix JLine on Windows
c6539607 Revert "Fix jline with git builds under Windows (#2624)" (#2632)
a4dbabdb Update upstream CB
0c64f7b0 Fix jline with git builds under Windows (#2624)