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:
70a529ba SPIGOT-6229: Clarify PlayerItemBreakEvent documentation
CraftBukkit Changes:
009f0ba0e #769: Fix FishHook.maxWaitTime