Updated Upstream (Bukkit/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

Bukkit Changes:
aba2aaaf Correct pom.xml version

CraftBukkit Changes:
e8b39d43 SPIGOT-5103: World.save does not save gamerules
3164e531 Correct pom.xml version

Spigot Changes:
595711b0 Correct pom.xml version

Spigot-API-Patches/0001-POM-changes.patch

@@ -1,14 +1,14 @@
-From 614fd245b215d849e362c4d12e258a741ce94292 Mon Sep 17 00:00:00 2001
+From 5517592aa39fa15d51e8e186af82b46219c0223e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 00:16:08 +0100
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 83eb5a39..41708a2b 100644
+index b5532ae6..a85aaa1a 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -2,34 +2,28 @@
+@@ -2,34 +2,29 @@
  <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
      <modelVersion>4.0.0</modelVersion>
@@ -22,7 +22,8 @@ index 83eb5a39..41708a2b 100644
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper-api</artifactId>
-     <version>1.14.3-SNAPSHOT</version>
+     <version>1.14.3-R0.1-SNAPSHOT</version>
++
      <packaging>jar</packaging>
  
 -    <name>Spigot-API</name>
@@ -53,7 +54,7 @@ index 83eb5a39..41708a2b 100644
      <repositories>
          <!--
              If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
-@@ -41,6 +35,10 @@
+@@ -41,6 +36,10 @@
              <id>spigotmc-public</id>
              <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
          </repository>
@@ -64,7 +65,7 @@ index 83eb5a39..41708a2b 100644
      </repositories>
  
      <pluginRepositories>
-@@ -57,6 +55,20 @@
+@@ -57,6 +56,20 @@
              <version>2.6</version>
              <scope>compile</scope>
          </dependency>
@@ -85,7 +86,7 @@ index 83eb5a39..41708a2b 100644
          <!-- bundled with Minecraft, should be kept in sync -->
          <dependency>
              <groupId>com.google.guava</groupId>
-@@ -113,15 +125,12 @@
+@@ -113,15 +126,12 @@
      </dependencies>
  
      <build>
@@ -102,7 +103,7 @@ index 83eb5a39..41708a2b 100644
                  <dependencies>
                      <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
                      <dependency>
-@@ -156,6 +165,7 @@
+@@ -156,6 +166,7 @@
                      </execution>
                  </executions>
                  <configuration>

Spigot-API-Patches/0002-Add-FastUtil-to-Bukkit.patch

@@ -1,4 +1,4 @@
-From 4d727d07067bf90febccacc7c46b151e7a4dfc3f Mon Sep 17 00:00:00 2001
+From fa8d0d47698759ed68d4d63544b943369a5fa77c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 1 Apr 2016 00:02:47 -0400
 Subject: [PATCH] Add FastUtil to Bukkit
@@ -6,10 +6,10 @@ Subject: [PATCH] Add FastUtil to Bukkit
 Doesn't expose to plugins, just allows Paper-API to use it for optimization
 
 diff --git a/pom.xml b/pom.xml
-index 41708a2b..3b650cbc 100644
+index a85aaa1a..e65cbc15 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -49,6 +49,12 @@
+@@ -50,6 +50,12 @@
      </pluginRepositories>
  
      <dependencies>

Spigot-API-Patches/0022-Use-ASM-for-event-executors.patch

@@ -1,4 +1,4 @@
-From 679dc954b994c687b3452e062e561111fefac478 Mon Sep 17 00:00:00 2001
+From 69ce0886b5a5faff5c6f3b0cd144d74e15e26f62 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 13:20:33 -0700
 Subject: [PATCH] Use ASM for event executors.
@@ -6,10 +6,10 @@ Subject: [PATCH] Use ASM for event executors.
 Uses method handles for private or static methods.
 
 diff --git a/pom.xml b/pom.xml
-index 3b650cbc..baefc0ff 100644
+index e65cbc15..a1dd0ac2 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -128,6 +128,17 @@
+@@ -129,6 +129,17 @@
              <version>7.1</version>
              <scope>test</scope>
          </dependency>

Spigot-API-Patches/0067-Allow-plugins-to-use-SLF4J-for-logging.patch

@@ -1,4 +1,4 @@
-From 69b0848c5c15e72438a938b8eb0c823b21f27129 Mon Sep 17 00:00:00 2001
+From 20af2ff69a3f0159a59f104960b7b769cea9901f Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:12 +0200
 Subject: [PATCH] Allow plugins to use SLF4J for logging
@@ -14,10 +14,10 @@ it without having to shade it in the plugin and going through
 several layers of logging abstraction.
 
 diff --git a/pom.xml b/pom.xml
-index baefc0ff..5dc31841 100644
+index a1dd0ac2..df8fc517 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -109,6 +109,13 @@
+@@ -110,6 +110,13 @@
              <version>17.0.0</version>
              <scope>provided</scope>
          </dependency>

Spigot-Server-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From 08c853033acfa5e344cbc2b46ed4235af0f118a7 Mon Sep 17 00:00:00 2001
+From 4c628f35e6729657249dce1859413e0a61822416 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:40:33 -0600
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 1dd649086b..e8134bf0eb 100644
+index 519a3319ca..75c1b84f6a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,15 +1,14 @@
@@ -16,7 +16,7 @@ index 1dd649086b..e8134bf0eb 100644
 -    <artifactId>spigot</artifactId>
 +    <artifactId>paper</artifactId>
      <packaging>jar</packaging>
-     <version>1.14.3-SNAPSHOT</version>
+     <version>1.14.3-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 +    <name>Paper</name>

Spigot-Server-Patches/0009-Timings-v2.patch

@@ -1,4 +1,4 @@
-From 76dcdc64de5d833b1e1af35a33a9351fb39ddb68 Mon Sep 17 00:00:00 2001
+From 554942503174382dace3707a50aae22d61ee67b9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -659,7 +659,7 @@ index e0b12e1fd7..30aa4f56d3 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 41638b680d..73b1041c8c 100644
+index f9ec2b0686..d0419119b3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -54,7 +54,7 @@ import org.bukkit.craftbukkit.CraftServer;
@@ -671,7 +671,7 @@ index 41638b680d..73b1041c8c 100644
  import org.spigotmc.SlackActivityAccountant; // Spigot
  
  public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements IMojangStatistics, ICommandListener, AutoCloseable, Runnable {
-@@ -670,6 +670,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -674,6 +674,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
          // CraftBukkit end
          MinecraftServer.LOGGER.info("Stopping server");
@@ -679,7 +679,7 @@ index 41638b680d..73b1041c8c 100644
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
-@@ -947,7 +948,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -951,7 +952,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      protected void exit() {}
  
      protected void a(BooleanSupplier booleansupplier) {
@@ -688,7 +688,7 @@ index 41638b680d..73b1041c8c 100644
          this.slackActivityAccountant.tickStarted(); // Spigot
          long i = SystemUtils.getMonotonicNanos();
  
-@@ -968,14 +969,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -972,14 +973,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
  
          if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
@@ -703,7 +703,7 @@ index 41638b680d..73b1041c8c 100644
          }
  
          this.methodProfiler.enter("snooper");
-@@ -998,30 +997,29 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1002,30 +1001,29 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          this.methodProfiler.exit();
          org.spigotmc.WatchdogThread.tick(); // Spigot
          this.slackActivityAccountant.tickEnded(l); // Spigot
@@ -742,7 +742,7 @@ index 41638b680d..73b1041c8c 100644
          // Send time updates to everyone, it will get the right time from the world the player is in.
          if (this.ticks % 20 == 0) {
              for (int i = 0; i < this.getPlayerList().players.size(); ++i) {
-@@ -1029,7 +1027,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1033,7 +1031,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE))); // Add support for per player time
              }
          }
