3 commits

Author	SHA1	Message	Date
Kyle Wood	fc52b39f3f	Move patches	2021-06-11 06:35:46 -05:00
Aikar	af1a50993f	[Auto] Updated Upstream (CraftBukkit) ... Upstream has released updates that appear 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: ebe18b9b0 SPIGOT-6487: Fix issue with villagers picking up items in certain situations	2021-06-02 22:27:31 -04:00
BillyGalbreath	ea381dde32	Reset villager inventory on cancelled pickup event (again) (#5766) (Fixes #5765)	2021-06-02 03:11:13 +00:00