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:
42daaadd Seperate out incremental saving
3a713bd5 Mark entities as being ticked when notifying navigation
6f709200 use getChunkImmediately for vehicles
Upstream has released updates that appears to apply and compile correctly
Paper Changes:
fe7ef7b5 Do not schedule to main for getChunkImmediately type calls (#2362)
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)