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
A recent commit has been made that caused patches to be out of order, rebuilding
Shane Freeder
Aikar
Mark Vainomaa