From b3aa7dadcdaa90777689b7b1fb6655bb6dfd06a8 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com>
Date: Fri, 24 May 2019 04:49:27 +0100
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:
c45c0a98 SPIGOT-4972: Cannot add contextual data to loot table API
---
 ...6-Configurable-Keep-Spawn-Loaded-range-per-world.patch | 8 ++++----
 work/CraftBukkit                                          | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Spigot-Server-Patches/0396-Configurable-Keep-Spawn-Loaded-range-per-world.patch b/Spigot-Server-Patches/0396-Configurable-Keep-Spawn-Loaded-range-per-world.patch
index 915cbd15a..c53993148 100644
--- a/Spigot-Server-Patches/0396-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0396-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@@ -1,4 +1,4 @@
-From 0215320520982945e6cdabfc8f1d484b354122b9 Mon Sep 17 00:00:00 2001
+From 628c3118f290f4d5bf6259de1c7a7a28b620012b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -21,7 +21,7 @@ index 385b3ac0ce..b854061983 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 73ac45bf7a..b7fd59cb89 100644
+index f1cd38d421..184f1b00f0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -570,6 +570,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -148,10 +148,10 @@ index 3ed12672e3..dd2133665f 100644
  
      public LongSet getForceLoadedChunks() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a263d8e7fb..502ed2d03c 100644
+index 5632d3e3f7..d39ef83085 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1750,15 +1750,21 @@ public class CraftWorld implements World {
+@@ -1749,15 +1749,21 @@ public class CraftWorld implements World {
  
      @Override
      public void setKeepSpawnInMemory(boolean keepLoaded) {
diff --git a/work/CraftBukkit b/work/CraftBukkit
index 342194e39..c45c0a983 160000
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@@ -1 +1 @@
-Subproject commit 342194e390eb4276d268d7c68b1e61f569f4b742
+Subproject commit c45c0a983b244973dbea76cbcab45479d8132dc8