Upstream has released updates that appears 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:
dde07e23 Update docs for Enderman carrying methods
CraftBukkit Changes:
452a1738 SPIGOT-4271: Fix API error when enderman are not carrying a block
This only impacted people who used our useSnapshots new API in a plugin,
which obviously was no one as the data result was completely broken.
Merged the NPE check patch into mine since it has to handle it too.