Upstream has released updates that appear to apply and compile correctly
Tuinity Changes:
0fbcf78 Fix small issue with handling of step height in colliding
0ae7e67 Do not load chunks during a crash report
8c5d945 Improve abnormal server shutdown process
cc34294 Copy passenger list in enderTeleportTo
9a48d49 Fix skylight propagation issue on the highest non-empty section border
5d722a0 Fix incorrect handling of special colliding blocks in chunk sections
Upstream has released updates that appear to apply and compile correctly
Paper Changes:
9a129fa99 Add #getEligibleHumans to SkeletonHorseTrapEvent
b5e23c7a6 Fix merging spawning values
a932e8ad7 Turn off spigot verbose world by default
8ced89f65 Fix Delegation to vanilla chunk gen