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:
6a4242cb #468: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator
c6697f90 SPIGOT-5559: Add EntityPotionEffectEvent causes for PATROL_CAPTAIN and WITHER_ROSE
9c1fa040 #467: Add method to remove a recipe by its key
3961d1aa Add nb-configuration.xml to .gitignore
CraftBukkit Changes:
d70084e5 Remove unused seed in CustomChunkGenerator
8a66d4c7 #619: Allow delegation of certain elements to Vanilla when using a custom ChunkGenerator
c2dc19d3 Craftbukkit -> CraftBukkit
ae45e092 SPIGOT-5559: Add EntityPotionEffectEvent causes for bee, raiders and wither rose
00980376 #618: Add method to remove a recipe by its key
Spigot Changes:
c574e08b Rebuild patches
13c24cc4 Rebuild patches
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:
c2d72c82 SPIGOT-3102: Add EXPLOSION SpawnReason
CraftBukkit Changes:
fca41573 SPIGOT-5136: EntityPortalEvent getting called on interdimensional entity teleports
604c8bf0 SPIGOT-3102: Add EXPLOSION SpawnReason
375969a6 Re-add chunk GC for plugin chunk loads
58151368 SPIGOT-5123: Snapshot tile entities can end up with a non-null world
491c8482 SPIGOT-5130: PersistentDataContainer not removing values on TileEntities
Spigot Changes:
d05d3c1f Rebuild patches
--- work/Bukkit
Submodule work/Bukkit aba2aaaf..949124e0:
> SPIGOT-5121: Method to set PierceLevel of arrows
--- work/CraftBukkit
Submodule work/CraftBukkit c6997924..bf329334:
> SPIGOT-5133: Throwing items into secondary end world portal causes crash
> SPIGOT-5121: Method to set PierceLevel of arrows
> SPIGOT-5122: Skip world#notify if sign has no world.
> SPIGOT-5105: The EntityTag nbt tag disappears from preset armor_stand items.
> SPIGOT-5106: Config option to prevent plugins with incompatible API's from loading
--- work/Spigot
Submodule work/Spigot 595711b0..935adb34:
> SPIGOT-5088: Additional growth modifiers
Shane Freeder
Spottedleaf
Zach Brown