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)
173fa1ee6d