3 commits

Author	SHA1	Message	Date
Mariell	a0b8b886c8	Updated Upstream (CraftBukkit/Spigot) (#4318) ... 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: d5a72960 SPIGOT-6063: ConsoleSender sending extra lines in Java 13+ Spigot Changes: 2740d5ae Rebuild patches	2020-09-12 15:57:21 -04:00
Aikar	b0cbebdc7b	Fix build conflicts	2020-08-30 14:38:49 -04:00
Josh Roy	7ed0f7f003	Fix NPE in getBedSpawnLocation (#4238)	2020-08-30 13:59:14 -04:00