Upstream has released updates that appear to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing
CraftBukkit Changes:
e1fc95c50 Fix crash with 1.20 smithing table
04dfb921d Fix crash with juke boxes
1264a6fb5 Fix crash with composters
* Add missing EntityChangeBlockEvent
* Fix duplicate empty bottle when canceled for creative player
* Use native update impl instead of craftbukkit -> nms