Upstream has released updates that appear to apply and compile correctly
Paper Changes:
02fbcbc Add reobf mappings patch for LevelChunk#level (CraftBukkit changes type) (#6079)
2641b91 Also deobfuscate secondary stacktraces in crash reports (#6078)
cc063e1 Fix incorrect variable usage in per-player mob spawning patch (#6077)
Tuinity Changes:
4867bfb Use correct y value for snow/ice formation
361be02 Update paper