Upstream has released updates that appears to apply and compile correctly
Paper Changes:
c6987e1a Peek the unload queue for chunk generation checks (#2332)
4ac69cec Bring task execution into server tick timings (#2357)
edce5384 Amend PlayerInteractAtEntityEvent javadoc for ArmorStands (#2309)
8ecd4337 Set spawning entity for fireworks spawned by a crossbow (#2358)
Upstream has released updates that appears to apply and compile correctly
Paper Changes:
a41d51f0 ServerExceptionEvent can be fired off main
920ad7c7 Use getChunkIfLoadedImmediately in places (#2297)
0708fa36 Updated Upstream (CraftBukkit/Spigot)