Upstream has released updates that appears to apply and compile correctly
Paper Changes:
34e5942b Fix timings task name generation for extreme cases - Fixes#3499
5e3bacbc Ensure ThreadDeath propagates fully - Fixes#3521
9fa6ba26 Optimize Light Engine
dfd3848e Use seed based lookup for Treasure Maps - Fixes lag from carto/sunken maps
74dcb3c9 Revert "Fix enchantment costs (#3519)"
6d72ea16 Fix enchantment costs (#3519)
68cc8d79 Maps shouldn't load chunks (#3518)
e7cf34a0 Fix villager trading demand MC-163962 (#3498)
51f9edf2 Change name and id to get from profile in AsyncPlayerPreLoginEvent (#3511)
