Upstream has released updates that appears to apply and compile correctly
Paper Changes:
bc17ce69d Delay unsafe actions until after entity ticking is done - Fixes#3114
5553e6b3e Disable Sync Events firing Async errors during shutdown
e12c51d9b Use better variable for isStopping() API
586ee2bb1 Remove patch for MC-111480, fixed in 1.14
09a942155 Remove streams from Mob AI System
bb5c294ec Fix Disabling Asynchronous Chunks
089d83568 Implement Chunk Priority / Urgency System for World Gen
fce69af70 Use dedicated thread for main thread blocking chunk loads
588b62e47 Add tick times API and /mspt command (#3102)
11de41c77 Add API MinecraftServer#isStopping (#3129)
942ff3c28 My patches are under MIT (#3130)
Upstream has released updates that appears to apply and compile correctly
Paper Changes:
bc8fafb20 Updated Upstream (CraftBukkit/Spigot)
ebbca5ced Drowned is a RangedEntity (fixes API for Drowned to support Ranged)
83b03eee0 Don't move existing players to world spawn
3b3e38fd0 Fix issue with loading chunk during ticking chunks issue
78431dcae Update test server startup script
ab74bb451 Speed up processing of chunk loads and generation
f5dd491fc Increase Light Queue Size
9ab693487 Don't load chunks when attempting to unload a chunk
38c626229 Improve Optimize Memory use logic to make iterator safer and fix bad plugins like P2
d33ba160a Fix incorrect keyword use on visibleChunksClone
2f3430158 Updated Upstream (Bukkit/CraftBukkit)
a65831bd6 Optimize PlayerChunkMap memory use for visibleChunks
