1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-01-30 19:40:37 +01:00

Updated Upstream (CraftBukkit/Spigot)

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:
183139d4 SPIGOT-5665: Improve loading spawn egg NBT
dec5df26 SPIGOT-5667: Can't add recipe without (vanilla) datapack

Spigot Changes:
ae72bf43 SPIGOT-5666: Customizable End City Seed
This commit is contained in:
Aikar 2020-04-09 21:33:10 -04:00
parent f481e800ee
commit 0db7fba2d3
3 changed files with 3 additions and 3 deletions
Spigot-Server-Patches
work

View file

@ -167,7 +167,7 @@ index 68a601bac5..efdf611e66 100644
for (int j = a().size() - 1; j >= 0; --j) {
diff --git a/src/main/java/net/minecraft/server/CraftingManager.java b/src/main/java/net/minecraft/server/CraftingManager.java
index 2dd27edc83..6def3616ef 100644
index ca9ed57391..f0d7a91fa0 100644
--- a/src/main/java/net/minecraft/server/CraftingManager.java
+++ b/src/main/java/net/minecraft/server/CraftingManager.java
@@ -0,0 +0,0 @@ public class CraftingManager extends ResourceDataJson {

@ -1 +1 @@
Subproject commit f7d6ad53eeb1ad3a4372cc73fe77eac4e01a9470
Subproject commit 183139d41f9c59f4b51ffa79eec4c04762fd9ae8

@ -1 +1 @@
Subproject commit a03b1fdbaff792c6a1de74bd553fcb0d24f44849
Subproject commit ae72bf43fdca116a37e278fc2c8066d3a04ec7e6