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
Bukkit Changes:
85b16b8a Update to Minecraft 1.16.5
CraftBukkit Changes:
f3f30947 Update to Minecraft 1.16.5
Spigot Changes:
018b9a0d Update to Minecraft 1.16.5