@@ -751,7 +751,7 @@ index 41638b680d..73b1041c8c 100644
  
          while (iterator.hasNext()) {
              WorldServer worldserver = (WorldServer) iterator.next();
-@@ -1072,20 +1070,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1076,20 +1074,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
  
          this.methodProfiler.exitEnter("connection");
@@ -1068,7 +1068,7 @@ index 32981c4422..0e09adf7dc 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 95eb36d15c..09560368fd 100644
+index df518ff633..229cff562f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,5 +1,7 @@
@@ -1157,8 +1157,8 @@ index 95eb36d15c..09560368fd 100644
 +            timings.worldSaveChunks.stopTiming(); // Paper
 +            } // Paper
          }
-     }
  
+         // CraftBukkit start - moved from MinecraftServer.saveChunks
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 index 61ed2ff50a..75b7d3cca8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java

Spigot-Server-Patches/0017-Show-Paper-in-client-crashes-server-lists-and-Mojang.patch

@@ -1,4 +1,4 @@
-From a764546cf091e3868032edb7d31b436787669e29 Mon Sep 17 00:00:00 2001
+From 76b870fb59a434f36aa9455de40fe6a044e1f683 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 14:32:43 -0600
 Subject: [PATCH] Show 'Paper' in client crashes, server lists, and Mojang
@@ -19,10 +19,10 @@ index 3f35a28ba1..cf00f35a5b 100644
                      throwable = throwable1;
                      throw throwable1;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 73b1041c8c..5e0f28b3fe 100644
