From 0db7fba2d33024e80d528b960e212e92fb225979 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 9 Apr 2020 21:33:10 -0400
Subject: [PATCH] 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
---
 Spigot-Server-Patches/MC-Dev-fixes.patch | 2 +-
 work/CraftBukkit                         | 2 +-
 work/Spigot                              | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Spigot-Server-Patches/MC-Dev-fixes.patch b/Spigot-Server-Patches/MC-Dev-fixes.patch
index 3160817d2e..1d31fa6ad4 100644
--- a/Spigot-Server-Patches/MC-Dev-fixes.patch
+++ b/Spigot-Server-Patches/MC-Dev-fixes.patch
@@ -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 {
diff --git a/work/CraftBukkit b/work/CraftBukkit
index f7d6ad53ee..183139d41f 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit f7d6ad53eeb1ad3a4372cc73fe77eac4e01a9470
+Subproject commit 183139d41f9c59f4b51ffa79eec4c04762fd9ae8
diff --git a/work/Spigot b/work/Spigot
index a03b1fdbaf..ae72bf43fd 160000
--- a/work/Spigot
+++ b/work/Spigot
@@ -1 +1 @@
-Subproject commit a03b1fdbaff792c6a1de74bd553fcb0d24f44849
+Subproject commit ae72bf43fdca116a37e278fc2c8066d3a04ec7e6