From ef5af6f604af9be3d0aef81a3c5a0619721be2ff Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
Date: Thu, 3 Sep 2020 04:47:24 -0400
Subject: [PATCH] [Auto] Updated Upstream (CraftBukkit)

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:
1d7440332 #745: Fix getLocation for Cartography Table and Stonecutter
---
 .../0529-Add-PrepareResultEvent.patch                  | 10 +++++-----
 work/CraftBukkit                                       |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Spigot-Server-Patches/0529-Add-PrepareResultEvent.patch b/Spigot-Server-Patches/0529-Add-PrepareResultEvent.patch
index de81d99f6..5d803c18a 100644
--- a/Spigot-Server-Patches/0529-Add-PrepareResultEvent.patch
+++ b/Spigot-Server-Patches/0529-Add-PrepareResultEvent.patch
@@ -44,10 +44,10 @@ index 70f9c189cb92656ba07ef7c60cfff646c2980b9e..1b7724422fc5d6a99fe60837d1f48585
  
      }
 diff --git a/src/main/java/net/minecraft/server/ContainerCartography.java b/src/main/java/net/minecraft/server/ContainerCartography.java
-index d98d5446d034c416dc29a89320c360464163d700..10df5790a43aef85191bd50c1b49c74a8f976dd2 100644
+index b829a481394167593ccf7521770802531b9ed483..0dd8623591827cd29fdf7916bf9a4b182816f28a 100644
 --- a/src/main/java/net/minecraft/server/ContainerCartography.java
 +++ b/src/main/java/net/minecraft/server/ContainerCartography.java
-@@ -128,6 +128,7 @@ public class ContainerCartography extends Container {
+@@ -135,6 +135,7 @@ public class ContainerCartography extends Container {
              this.a(itemstack, itemstack1, itemstack2);
          }
  
@@ -82,7 +82,7 @@ index 9490f74ee426e162844432073b3d78a2b6cddb32..1fe21ca13a1eecb64cb2d3f4f18993e1
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/ContainerSmithing.java b/src/main/java/net/minecraft/server/ContainerSmithing.java
-index f08337e59f6dc0cfda4ec822716ff75e9ca97291..a575dddb262021fd68b4db1435e67a1f0768c633 100644
+index a6bfc4a49ea0a789cea3706fdd6673837a4b0829..61ef3adcfb021e222042de62ad06a2e7d808f5b5 100644
 --- a/src/main/java/net/minecraft/server/ContainerSmithing.java
 +++ b/src/main/java/net/minecraft/server/ContainerSmithing.java
 @@ -68,6 +68,7 @@ public class ContainerSmithing extends ContainerAnvilAbstract {
@@ -94,10 +94,10 @@ index f08337e59f6dc0cfda4ec822716ff75e9ca97291..a575dddb262021fd68b4db1435e67a1f
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/ContainerStonecutter.java b/src/main/java/net/minecraft/server/ContainerStonecutter.java
-index c9505513e7e34637f8eebd68d756834479c1ca0c..5351bf137623a8909fea672c96a6057cf9726c97 100644
+index ba3db09763d94d730c3fe8662e4dbb24e0636786..3506473f9b9f4c747f7b737d9bd02bef8ea6d83e 100644
 --- a/src/main/java/net/minecraft/server/ContainerStonecutter.java
 +++ b/src/main/java/net/minecraft/server/ContainerStonecutter.java
-@@ -134,6 +134,7 @@ public class ContainerStonecutter extends Container {
+@@ -142,6 +142,7 @@ public class ContainerStonecutter extends Container {
              this.a(iinventory, itemstack);
          }
  
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 13fc33f73..1d7440332 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 13fc33f73249ee2bd8edd5ac3657be65383bdf60
+Subproject commit 1d74403327235004ff05260d18efe4f573a69883