+index d0419119b3..1346fc35c5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1281,7 +1281,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1285,7 +1285,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {

Spigot-Server-Patches/0023-Further-improve-server-tick-loop.patch

@@ -1,4 +1,4 @@
-From c04a10fa0cfb08d11e768bdf75a7a329c5de7601 Mon Sep 17 00:00:00 2001
+From 172a0901aac5f304b6bcb900fd92729478dfb3c4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 Mar 2016 23:09:29 -0600
 Subject: [PATCH] Further improve server tick loop
@@ -12,7 +12,7 @@ Previous implementation did not calculate TPS correctly.
 Switch to a realistic rolling average and factor in std deviation as an extra reporting variable
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5e0f28b3fe..0a6a8c372d 100644
+index 1346fc35c5..968ce67956 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -147,7 +147,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -33,7 +33,7 @@ index 5e0f28b3fe..0a6a8c372d 100644
      public final double[] recentTps = new double[ 3 ];
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
-@@ -754,6 +754,57 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -758,6 +758,57 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      {
          return ( avg * exp ) + ( tps * ( 1 - exp ) );
      }
@@ -91,7 +91,7 @@ index 5e0f28b3fe..0a6a8c372d 100644
      // Spigot End
  
      public void run() {
-@@ -766,30 +817,38 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -770,30 +821,38 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
                  // Spigot start
                  Arrays.fill( recentTps, 20 );

Spigot-Server-Patches/0025-Entity-Origin-API.patch

@@ -1,4 +1,4 @@
-From 05d8b8cd1f57968af4eb878382bbd42dc5cd3087 Mon Sep 17 00:00:00 2001
+From 4c0fc34009ad13105bbafb5be1d5a1f5b464a530 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 23:45:08 -0600
 Subject: [PATCH] Entity Origin API
@@ -101,10 +101,10 @@ index ce510c4867..b7c94fe238 100644
          if (i >= 0 && i < this.list.size()) {
              NBTBase nbtbase = (NBTBase) this.list.get(i);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 09560368fd..8e2f34ded7 100644
+index 229cff562f..16da9c7acf 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1093,6 +1093,11 @@ public class WorldServer extends World {
+@@ -1103,6 +1103,11 @@ public class WorldServer extends World {
                  this.I.add(((EntityInsentient) entity).getNavigation());
              }
              entity.valid = true; // CraftBukkit

Spigot-Server-Patches/0032-Optimize-explosions.patch

@@ -1,4 +1,4 @@
-From d36da1b37c9f54484374dc44f57812a19bc59b86 Mon Sep 17 00:00:00 2001
+From 0c07fa8b0166461f1f94dc0d8a825d4a5c1066eb Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
@@ -123,10 +123,10 @@ index 7c1305164d..594e7bd94c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 0a6a8c372d..52c0d52046 100644
+index 968ce67956..ffa208e81b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1125,6 +1125,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1129,6 +1129,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
                  this.methodProfiler.exit();
                  this.methodProfiler.exit();

Spigot-Server-Patches/0075-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch

@@ -1,4 +1,4 @@
-From e3ab9802cf0972e1795420e3ca058095e95b082e Mon Sep 17 00:00:00 2001
+From 70f9f02b2648c15e8a214e5ac8d0647bfd9afc25 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener
@@ -32,10 +32,10 @@ index ef392f5fe8..227fe073fd 100644
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 52c0d52046..4e1c03a78c 100644
+index ffa208e81b..a87df2b6fb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1091,6 +1091,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1095,6 +1095,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          while (iterator.hasNext()) {
              WorldServer worldserver = (WorldServer) iterator.next();
  
@@ -66,7 +66,7 @@ index 822db5d4c0..93a061b6b2 100644
                      this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index cefe8340d4..513892aa85 100644
+index b5ff34443c..b7e98bc269 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -68,6 +68,7 @@ public class WorldServer extends World {

Spigot-Server-Patches/0076-Entity-AddTo-RemoveFrom-World-Events.patch

@@ -1,14 +1,14 @@
-From ddb9473e7b3367cf7d4e3096db17b419289fac46 Mon Sep 17 00:00:00 2001
+From 6d05403d0e84f2b76bc5a0824f0a7c05890d08be Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 513892aa85..7bfe2b047b 100644
+index b7e98bc269..edcb99be2c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1099,6 +1099,7 @@ public class WorldServer extends World {
+@@ -1109,6 +1109,7 @@ public class WorldServer extends World {
                  entity.origin = entity.getBukkitEntity().getLocation();
              }
              // Paper end
@@ -16,7 +16,7 @@ index 513892aa85..7bfe2b047b 100644
          }
  
      }
-@@ -1108,6 +1109,7 @@ public class WorldServer extends World {
+@@ -1118,6 +1119,7 @@ public class WorldServer extends World {
          if (this.tickingEntities) {
              throw new IllegalStateException("Removing entity while ticking!");
          } else {

Spigot-Server-Patches/0100-remove-null-possibility-for-getServer-singleton.patch

@@ -1,4 +1,4 @@
-From aa72827fd9ad7117a8a9fdeb5a4ef07fa6d5bed8 Mon Sep 17 00:00:00 2001
+From c075027493e979bc49c932fb993f717f573dc2d1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Apr 2016 00:57:27 -0400
 Subject: [PATCH] remove null possibility for getServer singleton
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f88e42423d..f489d47c60 100644
+index ccfe1b4c3e..1dda1fee9f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -59,6 +59,7 @@ import org.spigotmc.SlackActivityAccountant; // Spigot
@@ -25,7 +25,7 @@ index f88e42423d..f489d47c60 100644
          this.ad = new ResourceManager(EnumResourcePackType.SERVER_DATA, this.serverThread);
          this.resourcePackRepository = new ResourcePackRepository<>(ResourcePackLoader::new);
          this.ah = new CraftingManager();
-@@ -1907,7 +1909,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1911,7 +1913,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      @Deprecated
      public static MinecraftServer getServer() {

Spigot-Server-Patches/0101-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch

@@ -1,4 +1,4 @@
-From 6beaf59f9a063d38ff89c82b77c1fd8d4b076705 Mon Sep 17 00:00:00 2001
+From 4f0a8caec86ab2d551f790fcaa79ffee9a428351 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
@@ -102,10 +102,10 @@ index fc08158937..090d3dbd31 100644
              for ( org.bukkit.map.MapCursor cursor : render.cursors) {
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7bfe2b047b..7b19d74597 100644
+index edcb99be2c..fd2a204d3e 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1036,6 +1036,7 @@ public class WorldServer extends World {
+@@ -1046,6 +1046,7 @@ public class WorldServer extends World {
                          {
                              if ( iter.next().trackee == entity )
                              {

Spigot-Server-Patches/0105-Optimize-UserCache-Thread-Safe.patch

@@ -1,4 +1,4 @@
-From b9e60337d725ca6dfb42893d103124c0f0f68b36 Mon Sep 17 00:00:00 2001
+From 2e5a1a3634a10dcdc74ea8769675d9103b2071f6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 20:47:41 -0400
 Subject: [PATCH] Optimize UserCache / Thread Safe
@@ -10,10 +10,10 @@ Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f489d47c60..ff879d9bd0 100644
+index 1dda1fee9f..065062c616 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -736,7 +736,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -740,7 +740,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          // Spigot start
          if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
              LOGGER.info("Saving usercache.json");

Spigot-Server-Patches/0111-Fix-Double-World-Add-issues.patch

@@ -1,4 +1,4 @@
-From 8409d78cc274cec36417a15ca55786b0ec91d791 Mon Sep 17 00:00:00 2001
+From 3191991ea7c7d2a7e12b03cad3bee921b8f2c97f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues
@@ -8,10 +8,10 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
 Also add debug if something else tries to, and abort before world gets bad state
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7b19d74597..cb2b55de52 100644
+index fd2a204d3e..8fd4478f2b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -926,6 +926,7 @@ public class WorldServer extends World {
+@@ -936,6 +936,7 @@ public class WorldServer extends World {
      // CraftBukkit start
      private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
          org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot

Spigot-Server-Patches/0152-Properly-handle-async-calls-to-restart-the-server.patch

@@ -1,4 +1,4 @@
-From d32338b1651e63ce6cb2dc9caf8996f4001d8a92 Mon Sep 17 00:00:00 2001
+From 8eab04cea452331e234fd2e9efab94ba9b062fc0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 12 May 2017 23:34:11 -0500
 Subject: [PATCH] Properly handle async calls to restart the server
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ff879d9bd0..302a015790 100644
+index 065062c616..36d29b3324 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -78,6 +78,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -41,7 +41,7 @@ index ff879d9bd0..302a015790 100644
      private boolean isStopped;
      private int ticks;
      protected final Proxy proxy;
-@@ -699,7 +700,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -703,7 +704,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          if (this.playerList != null) {
              MinecraftServer.LOGGER.info("Saving players");
              this.playerList.savePlayers();
@@ -50,7 +50,7 @@ index ff879d9bd0..302a015790 100644
              try { Thread.sleep(100); } catch (InterruptedException ex) {} // CraftBukkit - SPIGOT-625 - give server at least a chance to send packets
          }
  
-@@ -753,8 +754,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -757,8 +758,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          return this.isRunning;
      }
  
@@ -64,7 +64,7 @@ index ff879d9bd0..302a015790 100644
          if (flag) {
              try {
                  this.serverThread.join();
-@@ -764,6 +770,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -768,6 +774,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
  
      }

Spigot-Server-Patches/0156-Use-TerminalConsoleAppender-for-console-improvements.patch

@@ -1,4 +1,4 @@
-From f0943de513aa9ab6b3b92f860e03f978e904d834 Mon Sep 17 00:00:00 2001
+From f6cc721c80acddf822ac4edb3f47e97140c03bea Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index e8134bf0eb..ef508bbd71 100644
+index 75c1b84f6a..58ccbaa1ae 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -41,10 +41,27 @@
@@ -185,7 +185,7 @@ index 6e1509c2c1..26b35855e1 100644
          System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
          System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 302a015790..4cf05e56fb 100644
+index 36d29b3324..f340f4bfe3 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -48,7 +48,7 @@ import org.apache.commons.lang3.Validate;
@@ -225,7 +225,7 @@ index 302a015790..4cf05e56fb 100644
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
      }
      // CraftBukkit end
-@@ -927,7 +931,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -931,7 +935,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              } finally {
                  // CraftBukkit start - Restore terminal to original settings
                  try {
@@ -234,7 +234,7 @@ index 302a015790..4cf05e56fb 100644
                  } catch (Exception ignored) {
                  }
                  // CraftBukkit end
-@@ -1409,7 +1413,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1413,7 +1417,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      @Override
      public void sendMessage(IChatBaseComponent ichatbasecomponent) {

Spigot-Server-Patches/0162-Basic-PlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From 223f10e2086757e709798bb3d5c232c416812710 Mon Sep 17 00:00:00 2001
+From e961e12849371c52121475dba18b552bee9ed306 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 22:11:48 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -429,10 +429,10 @@ index 1f6a126329..6d278a0da5 100644
       * Calculates distance between 2 entities
       * @param e1
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4cf05e56fb..bf63e9ff33 100644
+index f340f4bfe3..c229651b50 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1240,7 +1240,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1244,7 +1244,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              DispenserRegistry.init();
              DispenserRegistry.c();
              String s = "."; // PAIL?
@@ -441,7 +441,7 @@ index 4cf05e56fb..bf63e9ff33 100644
              MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();
              GameProfileRepository gameprofilerepository = yggdrasilauthenticationservice.createProfileRepository();
              UserCache usercache = new UserCache(gameprofilerepository, new File(s, MinecraftServer.b.getName()));
-@@ -1700,6 +1700,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1704,6 +1704,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          this.G = i;
      }
  

Spigot-Server-Patches/0209-Implement-extended-PaperServerListPingEvent.patch

@@ -1,4 +1,4 @@
-From 6652b707a44fa9f349b165c09cadc2e2d8f882b3 Mon Sep 17 00:00:00 2001
+From 0d93958a9f51a86cc7d7bc5d7543240d6d6de6b1 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 15:56:26 +0200
 Subject: [PATCH] Implement extended PaperServerListPingEvent
@@ -177,7 +177,7 @@ index 0000000000..a85466bc7e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index bf63e9ff33..f21b825719 100644
+index c229651b50..946803e2be 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,5 +1,8 @@
@@ -189,7 +189,7 @@ index bf63e9ff33..f21b825719 100644
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.gson.JsonElement;
-@@ -1043,7 +1046,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1047,7 +1050,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          if (i - this.Y >= 5000000000L) {
              this.Y = i;
              this.serverPing.setPlayerSample(new ServerPing.ServerPingPlayerSample(this.getMaxPlayers(), this.getPlayerCount()));

Spigot-Server-Patches/0225-Expand-World.spawnParticle-API-and-add-Builder.patch

@@ -1,4 +1,4 @@
-From 280ecc1a95cda2a1b64c508670b900f902527210 Mon Sep 17 00:00:00 2001
+From 6a652351f60fd0d151663a43c4fc08cf06169867 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 15 Aug 2017 22:29:12 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 1fddc5fda2..4ebc9b50fb 100644
+index 6bd60ce46c..4e17f74ff0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -48,7 +48,7 @@ public class WorldServer extends World {
@@ -22,7 +22,7 @@ index 1fddc5fda2..4ebc9b50fb 100644
      boolean tickingEntities;
      private final MinecraftServer server;
      private final WorldNBTStorage dataManager;
-@@ -1321,12 +1321,17 @@ public class WorldServer extends World {
+@@ -1331,12 +1331,17 @@ public class WorldServer extends World {
      }
  
      public <T extends ParticleParam> int sendParticles(EntityPlayer sender, T t0, double d0, double d1, double d2, int i, double d3, double d4, double d5, double d6, boolean force) {

Spigot-Server-Patches/0248-InventoryCloseEvent-Reason-API.patch

@@ -1,4 +1,4 @@
-From 58ba763c5947745c305f8c75eb447fd464f04162 Mon Sep 17 00:00:00 2001
+From 948edd8a1cb0f5e2518a52386f557246e1ab7fb8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -114,10 +114,10 @@ index a167843bfb..9e5cd22d7d 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4ebc9b50fb..af947df472 100644
+index 4e17f74ff0..c55a2a213f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -979,7 +979,7 @@ public class WorldServer extends World {
+@@ -989,7 +989,7 @@ public class WorldServer extends World {
                  {
                      if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
                      {
@@ -126,7 +126,7 @@ index 4ebc9b50fb..af947df472 100644
                      }
                  }
              }
-@@ -1002,7 +1002,7 @@ public class WorldServer extends World {
+@@ -1012,7 +1012,7 @@ public class WorldServer extends World {
                      {
                          if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
                          {

Spigot-Server-Patches/0253-Re-add-vanilla-entity-warnings-for-duplicates.patch

@@ -1,4 +1,4 @@
-From b2bae68a9c895972449ba774a74171469be8e13b Mon Sep 17 00:00:00 2001
+From 8c526f139e36db37c38b5bcea39c42781da65d6f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:08:05 -0400
 Subject: [PATCH] Re-add vanilla entity warnings for duplicates
@@ -8,10 +8,10 @@ These are a critical sign that somethin went wrong, and you've lost some data...
 We should kind of know about these things you know.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index af947df472..4efc310d93 100644
+index c55a2a213f..1e727fa989 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -964,7 +964,8 @@ public class WorldServer extends World {
+@@ -974,7 +974,8 @@ public class WorldServer extends World {
          if (entity1 == null) {
              return false;
          } else {

Spigot-Server-Patches/0257-Add-Debug-Entities-option-to-debug-dupe-uuid-issues.patch

@@ -1,4 +1,4 @@
-From 12ee9e1a682177e3264cc0e1507ed00dd5048425 Mon Sep 17 00:00:00 2001
+From 6b76b838c87ba763ff99a5c639382d2dabe59ddd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 08:25:40 -0400
 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
@@ -52,7 +52,7 @@ index 985b459efe..f476f326f1 100644
      public boolean captureBlockStates = false;
      public boolean captureTreeGeneration = false;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4efc310d93..54b4d649d1 100644
+index 1e727fa989..e36e1c2721 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -69,6 +69,9 @@ public class WorldServer extends World {
@@ -65,7 +65,7 @@ index 4efc310d93..54b4d649d1 100644
  
      // Add env and gen to constructor
      public WorldServer(MinecraftServer minecraftserver, Executor executor, WorldNBTStorage worldnbtstorage, WorldData worlddata, DimensionManager dimensionmanager, GameProfilerFiller gameprofilerfiller, WorldLoadListener worldloadlistener, org.bukkit.World.Environment env, org.bukkit.generator.ChunkGenerator gen) {
-@@ -928,6 +931,12 @@ public class WorldServer extends World {
+@@ -938,6 +941,12 @@ public class WorldServer extends World {
          org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot
          if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); return true; } // Paper
          if (entity.dead) {
@@ -78,7 +78,7 @@ index 4efc310d93..54b4d649d1 100644
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
              return false;
          } else if (this.isUUIDTaken(entity)) {
-@@ -1091,7 +1100,24 @@ public class WorldServer extends World {
+@@ -1101,7 +1110,24 @@ public class WorldServer extends World {
                  }
              }
  

Spigot-Server-Patches/0271-Ignore-Dead-Entities-in-entityList-iteration.patch

@@ -1,4 +1,4 @@
-From cce4586d627b67b551e8f3e63a58caec8168a792 Mon Sep 17 00:00:00 2001
+From cf1eba4249fbb1139b10ce3007247a2b4d5d62b1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@@ -63,10 +63,10 @@ index e1cd5e72a5..b02b084556 100644
      private float av;
      private float aw;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 54b4d649d1..6456f21d7b 100644
+index e36e1c2721..adeff1ef19 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -836,6 +836,7 @@ public class WorldServer extends World {
+@@ -846,6 +846,7 @@ public class WorldServer extends World {
  
          while (objectiterator.hasNext()) {
              Entity entity = (Entity) objectiterator.next();
@@ -74,7 +74,7 @@ index 54b4d649d1..6456f21d7b 100644
              // CraftBukkit start - Split out persistent check, don't apply it to special persistent mobs
              if (entity instanceof EntityInsentient) {
                  EntityInsentient entityinsentient = (EntityInsentient) entity;
-@@ -1128,6 +1129,7 @@ public class WorldServer extends World {
+@@ -1138,6 +1139,7 @@ public class WorldServer extends World {
                  entity.origin = entity.getBukkitEntity().getLocation();
              }
              // Paper end
@@ -82,7 +82,7 @@ index 54b4d649d1..6456f21d7b 100644
              new com.destroystokyo.paper.event.entity.EntityAddToWorldEvent(entity.getBukkitEntity()).callEvent(); // Paper - fire while valid
          }
  
-@@ -1142,6 +1144,7 @@ public class WorldServer extends World {
+@@ -1152,6 +1154,7 @@ public class WorldServer extends World {
              this.removeEntityFromChunk(entity);
              this.entitiesById.remove(entity.getId());
              this.unregisterEntity(entity);

Spigot-Server-Patches/0281-Add-Early-Warning-Feature-to-WatchDog.patch

@@ -1,4 +1,4 @@
-From 26ed76d068fb392061066468cf3cfed66e998760 Mon Sep 17 00:00:00 2001
+From b26772db491bba5d3aafa87ad747cdbe65fb5874 Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Wed, 8 Aug 2018 15:30:52 -0400
 Subject: [PATCH] Add Early Warning Feature to WatchDog
@@ -36,10 +36,10 @@ index 207e5d3e23..a13c8c68b6 100644
      public static int tabSpamLimit = 500;
      private static void tabSpamLimiters() {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index f21b825719..5daee73a84 100644
+index 946803e2be..fe8647bbc6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -846,6 +846,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -850,6 +850,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  this.a(this.serverPing);
  
                  // Spigot start

Spigot-Server-Patches/0289-Send-nearby-packets-from-world-player-list-not-serve.patch

@@ -1,4 +1,4 @@
-From bcd425bdaac9fbe106367952d7bdd769666d014f Mon Sep 17 00:00:00 2001
+From a80635947334c0cdcced16154df86a2df8e2cc64 Mon Sep 17 00:00:00 2001
 From: Mystiflow <mystiflow@gmail.com>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list
@@ -46,10 +46,10 @@ index 9e5cd22d7d..049d702cb9 100644
                  double d5 = d1 - entityplayer.locY;
                  double d6 = d2 - entityplayer.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 6456f21d7b..e7e6c3e949 100644
+index adeff1ef19..990c0afb85 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1177,7 +1177,7 @@ public class WorldServer extends World {
+@@ -1187,7 +1187,7 @@ public class WorldServer extends World {
          }
          // CraftBukkit end
          this.globalEntityList.add(entitylightning);
@@ -58,7 +58,7 @@ index 6456f21d7b..e7e6c3e949 100644
      }
  
      @Override
-@@ -1309,7 +1309,7 @@ public class WorldServer extends World {
+@@ -1319,7 +1319,7 @@ public class WorldServer extends World {
              BlockActionData blockactiondata = (BlockActionData) this.J.removeFirst();
  
              if (this.a(blockactiondata)) {

Spigot-Server-Patches/0291-Optimize-Hoppers.patch

@@ -1,4 +1,4 @@
-From f4bf1149c60116b9e9675959c53237ec0afbf000 Mon Sep 17 00:00:00 2001
+From 62264deed642f84486c25015c6936fb9d3fc6e57 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
@@ -47,10 +47,10 @@ index b9c5af51f5..ab66dbf885 100644
          itemstack.d(this.C());
          if (this.tag != null) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5daee73a84..d100200518 100644
+index fe8647bbc6..6c7ce47c5a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1123,6 +1123,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1127,6 +1127,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              WorldServer worldserver = (WorldServer) iterator.next();
  
              worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper

Spigot-Server-Patches/0325-Limit-lightning-strike-effect-distance.patch

@@ -1,4 +1,4 @@
-From 5707a4a4389fbc4341302f33aac2ea2d467ae792 Mon Sep 17 00:00:00 2001
+From 9a69ff4a0e316e4a1ae035872f6d248b57dfa3c2 Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance
@@ -69,10 +69,10 @@ index 0169f261c6..da85786046 100644
  
          --this.lifeTicks;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e7e6c3e949..cce69d555d 100644
+index 990c0afb85..2870236108 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1177,7 +1177,7 @@ public class WorldServer extends World {
+@@ -1187,7 +1187,7 @@ public class WorldServer extends World {
          }
          // CraftBukkit end
          this.globalEntityList.add(entitylightning);

Spigot-Server-Patches/0337-Optimize-World-Time-Updates.patch

@@ -1,4 +1,4 @@
-From ab477a2841453fbb8110b45953360c08f760ae77 Mon Sep 17 00:00:00 2001
+From 741ab9b96c8ad7ef2ac054c881efef3c6d9853f4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Nov 2018 23:11:51 -0400
 Subject: [PATCH] Optimize World Time Updates
@@ -8,10 +8,10 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 2198b4fbc9..252c50bb72 100644
+index cb630fda6e..f222d44706 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1110,12 +1110,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1114,12 +1114,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
          MinecraftTimings.timeUpdateTimer.startTiming(); // Spigot // Paper
          // Send time updates to everyone, it will get the right time from the world the player is in.

Spigot-Server-Patches/0369-Entity-getEntitySpawnReason.patch

@@ -1,4 +1,4 @@
-From 14e3a8daeb331da5d5ad4e290970d76b045ff515 Mon Sep 17 00:00:00 2001
+From 0c14f59b254501f4ae16ca3596c68363c42fd654 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:24:52 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason
@@ -72,10 +72,10 @@ index 65df0e7c8c..abddc8895e 100644
              });
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index cce69d555d..c4d2d9c1c8 100644
+index 2870236108..a85125133b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -930,6 +930,7 @@ public class WorldServer extends World {
+@@ -940,6 +940,7 @@ public class WorldServer extends World {
      // CraftBukkit start
      private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
          org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot

Spigot-Server-Patches/0375-Server-Tick-Events.patch

@@ -1,4 +1,4 @@
-From 4410433c260bf8f18b5a7cbe2f4b0b3feb104254 Mon Sep 17 00:00:00 2001
+From 8ac43d682c6b4a7609f15fbf734e754fbcb37f99 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 22:48:45 -0400
 Subject: [PATCH] Server Tick Events
@@ -6,10 +6,10 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 252c50bb72..c20d9aab38 100644
+index f222d44706..1e2f2f8b99 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1040,6 +1040,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1044,6 +1044,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          co.aikar.timings.TimingsManager.FULL_SERVER_TICK.startTiming(); // Paper
          this.slackActivityAccountant.tickStarted(); // Spigot
          long i = SystemUtils.getMonotonicNanos();
@@ -17,7 +17,7 @@ index 252c50bb72..c20d9aab38 100644
  
          ++this.ticks;
          this.b(booleansupplier);
-@@ -1086,6 +1087,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1090,6 +1091,11 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          this.methodProfiler.exit();
          org.spigotmc.WatchdogThread.tick(); // Spigot
          this.slackActivityAccountant.tickEnded(l); // Spigot

Spigot-Server-Patches/0388-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch

@@ -1,4 +1,4 @@
-From 32405aae871c645e3bf32a91d543e11939ca5670 Mon Sep 17 00:00:00 2001
+From 801cb17b7da0c23110aa556ea58fe7b57b8fa667 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 13 May 2019 21:10:59 -0700
 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer
@@ -16,10 +16,10 @@ handling that should have been handled synchronously will be handled
 synchronously when the server gets shut down.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 56951b44f9..5f62ffe182 100644
+index 55e8db8a09..8136a97f44 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1939,7 +1939,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1943,7 +1943,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      // CraftBukkit start
      @Override
      public boolean isMainThread() {

Spigot-Server-Patches/0390-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch

@@ -1,4 +1,4 @@
-From 2ae762722dcd0a51c29be0c8e2f03bdeed1f954e Mon Sep 17 00:00:00 2001
+From 8204aa5fffdbbb1ca68007a8ef1d810b42f5fbb1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 21:49:53 -0400
 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks
@@ -19,7 +19,7 @@ This change ensures the chunks are always loaded when entities are
 added to the world, or a valid entity moves between chunks.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c4d2d9c1c8..9a353b0482 100644
+index a85125133b..d47ef7efa0 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -635,7 +635,7 @@ public class WorldServer extends World {
@@ -31,7 +31,7 @@ index c4d2d9c1c8..9a353b0482 100644
                  entity.inChunk = false;
              } else {
                  this.getChunkAt(i, k).a(entity);
-@@ -948,7 +948,7 @@ public class WorldServer extends World {
+@@ -958,7 +958,7 @@ public class WorldServer extends World {
                  return false;
              }
              // CraftBukkit end

Spigot-Server-Patches/0391-Duplicate-UUID-Resolve-Option.patch

@@ -1,4 +1,4 @@
-From 943c29a529c68835040dbfd9873404794c6ee1f6 Mon Sep 17 00:00:00 2001
+From 00c905e8f9463fb48355510fd7912327126e0b62 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -195,7 +195,7 @@ index b38bc77c93..9102bf8b60 100644
  
                      if (list != null) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9a353b0482..47731c56dc 100644
+index d47ef7efa0..52a0e0a37f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -207,7 +207,7 @@ index 9a353b0482..47731c56dc 100644
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
  import com.google.common.collect.Queues;
-@@ -975,8 +977,23 @@ public class WorldServer extends World {
+@@ -985,8 +987,23 @@ public class WorldServer extends World {
          if (entity1 == null) {
              return false;
          } else {
@@ -233,7 +233,7 @@ index 9a353b0482..47731c56dc 100644
              return true;
          }
      }
-@@ -1107,7 +1124,7 @@ public class WorldServer extends World {
+@@ -1117,7 +1134,7 @@ public class WorldServer extends World {
              }
  
              Entity old = this.entitiesByUUID.put(entity.getUniqueID(), entity);

Spigot-Server-Patches/0393-Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -1,4 +1,4 @@
-From 884a33c2405b7e77c5da84c21497c7e431f85588 Mon Sep 17 00:00:00 2001
+From b72f3b3fdf5470f62e2f7dc93edccfb421a0b3cf 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 5f62ffe182..b401ff7695 100644
+index 8136a97f44..d6c99ce897 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -569,6 +569,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -103,10 +103,10 @@ index 3868572aed..ae77805f71 100644
      @Override
      public void a(ChunkCoordIntPair chunkcoordintpair) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 47731c56dc..d086af67f9 100644
+index 52a0e0a37f..2e697675e2 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1485,13 +1485,85 @@ public class WorldServer extends World {
+@@ -1495,13 +1495,85 @@ public class WorldServer extends World {
          return ((PersistentIdCounts) this.getMinecraftServer().getWorldServer(DimensionManager.OVERWORLD).getWorldPersistentData().a(PersistentIdCounts::new, "idcounts")).a();
      }
  

Spigot-Server-Patches/0400-incremental-chunk-saving.patch

@@ -1,4 +1,4 @@
-From fe90f3351f14e18c2f52fd111ca191e0d3b14940 Mon Sep 17 00:00:00 2001
+From 5693970605167ed65dea700efc6ad5705f910742 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 9 Jun 2019 03:53:22 +0100
 Subject: [PATCH] incremental chunk saving
@@ -42,7 +42,7 @@ index 5bf781bb63..e2a48695df 100644
      private long t;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b401ff7695..485725c0ae 100644
+index d6c99ce897..2b99fdc630 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -155,6 +155,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -53,7 +53,7 @@ index b401ff7695..485725c0ae 100644
      public File bukkitDataPackFolder;
      public CommandDispatcher vanillaCommandDispatcher;
      private boolean forceTicks;
-@@ -1071,14 +1072,28 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1075,14 +1076,28 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              this.serverPing.b().a(agameprofile);
          }
  
@@ -126,7 +126,7 @@ index d85220b66c..c4ad039ffd 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index d086af67f9..52523789b2 100644
+index 2e697675e2..ec3b6ec5cf 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -755,8 +755,9 @@ public class WorldServer extends World {

work/Bukkit

@@ -1 +1 @@
-Subproject commit 3dc4cdcdb1ccd3a21d3679bed5735fb4ecc23692
+Subproject commit aba2aaaf4567b3ba175fd8062191022d37658b96

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit f1f33559fab04373c940fee1668c62933a9b4ab9
+Subproject commit e8b39d430a77c2e53656b4c7bc2ed4b4a2b48a00

work/Spigot

@@ -1 +1 @@
-Subproject commit 4d2f30f1bea328b673c4d670504ff5c73d8d9579
+Subproject commit 595711b0a7edc63bb24a860f717dc7bb8e00805f