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:
2012f1e0 SPIGOT-5269: Item attribute modifiers don't persist their order
7a806a3a SPIGOT-5270: Call BlockSpreadEvent when bamboo saplings grow

Spigot Changes:
798ea6ab Add async catcher to World#save

Spigot-Server-Patches/0244-Implement-World.getEntity-UUID-API.patch

@@ -1,11 +1,11 @@
-From 93c339952640cc2620a03bb3e0b0f1c55c74413b Mon Sep 17 00:00:00 2001
+From 4cad924d4ab368e3962e1c69158bac777bb459b3 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:08:14 +0200
 Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 61732ae8d..601265fb5 100644
+index d75ac36aa..5e53ee010 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1207,6 +1207,15 @@ public class CraftWorld implements World {
@@ -23,7 +23,7 @@ index 61732ae8d..601265fb5 100644
 +
      @Override
      public void save() {
-         this.server.checkSaveState();
+         org.spigotmc.AsyncCatcher.catchOp("world save"); // Spigot
 -- 
 2.22.0