Upstream has released updates that appear to apply and compile correctly
Paper Changes:
808bd9198 Add fast alternative constructor for Vector3f (#5339)
e849c51da fix#5336
0b25bacfc fix patch 'Remove streams from SensorNearest' (fixes#5330)
4d287e31c Use Adventure for `/version` command feedback, add copy to clipboard click event (#5333)
Tuinity Changes:
5b6d8beec: Update Upstream (Paper)
81d5fc1dd: Fix NPE in pickup logic for arrow
19ac6608f: Move region chunk unload & poi unload hook up
38ad5a1bd: Do not run close logic for inventories on chunk load
fb75a6f83: Do not allow the server to unload chunks at request of plugins
f87cb795f: Make entity tracker use highest range of passengers
71b089f18: Do not run raytrace logic for AIR
09e1a1036: Fix NPE in light exception handler
0ae7c2c23: Dump even more info for ticking entities
2e4a930c4: Store changed positions inside field on light engine
7734ef0a9: Detail player ticking in watchdog dumps