Upstream has released updates that appears to apply and compile correctly
Paper Changes:
c4ae0002 Fix some API and commands usage of inactive chunks (#2457)
700a6649 Print entity debug stacktrace on entity double add (#2438)
9d6680ee Fix MC-158900 (#2458)
928abb41 [CI-SKIP] Rebuild patches for last merge
34e64781 Do less work if we have a custom Bukkit generator (#2318)
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)