3 commits

Author	SHA1	Message	Date
Jake Potrebic	899bc53b79	Updated Upstream (Bukkit/CraftBukkit) (#4779) ... 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: f47abd88 SPIGOT-6242: Fix some file line endings de96535b SPIGOT-6234: enum classes don't serialize properly when implementing ConfigurationSerializable CraftBukkit Changes: 4475707d SPIGOT-6244: /spawnpoint ignores angle 8b3b096d SPIGOT-6242: Fix some file line endings 4b33c749 SPIGOT-6186: Canceling a CreatureSpawnEvent​ results in a "Unable to summon entity due to duplicate UUIDs" error 2b3ca726 SPIGOT-6236: Vehicle passenger portal cooldown does not change	2020-11-17 22:45:18 -05:00
Jason	94c99a8d73	Fix NPE thrown when converting MerchantRecipe from Bukkit to NMS (#4755) ... This bug was introduced in becb478cd5 (Add ignore discounts API)	2020-11-11 21:35:44 -06:00
Mariell Hoversholm	becb478cd5	Add ignore discounts API	2020-11-11 18:44:17 +01:00