Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@7f7bc17 Fix inactive item ticking and remove active tick skipping; fix quit event leave message
PaperMC/Paper@4d2672e Fix the fix
PaperMC/Paper@84281ce Don't count mobs twice in per-player-mob-spawns