From ef4aa6d951e60082784b3e309dbe6355e5a1be16 Mon Sep 17 00:00:00 2001
From: Spottedleaf <Spottedleaf@users.noreply.github.com>
Date: Tue, 28 May 2019 04:15:12 -0700
Subject: [PATCH] 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:
ba575a5a SPIGOT-4992: Various villager issues due to broken mapping
---
 work/BuildData   | 2 +-
 work/CraftBukkit | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/work/BuildData b/work/BuildData
index fb5e14fce5..633897ca59 160000
--- a/work/BuildData
+++ b/work/BuildData
@@ -1 +1 @@
-Subproject commit fb5e14fce5af96290063bf4ee833c2ad72bef028
+Subproject commit 633897ca59f5feb54c9f7f1a953f1989d9cb1b64
diff --git a/work/CraftBukkit b/work/CraftBukkit
index cb3d14c5a7..ba575a5a41 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit cb3d14c5a7369f94c2037d179666583e0e3945dd
+Subproject commit ba575a5a41a12dbe0d0626f7ad7e25384d0d9885