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
CraftBukkit Changes:
61d4b090 SPIGOT-5428: Better handling of some ItemMeta
Spigot Changes:
047b6f86 SPIGOT-5421: Add separate trident despawn rate
c1047ed9 SPIGOT-5445: Add log-villager-deaths option
This option does not set the absolute speed of the entity as the name
implies. It sets a modifier. The default (vanilla) value of `0.5` sets
the baby zombie to move at 50% faster than the base speed.
A negative value like `-0.4` would set them to move at 40% slower.
There should be no functional changes as a result of this change, it's
just clarifying the config name.
Spottedleaf
Shane Freeder
Zach Brown