Upstream has released updates that appears to apply and compile correctly
Paper Changes:
108efeee Fix zero reputation deleting villagers (#3857)
7db30ebd Use consistent priorities for light tasks
1de3f830 Support hex colors in getLastColors (#3922)
018d8602 Fix SPIGOT-5989 (#3920)
45909954 Fix moveToWorld worldserver reference (#3929)
9c16c413 [Auto] Updated Upstream (CraftBukkit)
45ffc2bf Move range check for block placing up (#3917)
