Upstream has released updates that appears to apply and compile correctly
Paper Changes:
1c446c22 Fix CME when adding a passenger during Spawn events (#4616)
f3927b25 Fix "Not a string" Map Conversion spam - Fixes#3901
1b64536b Clarify the JavaDocs for Entity.getEntitySpawnReason() in response to #4361
6b22219c Remove unnecessary space for provided plugins, fixes#4608
3ece9036 [CI-SKIP] [Auto] Rebuild Patches
551fac7e Fix deop kicking non-whitelisted player when white list is not enabled
faf8eb03 Updated Upstream (CraftBukkit) (#4622)