Upstream has released updates that appear to apply and compile correctly
Paper Changes:
PaperMC/Paper@5ffeb70 Use getChunkForLighting instead of getChunkAtImmediately in fixlight to properly ignore imposter chunks
PaperMC/Paper@e294802 Refactor paper command (#8112)