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:
3dc4cdcd Update to Minecraft 1.14.3-pre4
88b25a8c SPIGOT-5098: Add a method to allow colored sign changes
6d913552 Update to Minecraft 1.14.3-pre4

CraftBukkit Changes:
f1f33559 Update to Minecraft 1.14.3
8a3d3f49 SPIGOT-5098: Add a method to allow colored sign changes
533290e2 SPIGOT-5100: Console warning from pig zombie targeting
6dde4b9f SPIGOT-5094: Allow opening merchant for wandering traders and hide the xp bar for custom merchants
9af90077 SPIGOT-5097: Bukkit.clearRecipes() no longer working
38fa220f Fix setting game rules via the API
fe3930ce Update to Minecraft 1.14.3-pre4
da071ec5 Remove outdated build delay.

Spigot Changes:
4d2f30f1 Update to Minecraft 1.14.3
f16400e3 Update to Minecraft 1.14.3-pre4

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

@@ -1,14 +1,14 @@
-From 4110bb0715fb2cd59da12c0b29d17b6d92065689 Mon Sep 17 00:00:00 2001
+From 614fd245b215d849e362c4d12e258a741ce94292 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 5ddf33938..2a2abac96 100644
+index 83eb5a39..41708a2b 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -2,34 +2,29 @@
+@@ -2,34 +2,28 @@
  <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,7 @@ index 5ddf33938..2a2abac96 100644
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper-api</artifactId>
-     <version>1.14.2-R0.1-SNAPSHOT</version>
+     <version>1.14.3-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Spigot-API</name>
@@ -34,7 +34,6 @@ index 5ddf33938..2a2abac96 100644
      <properties>
 -        <skipTests>true</skipTests>
 +        <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
-+        <!-- Paper - #Logic -->
          <maven.compiler.source>1.8</maven.compiler.source>
          <maven.compiler.target>1.8</maven.compiler.target>
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -54,7 +53,7 @@ index 5ddf33938..2a2abac96 100644
      <repositories>
          <!--
              If you are a plugin developer, please use https://hub.spigotmc.org/nexus/content/repositories/snapshots/
-@@ -41,6 +36,10 @@
+@@ -41,6 +35,10 @@
              <id>spigotmc-public</id>
              <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
          </repository>
@@ -65,7 +64,7 @@ index 5ddf33938..2a2abac96 100644
      </repositories>
  
      <pluginRepositories>
-@@ -57,6 +56,20 @@
+@@ -57,6 +55,20 @@
              <version>2.6</version>
              <scope>compile</scope>
          </dependency>
@@ -86,7 +85,7 @@ index 5ddf33938..2a2abac96 100644
          <!-- bundled with Minecraft, should be kept in sync -->
          <dependency>
              <groupId>com.google.guava</groupId>
-@@ -113,15 +126,12 @@
+@@ -113,15 +125,12 @@
      </dependencies>
  
      <build>
@@ -103,7 +102,7 @@ index 5ddf33938..2a2abac96 100644
                  <dependencies>
                      <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
                      <dependency>
-@@ -156,6 +166,7 @@
+@@ -156,6 +165,7 @@
                      </execution>
                  </executions>
                  <configuration>
@@ -112,5 +111,5 @@ index 5ddf33938..2a2abac96 100644
                      <shadedArtifactAttached>true</shadedArtifactAttached>
                  </configuration>
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,4 +1,4 @@
-From 807914ba1f9c48905a288418d8c30d15adb42c7c Mon Sep 17 00:00:00 2001
+From 4d727d07067bf90febccacc7c46b151e7a4dfc3f 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 2a2abac96..81851a293 100644
+index 41708a2b..3b650cbc 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -50,6 +50,12 @@
+@@ -49,6 +49,12 @@
      </pluginRepositories>
  
      <dependencies>
@@ -23,5 +23,5 @@ index 2a2abac96..81851a293 100644
              <groupId>commons-lang</groupId>
              <artifactId>commons-lang</artifactId>
 -- 
-2.21.0
+2.22.0
 

Spigot-API-Patches/0004-Timings-v2.patch

@@ -1,4 +1,4 @@
-From abbdc3ccdc193cc48ec75f0ed89e031db717f5e6 Mon Sep 17 00:00:00 2001
+From 6b3f507c26cc2a553c087f4d936bf0574984f808 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 18:48:17 -0600
 Subject: [PATCH] Timings v2
@@ -6,7 +6,7 @@ Subject: [PATCH] Timings v2
 
 diff --git a/src/main/java/co/aikar/timings/FullServerTickHandler.java b/src/main/java/co/aikar/timings/FullServerTickHandler.java
 new file mode 100644
-index 000000000..64531fcce
+index 00000000..64531fcc
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/FullServerTickHandler.java
 @@ -0,0 +1,84 @@
@@ -96,7 +96,7 @@ index 000000000..64531fcce
 +}
 diff --git a/src/main/java/co/aikar/timings/NullTimingHandler.java b/src/main/java/co/aikar/timings/NullTimingHandler.java
 new file mode 100644
-index 000000000..9b45ce887
+index 00000000..9b45ce88
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/NullTimingHandler.java
 @@ -0,0 +1,68 @@
@@ -170,7 +170,7 @@ index 000000000..9b45ce887
 +}
 diff --git a/src/main/java/co/aikar/timings/TimedEventExecutor.java b/src/main/java/co/aikar/timings/TimedEventExecutor.java
 new file mode 100644
-index 000000000..933ecf9bd
+index 00000000..933ecf9b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimedEventExecutor.java
 @@ -0,0 +1,83 @@
@@ -259,7 +259,7 @@ index 000000000..933ecf9bd
 +}
 diff --git a/src/main/java/co/aikar/timings/Timing.java b/src/main/java/co/aikar/timings/Timing.java
 new file mode 100644
-index 000000000..a21e5ead5
+index 00000000..a21e5ead
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timing.java
 @@ -0,0 +1,83 @@
@@ -348,7 +348,7 @@ index 000000000..a21e5ead5
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingData.java b/src/main/java/co/aikar/timings/TimingData.java
 new file mode 100644
-index 000000000..a5d13a1e4
+index 00000000..a5d13a1e
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingData.java
 @@ -0,0 +1,122 @@
@@ -476,7 +476,7 @@ index 000000000..a5d13a1e4
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHandler.java b/src/main/java/co/aikar/timings/TimingHandler.java
 new file mode 100644
-index 000000000..cc0390c06
+index 00000000..cc0390c0
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHandler.java
 @@ -0,0 +1,227 @@
@@ -709,7 +709,7 @@ index 000000000..cc0390c06
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHistory.java b/src/main/java/co/aikar/timings/TimingHistory.java
 new file mode 100644
-index 000000000..ddaed8127
+index 00000000..ddaed812
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistory.java
 @@ -0,0 +1,354 @@
@@ -1069,7 +1069,7 @@ index 000000000..ddaed8127
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingHistoryEntry.java b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
 new file mode 100644
-index 000000000..86d5ac6bd
+index 00000000..86d5ac6b
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingHistoryEntry.java
 @@ -0,0 +1,58 @@
@@ -1133,7 +1133,7 @@ index 000000000..86d5ac6bd
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingIdentifier.java b/src/main/java/co/aikar/timings/TimingIdentifier.java
 new file mode 100644
-index 000000000..df142a89b
+index 00000000..df142a89
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingIdentifier.java
 @@ -0,0 +1,116 @@
@@ -1255,7 +1255,7 @@ index 000000000..df142a89b
 +}
 diff --git a/src/main/java/co/aikar/timings/Timings.java b/src/main/java/co/aikar/timings/Timings.java
 new file mode 100644
-index 000000000..0b34e0d01
+index 00000000..0b34e0d0
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/Timings.java
 @@ -0,0 +1,293 @@
@@ -1554,7 +1554,7 @@ index 000000000..0b34e0d01
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsCommand.java b/src/main/java/co/aikar/timings/TimingsCommand.java
 new file mode 100644
-index 000000000..c0d8f2016
+index 00000000..c0d8f201
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsCommand.java
 @@ -0,0 +1,122 @@
@@ -1682,7 +1682,7 @@ index 000000000..c0d8f2016
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsExport.java b/src/main/java/co/aikar/timings/TimingsExport.java
 new file mode 100644
-index 000000000..5923adfe6
+index 00000000..5923adfe
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsExport.java
 @@ -0,0 +1,355 @@
@@ -2043,7 +2043,7 @@ index 000000000..5923adfe6
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsManager.java b/src/main/java/co/aikar/timings/TimingsManager.java
 new file mode 100644
-index 000000000..ef824d701
+index 00000000..ef824d70
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsManager.java
 @@ -0,0 +1,188 @@
@@ -2237,7 +2237,7 @@ index 000000000..ef824d701
 +}
 diff --git a/src/main/java/co/aikar/timings/TimingsReportListener.java b/src/main/java/co/aikar/timings/TimingsReportListener.java
 new file mode 100644
-index 000000000..bf3e059fe
+index 00000000..bf3e059f
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/TimingsReportListener.java
 @@ -0,0 +1,75 @@
@@ -2318,7 +2318,7 @@ index 000000000..bf3e059fe
 +}
 diff --git a/src/main/java/co/aikar/timings/UnsafeTimingHandler.java b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
 new file mode 100644
-index 000000000..632c49615
+index 00000000..632c4961
 --- /dev/null
 +++ b/src/main/java/co/aikar/timings/UnsafeTimingHandler.java
 @@ -0,0 +1,53 @@
@@ -2377,7 +2377,7 @@ index 000000000..632c49615
 +}
 diff --git a/src/main/java/co/aikar/util/Counter.java b/src/main/java/co/aikar/util/Counter.java
 new file mode 100644
-index 000000000..80155072d
+index 00000000..80155072
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/Counter.java
 @@ -0,0 +1,38 @@
@@ -2421,7 +2421,7 @@ index 000000000..80155072d
 +}
 diff --git a/src/main/java/co/aikar/util/JSONUtil.java b/src/main/java/co/aikar/util/JSONUtil.java
 new file mode 100644
-index 000000000..190bf0598
+index 00000000..190bf059
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/JSONUtil.java
 @@ -0,0 +1,140 @@
@@ -2567,7 +2567,7 @@ index 000000000..190bf0598
 +}
 diff --git a/src/main/java/co/aikar/util/LoadingIntMap.java b/src/main/java/co/aikar/util/LoadingIntMap.java
 new file mode 100644
-index 000000000..63a899c7d
+index 00000000..63a899c7
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingIntMap.java
 @@ -0,0 +1,76 @@
@@ -2649,7 +2649,7 @@ index 000000000..63a899c7d
 +}
 diff --git a/src/main/java/co/aikar/util/LoadingMap.java b/src/main/java/co/aikar/util/LoadingMap.java
 new file mode 100644
-index 000000000..aedbb0332
+index 00000000..aedbb033
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/LoadingMap.java
 @@ -0,0 +1,368 @@
@@ -3023,7 +3023,7 @@ index 000000000..aedbb0332
 +}
 diff --git a/src/main/java/co/aikar/util/MRUMapCache.java b/src/main/java/co/aikar/util/MRUMapCache.java
 new file mode 100644
-index 000000000..5989ee212
+index 00000000..5989ee21
 --- /dev/null
 +++ b/src/main/java/co/aikar/util/MRUMapCache.java
 @@ -0,0 +1,111 @@
@@ -3139,7 +3139,7 @@ index 000000000..5989ee212
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 0822b8e53..940c643df 100644
+index 0822b8e5..940c643d 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -574,7 +574,6 @@ public final class Bukkit {
@@ -3151,7 +3151,7 @@ index 0822b8e53..940c643df 100644
  
      /**
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 11c5c2054..c197e3811 100644
+index 11c5c205..c197e381 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -1250,6 +1250,26 @@ public interface Server extends PluginMessageRecipient {
@@ -3182,7 +3182,7 @@ index 11c5c2054..c197e3811 100644
           * Sends the component to the player
           *
 diff --git a/src/main/java/org/bukkit/UnsafeValues.java b/src/main/java/org/bukkit/UnsafeValues.java
-index 247d194f8..72c5501e8 100644
+index 247d194f..72c5501e 100644
 --- a/src/main/java/org/bukkit/UnsafeValues.java
 +++ b/src/main/java/org/bukkit/UnsafeValues.java
 @@ -69,4 +69,12 @@ public interface UnsafeValues {
@@ -3200,7 +3200,7 @@ index 247d194f8..72c5501e8 100644
  }
 diff --git a/src/main/java/org/bukkit/command/BufferedCommandSender.java b/src/main/java/org/bukkit/command/BufferedCommandSender.java
 new file mode 100644
-index 000000000..f9a00aecc
+index 00000000..f9a00aec
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/BufferedCommandSender.java
 @@ -0,0 +1,21 @@
@@ -3226,7 +3226,7 @@ index 000000000..f9a00aecc
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 4bfc21468..03bdc1622 100644
+index 4bfc2146..03bdc162 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -33,7 +33,8 @@ public abstract class Command {
@@ -3256,7 +3256,7 @@ index 4bfc21468..03bdc1622 100644
              return true;
          }
 diff --git a/src/main/java/org/bukkit/command/FormattedCommandAlias.java b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
-index d6c8938b1..a6ad94ef9 100644
+index d6c8938b..a6ad94ef 100644
 --- a/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 +++ b/src/main/java/org/bukkit/command/FormattedCommandAlias.java
 @@ -9,6 +9,7 @@ public class FormattedCommandAlias extends Command {
@@ -3280,7 +3280,7 @@ index d6c8938b1..a6ad94ef9 100644
      }
 diff --git a/src/main/java/org/bukkit/command/MessageCommandSender.java b/src/main/java/org/bukkit/command/MessageCommandSender.java
 new file mode 100644
-index 000000000..ca1893e9f
+index 00000000..ca1893e9
 --- /dev/null
 +++ b/src/main/java/org/bukkit/command/MessageCommandSender.java
 @@ -0,0 +1,114 @@
@@ -3399,7 +3399,7 @@ index 000000000..ca1893e9f
 +
 +}
 diff --git a/src/main/java/org/bukkit/command/SimpleCommandMap.java b/src/main/java/org/bukkit/command/SimpleCommandMap.java
-index 81e4fa573..f020cb04e 100644
+index 81e4fa57..f020cb04 100644
 --- a/src/main/java/org/bukkit/command/SimpleCommandMap.java
 +++ b/src/main/java/org/bukkit/command/SimpleCommandMap.java
 @@ -15,7 +15,6 @@ import org.bukkit.command.defaults.BukkitCommand;
@@ -3456,7 +3456,7 @@ index 81e4fa573..f020cb04e 100644
  
 diff --git a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java b/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 deleted file mode 100644
-index 6023e4f61..000000000
+index 6023e4f6..00000000
 --- a/src/main/java/org/bukkit/command/defaults/TimingsCommand.java
 +++ /dev/null
 @@ -1,253 +0,0 @@
@@ -3714,10 +3714,10 @@ index 6023e4f61..000000000
 -    // Spigot end
 -}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 766c724be..72b08e73a 100644
+index ae6274d7..bf0b8bf1 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1580,6 +1580,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1601,6 +1601,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent... components) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
@@ -3730,7 +3730,7 @@ index 766c724be..72b08e73a 100644
  
      @NotNull
 diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
-index f648c5989..78a2d2f8d 100644
+index f648c598..78a2d2f8 100644
 --- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 +++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java
 @@ -297,7 +297,6 @@ public final class SimplePluginManager implements PluginManager {
@@ -3787,7 +3787,7 @@ index f648c5989..78a2d2f8d 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 1173e433a..82e379d16 100644
+index 1173e433..82e379d1 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -53,7 +53,6 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -3830,7 +3830,7 @@ index 1173e433a..82e379d16 100644
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
 diff --git a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
-index 0ffc1dfdb..b859796b4 100644
+index 0ffc1dfd..b859796b 100644
 --- a/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/PluginClassLoader.java
 @@ -24,7 +24,8 @@ import org.jetbrains.annotations.Nullable;
@@ -3844,7 +3844,7 @@ index 0ffc1dfdb..b859796b4 100644
      private final Map<String, Class<?>> classes = new ConcurrentHashMap<String, Class<?>>();
      private final PluginDescriptionFile description;
 diff --git a/src/main/java/org/bukkit/util/CachedServerIcon.java b/src/main/java/org/bukkit/util/CachedServerIcon.java
-index 5ca863b36..612958a33 100644
+index 5ca863b3..612958a3 100644
 --- a/src/main/java/org/bukkit/util/CachedServerIcon.java
 +++ b/src/main/java/org/bukkit/util/CachedServerIcon.java
 @@ -2,6 +2,7 @@ package org.bukkit.util;
@@ -3867,7 +3867,7 @@ index 5ca863b36..612958a33 100644
 +
 +}
 diff --git a/src/main/java/org/spigotmc/CustomTimingsHandler.java b/src/main/java/org/spigotmc/CustomTimingsHandler.java
-index b71235f69..3cbe5c2bb 100644
+index b71235f6..3cbe5c2b 100644
 --- a/src/main/java/org/spigotmc/CustomTimingsHandler.java
 +++ b/src/main/java/org/spigotmc/CustomTimingsHandler.java
 @@ -1,3 +1,26 @@
@@ -4114,5 +4114,5 @@ index b71235f69..3cbe5c2bb 100644
 +
  }
 -- 
-2.21.0
+2.22.0
 

Spigot-API-Patches/0005-Player-affects-spawning-API.patch

@@ -1,14 +1,14 @@
-From b6532b8784860126e695a65abf433761e5385208 Mon Sep 17 00:00:00 2001
+From c7add24cf1bb4f0e68fa2581e86966c71be9d595 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Mon, 29 Feb 2016 17:22:34 -0600
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 72b08e73a..f5d31648f 100644
+index bf0b8bf1..b0ead72d 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1463,6 +1463,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1484,6 +1484,22 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      @NotNull
      public String getLocale();
  
@@ -32,5 +32,5 @@ index 72b08e73a..f5d31648f 100644
       * Update the list of commands sent to the client.
       * <br>
 -- 
-2.21.0
+2.22.0
 

Spigot-API-Patches/0010-Add-player-view-distance-API.patch

@@ -1,14 +1,14 @@
-From 417fce30c787e11eb56818606ae27cd9b3b0f265 Mon Sep 17 00:00:00 2001
+From de62be87c34a6ebbe3a52fc8e59e2cd751c39f84 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Mon, 29 Feb 2016 18:05:37 -0600
 Subject: [PATCH] Add player view distance API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f5d31648f..a9b11322b 100644
+index b0ead72d..abd119dd 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1477,6 +1477,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1498,6 +1498,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param affects Whether the player can affect mob spawning
       */
      public void setAffectsSpawning(boolean affects);
@@ -30,5 +30,5 @@ index f5d31648f..a9b11322b 100644
  
      /**
 -- 
-2.21.0
+2.22.0
 

Spigot-API-Patches/0015-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -1,4 +1,4 @@
-From e944d1d34899c180d6a165ddd4b79cef2b6a53c1 Mon Sep 17 00:00:00 2001
+From d8e1178f4ed95249e163c53d295a8bd726f419cf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 19:54:32 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@@ -6,7 +6,7 @@ Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
 Change Javadoc to be accurate
 
 diff --git a/src/main/java/org/bukkit/Bukkit.java b/src/main/java/org/bukkit/Bukkit.java
-index 63e48ef3f..b92304e9b 100644
+index 63e48ef3..b92304e9 100644
 --- a/src/main/java/org/bukkit/Bukkit.java
 +++ b/src/main/java/org/bukkit/Bukkit.java
 @@ -274,6 +274,26 @@ public final class Bukkit {
@@ -37,7 +37,7 @@ index 63e48ef3f..b92304e9b 100644
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/Server.java b/src/main/java/org/bukkit/Server.java
-index 87300a5df..d35d2deff 100644
+index 87300a5d..d35d2def 100644
 --- a/src/main/java/org/bukkit/Server.java
 +++ b/src/main/java/org/bukkit/Server.java
 @@ -225,6 +225,26 @@ public interface Server extends PluginMessageRecipient {
@@ -68,10 +68,10 @@ index 87300a5df..d35d2deff 100644
       * Gets the name of the update folder. The update folder is used to safely
       * update plugins at the right moment on a plugin load.
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index a9b11322b..de1b1512f 100644
+index abd119dd..8bf46516 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -422,6 +422,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -443,6 +443,38 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void sendMap(@NotNull MapView map);
  
@@ -111,5 +111,5 @@ index a9b11322b..de1b1512f 100644
       * Forces an update of the player's entire inventory.
       *
 -- 
-2.21.0
+2.22.0
 

Spigot-API-Patches/0016-Player-Tab-List-and-Title-APIs.patch

@@ -1,4 +1,4 @@
-From c76bce420738f306b2c47f2714099d328d1338dd Mon Sep 17 00:00:00 2001
+From 30e1c5bf22a481e6c32a2c67fd5a67f6ebc33273 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 29 Feb 2016 20:02:40 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -6,7 +6,7 @@ Subject: [PATCH] Player Tab List and Title APIs
 
 diff --git a/src/main/java/com/destroystokyo/paper/Title.java b/src/main/java/com/destroystokyo/paper/Title.java
 new file mode 100644
-index 000000000..4fe18540f
+index 00000000..4fe18540
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/Title.java
 @@ -0,0 +1,373 @@
@@ -384,7 +384,7 @@ index 000000000..4fe18540f
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index de1b1512f..40246fb99 100644
+index 8bf46516..4d6b06da 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -1,6 +1,8 @@
@@ -394,9 +394,9 @@ index de1b1512f..40246fb99 100644
 +
 +import com.destroystokyo.paper.Title;
  import org.bukkit.Achievement;
+ import org.bukkit.DyeColor;
  import org.bukkit.Effect;
- import org.bukkit.GameMode;
+@@ -473,6 +475,116 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-@@ -452,6 +454,116 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
@@ -514,5 +514,5 @@ index de1b1512f..40246fb99 100644
  
      /**
 -- 
-2.21.0
+2.22.0
 

Spigot-API-Patches/0021-Complete-resource-pack-API.patch

@@ -1,14 +1,14 @@
-From f8c9a0bd1f8a4bf5e8b808717dc641354e6e6e9b Mon Sep 17 00:00:00 2001
+From 63a712aa7eb94e803bc1ef1eb81c8827b5710169 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 22:59:54 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 40246fb99..495d43e78 100644
+index 4d6b06da..aaa74125 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1214,7 +1214,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1235,7 +1235,9 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @throws IllegalArgumentException Thrown if the URL is null.
       * @throws IllegalArgumentException Thrown if the URL is too long. The
       *     length restriction is an implementation specific arbitrary value.
@@ -18,7 +18,7 @@ index 40246fb99..495d43e78 100644
      public void setResourcePack(@NotNull String url);
  
      /**
-@@ -1652,6 +1654,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1673,6 +1675,62 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void openBook(@NotNull ItemStack book);
  
@@ -82,7 +82,7 @@ index 40246fb99..495d43e78 100644
      public class Spigot extends Entity.Spigot
      {
 diff --git a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
-index b98195650..4c2102a11 100644
+index b9819565..4c2102a1 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerResourcePackStatusEvent.java
 @@ -11,13 +11,32 @@ import org.jetbrains.annotations.NotNull;
@@ -119,5 +119,5 @@ index b98195650..4c2102a11 100644
       * Gets the status of this pack.
       *
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,4 +1,4 @@
-From 43ef8ec8dcd046b64b19d0c0ef223f3b22f611d2 Mon Sep 17 00:00:00 2001
+From 679dc954b994c687b3452e062e561111fefac478 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 81851a293..94173d328 100644
+index 3b650cbc..baefc0ff 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -129,6 +129,17 @@
+@@ -128,6 +128,17 @@
              <version>7.1</version>
              <scope>test</scope>
          </dependency>
@@ -29,7 +29,7 @@ index 81851a293..94173d328 100644
      <build>
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 new file mode 100644
-index 000000000..5b28e9b1d
+index 00000000..5b28e9b1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/MethodHandleEventExecutor.java
 @@ -0,0 +1,42 @@
@@ -77,7 +77,7 @@ index 000000000..5b28e9b1d
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 new file mode 100644
-index 000000000..c83672427
+index 00000000..c8367242
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/StaticMethodHandleEventExecutor.java
 @@ -0,0 +1,43 @@
@@ -126,7 +126,7 @@ index 000000000..c83672427
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 new file mode 100644
-index 000000000..b6e7d8ee8
+index 00000000..b6e7d8ee
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ASMEventExecutorGenerator.java
 @@ -0,0 +1,47 @@
@@ -179,7 +179,7 @@ index 000000000..b6e7d8ee8
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 new file mode 100644
-index 000000000..beed9e6e0
+index 00000000..beed9e6e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/ClassDefiner.java
 @@ -0,0 +1,35 @@
@@ -220,7 +220,7 @@ index 000000000..beed9e6e0
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 new file mode 100644
-index 000000000..ac99477e9
+index 00000000..ac99477e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/executor/asm/SafeClassDefiner.java
 @@ -0,0 +1,66 @@
@@ -292,7 +292,7 @@ index 000000000..ac99477e9
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
 new file mode 100644
-index 000000000..72e48e8ef
+index 00000000..72e48e8e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/utils/UnsafeUtils.java
 @@ -0,0 +1,35 @@
@@ -332,7 +332,7 @@ index 000000000..72e48e8ef
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/plugin/EventExecutor.java b/src/main/java/org/bukkit/plugin/EventExecutor.java
-index a850f0780..9026e108c 100644
+index a850f078..9026e108 100644
 --- a/src/main/java/org/bukkit/plugin/EventExecutor.java
 +++ b/src/main/java/org/bukkit/plugin/EventExecutor.java
 @@ -5,9 +5,75 @@ import org.bukkit.event.EventException;
@@ -412,7 +412,7 @@ index a850f0780..9026e108c 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
-index 12601db68..06b6724fa 100644
+index 12601db6..06b6724f 100644
 --- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 +++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
 @@ -301,21 +301,7 @@ public final class JavaPluginLoader implements PluginLoader {
@@ -439,5 +439,5 @@ index 12601db68..06b6724fa 100644
                  eventSet.add(new TimedRegisteredListener(listener, executor, eh.priority(), plugin, eh.ignoreCancelled()));
              } else {
 -- 
-2.21.0
+2.22.0
 

Spigot-API-Patches/0042-Add-String-based-Action-Bar-API.patch

@@ -1,14 +1,14 @@
-From ede84c84ab6a9492dcc483ee3f8c320c09bfc946 Mon Sep 17 00:00:00 2001
+From 1e1122199e63c367ef06b4dc4dd05ab81197f123 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:55:55 -0500
 Subject: [PATCH] Add String based Action Bar API
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 495d43e78..62fe51ab1 100644
+index aaa74125..f41545c5 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -425,6 +425,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -446,6 +446,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
@@ -35,7 +35,7 @@ index 495d43e78..62fe51ab1 100644
      /**
       * Sends the component to the player
       *
-@@ -448,9 +468,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -469,9 +489,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Sends an array of components as a single message to the specified screen position of this player
       *
@@ -47,7 +47,7 @@ index 495d43e78..62fe51ab1 100644
      public default void sendMessage(net.md_5.bungee.api.ChatMessageType position, net.md_5.bungee.api.chat.BaseComponent... components) {
          spigot().sendMessage(position, components);
      }
-@@ -1796,9 +1818,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1817,9 +1839,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends the component to the specified screen position of this player
           *
@@ -59,7 +59,7 @@ index 495d43e78..62fe51ab1 100644
          public void sendMessage(@NotNull net.md_5.bungee.api.ChatMessageType position, @NotNull net.md_5.bungee.api.chat.BaseComponent component) {
              throw new UnsupportedOperationException("Not supported yet.");
          }
-@@ -1806,9 +1830,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1827,9 +1851,11 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
          /**
           * Sends an array of components as a single message to the specified screen position of this player
           *
@@ -72,5 +72,5 @@ index 495d43e78..62fe51ab1 100644
              throw new UnsupportedOperationException("Not supported yet.");
          }
 -- 
-2.21.0
+2.22.0
 

Spigot-API-Patches/0051-Fix-upstream-javadoc-warnings-and-errors.patch

@@ -1,4 +1,4 @@
-From 66afc4fa6b46a600e21c2c3519b07870a4b00dcb Mon Sep 17 00:00:00 2001
+From 9ad73aaf9aa66daca16e4f2ae7482ef3f2c8fe07 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 10 Jun 2017 16:59:40 -0500
 Subject: [PATCH] Fix upstream javadoc warnings and errors
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix upstream javadoc warnings and errors
 Upstream still refuses to use Java 8 with the API so they are likely unaware these are even issues.
 
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
-index d1d64fb60..2fe46faf0 100644
+index d1d64fb6..2fe46faf 100644
 --- a/src/main/java/org/bukkit/World.java
 +++ b/src/main/java/org/bukkit/World.java
 @@ -1657,6 +1657,7 @@ public interface World extends PluginMessageRecipient, Metadatable {
@@ -74,7 +74,7 @@ index d1d64fb60..2fe46faf0 100644
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data, boolean force);
  
 diff --git a/src/main/java/org/bukkit/entity/AreaEffectCloud.java b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
-index c2096b534..bca9d3659 100644
+index c2096b53..bca9d365 100644
 --- a/src/main/java/org/bukkit/entity/AreaEffectCloud.java
 +++ b/src/main/java/org/bukkit/entity/AreaEffectCloud.java
 @@ -142,6 +142,7 @@ public interface AreaEffectCloud extends Entity {
@@ -86,10 +86,10 @@ index c2096b534..bca9d3659 100644
      <T> void setParticle(@NotNull Particle particle, @Nullable T data);
  
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 62fe51ab1..f14bdd22f 100644
+index f41545c5..576ad2c6 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -440,7 +440,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -461,7 +461,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *
       * Use supplied alternative character to the section symbol to represent legacy color codes.
       *
@@ -98,7 +98,7 @@ index 62fe51ab1..f14bdd22f 100644
       * @param message The message to send
       */
      public void sendActionBar(char alternateChar, @NotNull String message);
-@@ -507,6 +507,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -528,6 +528,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Update the subtitle of titles displayed to the player
       *
@@ -106,7 +106,7 @@ index 62fe51ab1..f14bdd22f 100644
       * @deprecated Use {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -515,6 +516,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -536,6 +537,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Update the subtitle of titles displayed to the player
       *
@@ -114,7 +114,7 @@ index 62fe51ab1..f14bdd22f 100644
       * @deprecated Use {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -523,6 +525,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -544,6 +546,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Show the given title to the player, along with the last subtitle set, using the last set times
       *
@@ -122,7 +122,7 @@ index 62fe51ab1..f14bdd22f 100644
       * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -531,6 +534,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -552,6 +555,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      /**
       * Show the given title to the player, along with the last subtitle set, using the last set times
       *
@@ -130,7 +130,7 @@ index 62fe51ab1..f14bdd22f 100644
       * @deprecated Use {@link #sendTitle(Title)} or {@link #updateTitle(Title)}
       */
      @Deprecated
-@@ -1431,6 +1435,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1452,6 +1456,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -138,7 +138,7 @@ index 62fe51ab1..f14bdd22f 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, @Nullable T data);
  
-@@ -1447,6 +1452,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1468,6 +1473,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param count the number of particles
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -146,7 +146,7 @@ index 62fe51ab1..f14bdd22f 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, @Nullable T data);
  
-@@ -1497,6 +1503,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1518,6 +1524,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -154,7 +154,7 @@ index 62fe51ab1..f14bdd22f 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -1517,6 +1524,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1538,6 +1545,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param offsetZ the maximum random offset on the Z axis
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -162,7 +162,7 @@ index 62fe51ab1..f14bdd22f 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, @Nullable T data);
  
-@@ -1573,6 +1581,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1594,6 +1602,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -170,7 +170,7 @@ index 62fe51ab1..f14bdd22f 100644
       */
      public <T> void spawnParticle(@NotNull Particle particle, @NotNull Location location, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
  
-@@ -1595,6 +1604,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1616,6 +1625,7 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *              particle used (normally speed)
       * @param data the data to use for the particle or null,
       *             the type of this depends on {@link Particle#getDataType()}
@@ -179,7 +179,7 @@ index 62fe51ab1..f14bdd22f 100644
      public <T> void spawnParticle(@NotNull Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, @Nullable T data);
  
 diff --git a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
-index 1b2267f4e..1a58734d9 100644
+index 1b2267f4..1a58734d 100644
 --- a/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
 +++ b/src/main/java/org/bukkit/event/player/PlayerMoveEvent.java
 @@ -78,7 +78,7 @@ public class PlayerMoveEvent extends PlayerEvent implements Cancellable {
@@ -192,5 +192,5 @@ index 1b2267f4e..1a58734d9 100644
          return to;
      }
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,4 +1,4 @@
-From a18dfecbab6995fd71c294c4590871c1957b47e7 Mon Sep 17 00:00:00 2001
+From 69b0848c5c15e72438a938b8eb0c823b21f27129 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 94173d328..4b8334d62 100644
+index baefc0ff..5dc31841 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -110,6 +110,13 @@
+@@ -109,6 +109,13 @@
              <version>17.0.0</version>
              <scope>provided</scope>
          </dependency>
@@ -32,7 +32,7 @@ index 94173d328..4b8334d62 100644
          <dependency>
              <groupId>junit</groupId>
 diff --git a/src/main/java/org/bukkit/plugin/Plugin.java b/src/main/java/org/bukkit/plugin/Plugin.java
-index febfec6ef..79890c68f 100644
+index febfec6e..79890c68 100644
 --- a/src/main/java/org/bukkit/plugin/Plugin.java
 +++ b/src/main/java/org/bukkit/plugin/Plugin.java
 @@ -166,6 +166,13 @@ public interface Plugin extends TabExecutor {
@@ -50,5 +50,5 @@ index febfec6ef..79890c68f 100644
       * Returns the name of the plugin.
       * <p>
 -- 
-2.21.0
+2.22.0
 

Spigot-API-Patches/0070-Expose-client-protocol-version-and-virtual-host.patch

@@ -1,4 +1,4 @@
-From 0157da796b632f929ed5fd607bbc657acf9fa8c1 Mon Sep 17 00:00:00 2001
+From a83294fb7e0bf05bb21e385dbf2812a3cfbf66ed Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:44:42 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -11,7 +11,7 @@ Add a NetworkClient interface that provides access to:
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/NetworkClient.java b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
 new file mode 100644
-index 000000000..7b2af1bd7
+index 00000000..7b2af1bd
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/NetworkClient.java
 @@ -0,0 +1,41 @@
@@ -57,10 +57,10 @@ index 000000000..7b2af1bd7
 +
 +}
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f14bdd22f..f0aee351d 100644
+index 576ad2c6..ce4ea22c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable;
+@@ -33,7 +33,7 @@ import org.jetbrains.annotations.Nullable;
  /**
   * Represents a player, connected or not
   */
@@ -70,5 +70,5 @@ index f14bdd22f..f0aee351d 100644
      /**
       * Gets the "friendly" name to display of this player. This may include
 -- 
-2.21.0
+2.22.0
 

Spigot-API-Patches/0077-Ability-to-apply-mending-to-XP-API.patch

@@ -1,4 +1,4 @@
-From cbc98ebf7be85c560a382ee4d48cc3f578c2ff2f Mon Sep 17 00:00:00 2001
+From bd2a47a6ee4f1377158cdae2ce956b246ffaa488 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:38:07 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,10 +10,10 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index f0aee351d..1e7bbd0e6 100644
+index ce4ea22c..d069a84c 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -948,12 +948,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -969,12 +969,33 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       */
      public void resetPlayerWeather();
  
@@ -49,5 +49,5 @@ index f0aee351d..1e7bbd0e6 100644
      /**
       * Gives the player the amount of experience levels specified. Levels can
 -- 
-2.21.0
+2.22.0
 

Spigot-API-Patches/0088-Player.setPlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From a204b6caee96110b7145497447e67b5c784b5f78 Mon Sep 17 00:00:00 2001
+From 1ffa1cfeb3a4e5911ce0d90cc9577ccd3b3f0de7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:28:55 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 1e7bbd0e6..759d42109 100644
+index d069a84c..f89b6c6b 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
 @@ -3,6 +3,7 @@ package org.bukkit.entity;
@@ -15,9 +15,9 @@ index 1e7bbd0e6..759d42109 100644
  import com.destroystokyo.paper.Title;
 +import com.destroystokyo.paper.profile.PlayerProfile;
  import org.bukkit.Achievement;
+ import org.bukkit.DyeColor;
  import org.bukkit.Effect;
- import org.bukkit.GameMode;
+@@ -1782,6 +1783,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-@@ -1761,6 +1762,20 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       *         was {@link org.bukkit.event.player.PlayerResourcePackStatusEvent.Status#SUCCESSFULLY_LOADED}
       */
      boolean hasResourcePack();
@@ -39,5 +39,5 @@ index 1e7bbd0e6..759d42109 100644
  
      // Spigot start
 -- 
-2.21.0
+2.22.0
 

Spigot-API-Patches/0092-Add-Ban-Methods-to-Player-Objects.patch

@@ -1,4 +1,4 @@
-From 8aa7d64d1bca98c94d8170b50a4784b1d0c04b7f Mon Sep 17 00:00:00 2001
+From 17206f185f229b2098e02d880e53d1b5b4c50519 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Apr 2018 10:28:50 -0400
 Subject: [PATCH] Add Ban Methods to Player Objects
@@ -8,7 +8,7 @@ Allows a more logical API for banning players.
 player.banPlayer("Breaking the rules");
 
 diff --git a/src/main/java/org/bukkit/OfflinePlayer.java b/src/main/java/org/bukkit/OfflinePlayer.java
-index ffc8ad373..222a9a7bf 100644
+index ffc8ad37..222a9a7b 100644
 --- a/src/main/java/org/bukkit/OfflinePlayer.java
 +++ b/src/main/java/org/bukkit/OfflinePlayer.java
 @@ -44,6 +44,61 @@ public interface OfflinePlayer extends ServerOperator, AnimalTamer, Configuratio
@@ -74,26 +74,25 @@ index ffc8ad373..222a9a7bf 100644
      /**
       * Checks if this player is whitelisted or not
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 759d42109..203200ec5 100644
+index f89b6c6b..7ae67786 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1,10 +1,15 @@
+@@ -1,10 +1,14 @@
  package org.bukkit.entity;
  
  import java.net.InetSocketAddress;
-+import java.util.Date;
++import java.util.Date; // Paper
  
  import com.destroystokyo.paper.Title;
  import com.destroystokyo.paper.profile.PlayerProfile;
  import org.bukkit.Achievement;
-+import org.bukkit.BanEntry;
++import org.bukkit.BanEntry; // Paper
-+import org.bukkit.BanList;
++import org.bukkit.BanList; // Paper
-+import org.bukkit.Bukkit;
++import org.bukkit.Bukkit; // Paper
-+import org.bukkit.ChatColor;
+ import org.bukkit.DyeColor;
  import org.bukkit.Effect;
  import org.bukkit.GameMode;
- import org.bukkit.Instrument;
+@@ -447,6 +451,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
-@@ -426,6 +431,162 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
      public void sendMap(@NotNull MapView map);
  
      // Paper start
@@ -257,5 +256,5 @@ index 759d42109..203200ec5 100644
      /**
       * Sends an Action Bar message to the client.
 -- 
-2.21.0
+2.22.0
 

Spigot-API-Patches/0147-Expose-attack-cooldown-methods-for-Player.patch

@@ -1,14 +1,14 @@
-From c1ece27602e0a141cd5c04e2adb8cbcd6d745f23 Mon Sep 17 00:00:00 2001
+From 69961ff56b5517f3eba960e3d0d2188d8e852338 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:01:54 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/org/bukkit/entity/Player.java b/src/main/java/org/bukkit/entity/Player.java
-index 203200ec5..39a7440ed 100644
+index 7ae67786..8d8d8957 100644
 --- a/src/main/java/org/bukkit/entity/Player.java
 +++ b/src/main/java/org/bukkit/entity/Player.java
-@@ -1937,6 +1937,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
+@@ -1957,6 +1957,26 @@ public interface Player extends HumanEntity, Conversable, OfflinePlayer, PluginM
       * @param profile The new profile to use
       */
      void setPlayerProfile(@NotNull PlayerProfile profile);
@@ -36,5 +36,5 @@ index 203200ec5..39a7440ed 100644
  
      // Spigot start
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,11 +1,11 @@
-From 0322a4d21697e22ea9eced8612906383ff319804 Mon Sep 17 00:00:00 2001
+From 08c853033acfa5e344cbc2b46ed4235af0f118a7 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 4a2d58d574..251fa0bc36 100644
+index 1dd649086b..e8134bf0eb 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,15 +1,14 @@
@@ -16,7 +16,7 @@ index 4a2d58d574..251fa0bc36 100644
 -    <artifactId>spigot</artifactId>
 +    <artifactId>paper</artifactId>
      <packaging>jar</packaging>
-     <version>1.14.2-R0.1-SNAPSHOT</version>
+     <version>1.14.3-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>https://www.spigotmc.org/</url>
 +    <name>Paper</name>
@@ -27,7 +27,7 @@ index 4a2d58d574..251fa0bc36 100644
 +        <!-- <skipTests>true</skipTests> Paper - This [was] not going to end well -->
          <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
          <api.version>unknown</api.version>
-         <minecraft.version>1.14.2</minecraft.version>
+         <minecraft.version>1.14.3</minecraft.version>
 @@ -22,16 +21,16 @@
      </properties>
  
@@ -159,5 +159,5 @@ index 93046379d0..674096cab1 100644
  
          if (stream != null) {
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0003-MC-Dev-fixes.patch

@@ -1,4 +1,4 @@
-From 7dd5454207eb940eb686d9179232938bfff3223b Mon Sep 17 00:00:00 2001
+From 2d1aec7e30853380405652873ea3b306ef965af3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 19:36:20 -0400
 Subject: [PATCH] MC Dev fixes
@@ -72,7 +72,7 @@ index adc9981868..b370316574 100644
              S s0 = this.f.get(iblockstate, v0);
  
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 123a9bb210..70d9342422 100644
+index 6a8e8f7a67..daf406637c 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -57,12 +57,12 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -109,10 +109,10 @@ index b4c8722f04..59d86fc66e 100644
  
              if (this.b.containsKey(s1)) {
 diff --git a/src/main/java/net/minecraft/server/ChunkMapDistance.java b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-index ebfc588539..ba4b9fa59c 100644
+index 958354a31d..ed4e8d69ca 100644
 --- a/src/main/java/net/minecraft/server/ChunkMapDistance.java
 +++ b/src/main/java/net/minecraft/server/ChunkMapDistance.java
-@@ -79,7 +79,7 @@ public abstract class ChunkMapDistance {
+@@ -61,7 +61,7 @@ public abstract class ChunkMapDistance {
          while (objectiterator.hasNext()) {
              Entry<ObjectSortedSet<Ticket<?>>> entry = (Entry) objectiterator.next();
  
@@ -120,36 +120,36 @@ index ebfc588539..ba4b9fa59c 100644
 +            if ((entry.getValue()).removeIf((ticket) -> { // Paper - decompile fix
                  return ticket.a(this.currentTick);
              })) {
-                 this.f.b(entry.getLongKey(), this.a((ObjectSortedSet) entry.getValue()), false);
+                 this.e.b(entry.getLongKey(), this.a((ObjectSortedSet) entry.getValue()), false);
-@@ -143,7 +143,7 @@ public abstract class ChunkMapDistance {
+@@ -124,7 +124,7 @@ public abstract class ChunkMapDistance {
  
                          completablefuture.thenAccept((either) -> {
-                             this.p.execute(() -> {
+                             this.m.execute(() -> {
--                                this.n.a((Object) ChunkTaskQueueSorter.a(() -> {
+-                                this.k.a((Object) ChunkTaskQueueSorter.a(() -> {
-+                                this.n.a(ChunkTaskQueueSorter.a(() -> { // Paper - decompile fix
++                                this.k.a(ChunkTaskQueueSorter.a(() -> { // Paper - decompile fix
                                  }, j, false));
                              });
                          });
-@@ -367,7 +367,7 @@ public abstract class ChunkMapDistance {
+@@ -333,7 +333,7 @@ public abstract class ChunkMapDistance {
                  Ticket<?> ticket = new Ticket<>(TicketType.PLAYER, ChunkMapDistance.b, new ChunkCoordIntPair(i), ChunkMapDistance.this.currentTick);
  
                  if (flag1) {
--                    ChunkMapDistance.this.m.a((Object) ChunkTaskQueueSorter.a(() -> {
+-                    ChunkMapDistance.this.j.a((Object) ChunkTaskQueueSorter.a(() -> {
-+                    ChunkMapDistance.this.m.a(ChunkTaskQueueSorter.a(() -> { // Paper - decompile fix
++                    ChunkMapDistance.this.j.a(ChunkTaskQueueSorter.a(() -> { // Paper - decompile fix
-                         ChunkMapDistance.this.p.execute(() -> {
+                         ChunkMapDistance.this.m.execute(() -> {
                              ChunkMapDistance.this.a(i, ticket);
-                             ChunkMapDistance.this.o.add(i);
+                             ChunkMapDistance.this.l.add(i);
-@@ -376,7 +376,7 @@ public abstract class ChunkMapDistance {
+@@ -342,7 +342,7 @@ public abstract class ChunkMapDistance {
                          return j;
                      }));
                  } else {
--                    ChunkMapDistance.this.n.a((Object) ChunkTaskQueueSorter.a(() -> {
+-                    ChunkMapDistance.this.k.a((Object) ChunkTaskQueueSorter.a(() -> {
-+                    ChunkMapDistance.this.n.a(ChunkTaskQueueSorter.a(() -> { // Paper - decompile fix
++                    ChunkMapDistance.this.k.a(ChunkTaskQueueSorter.a(() -> { // Paper - decompile fix
-                         ChunkMapDistance.this.p.execute(() -> {
+                         ChunkMapDistance.this.m.execute(() -> {
                              ChunkMapDistance.this.b(i, ticket);
                          });
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index c973ab6076..30701fd7f3 100644
+index d4b7074ca1..f4605e3937 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -148,6 +148,6 @@ public class ChunkSection {
@@ -173,21 +173,21 @@ index 26db8f135f..dd1822d6ff 100644
          int i = 0;
  
          for (int j = a().size() - 1; j >= 0; --j) {
-diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
+diff --git a/src/main/java/net/minecraft/server/CraftingManager.java b/src/main/java/net/minecraft/server/CraftingManager.java
-index a79262631c..5184e52626 100644
+index d0b4bf8b7e..6fb734c64f 100644
---- a/src/main/java/net/minecraft/server/EntityFox.java
+--- a/src/main/java/net/minecraft/server/CraftingManager.java
-+++ b/src/main/java/net/minecraft/server/EntityFox.java
++++ b/src/main/java/net/minecraft/server/CraftingManager.java
-@@ -97,7 +97,7 @@ public class EntityFox extends EntityAnimal {
+@@ -58,7 +58,7 @@ public class CraftingManager extends ResourceDataJson {
-         this.goalSelector.a(11, new EntityFox.j(this, EntityHuman.class, 24.0F));
+         }
-         this.goalSelector.a(12, new EntityFox.r());
-         this.targetSelector.a(3, new EntityFox.a(EntityLiving.class, false, false, (entityliving) -> {
--            return EntityFox.bF.test(entityliving) && !this.c(entityliving.getUniqueID());
-+            return EntityFox.bF.test((EntityLiving) entityliving) && !this.c(((EntityLiving) entityliving).getUniqueID()); // Paper - decompile fix
-         }));
-     }
  
+         this.recipes = (Map) map1.entrySet().stream().collect(ImmutableMap.toImmutableMap(Entry::getKey, (entry1) -> {
+-            return (entry1.getValue()); // CraftBukkit
++            return entry1.getValue(); // CraftBukkit // Paper - decompile fix - *shrugs internally*
+         }));
+         CraftingManager.LOGGER.info("Loaded {} recipes", map1.size());
+     }
 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index 219bc2e741..54c1b7c878 100644
+index 85af024c9c..daa7bf330f 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -25,7 +25,7 @@ public class EntityVindicator extends EntityIllagerAbstract {
@@ -199,28 +199,6 @@ index 219bc2e741..54c1b7c878 100644
          this.targetSelector.a(2, new PathfinderGoalNearestAttackableTarget<>(this, EntityHuman.class, true));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityVillagerAbstract.class, true));
          this.targetSelector.a(3, new PathfinderGoalNearestAttackableTarget<>(this, EntityIronGolem.class, true));
-diff --git a/src/main/java/net/minecraft/server/GameRules.java b/src/main/java/net/minecraft/server/GameRules.java
-index d8d2267084..3de9d264db 100644
---- a/src/main/java/net/minecraft/server/GameRules.java
-+++ b/src/main/java/net/minecraft/server/GameRules.java
-@@ -17,7 +17,7 @@ import javax.annotation.Nullable;
- 
- public class GameRules {
- 
--    private static final TreeMap<String, GameRules.GameRuleDefinition> a = (TreeMap) SystemUtils.a((Object) (new TreeMap()), (treemap) -> {
-+    private static final TreeMap<String, GameRules.GameRuleDefinition> a = SystemUtils.a(new TreeMap(), (treemap) -> { // Paper - decompile fix
-         treemap.put("doFireTick", new GameRules.GameRuleDefinition("true", GameRules.EnumGameRuleType.BOOLEAN_VALUE));
-         treemap.put("mobGriefing", new GameRules.GameRuleDefinition("true", GameRules.EnumGameRuleType.BOOLEAN_VALUE));
-         treemap.put("keepInventory", new GameRules.GameRuleDefinition("false", GameRules.EnumGameRuleType.BOOLEAN_VALUE));
-@@ -133,7 +133,7 @@ public class GameRules {
-         private final Supplier<ArgumentType<?>> d;
-         private final BiFunction<CommandContext<CommandListenerWrapper>, String, String> e;
- 
--        private EnumGameRuleType(Supplier supplier, BiFunction bifunction) {
-+        private EnumGameRuleType(Supplier supplier, BiFunction<CommandContext<CommandListenerWrapper>, String, String> bifunction) { // Paper - decompile fix
-             this.d = supplier;
-             this.e = bifunction;
-         }
 diff --git a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java b/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
 index 053d408d36..4510018d6f 100644
 --- a/src/main/java/net/minecraft/server/IAsyncTaskHandler.java
@@ -265,10 +243,10 @@ index 2ed6119804..6e365f402c 100644
                  do {
                      if (d12 > 1.0D && d13 > 1.0D && d14 > 1.0D) {
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index e8ae4b5e44..0f4aa698aa 100644
+index 21321805ee..452602d43e 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
-@@ -265,12 +265,12 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
+@@ -269,12 +269,12 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
  
      public static <T> Dynamic<T> a(DynamicOps<T> dynamicops, IBlockData iblockdata) {
          ImmutableMap<IBlockState<?>, Comparable<?>> immutablemap = iblockdata.getStateMap();
@@ -283,34 +261,40 @@ index e8ae4b5e44..0f4aa698aa 100644
                  return Pair.of(dynamicops.createString(((IBlockState) entry.getKey()).a()), dynamicops.createString(IBlockDataHolder.b((IBlockState) entry.getKey(), (Comparable) entry.getValue())));
              }).collect(Collectors.toMap(Pair::getFirst, Pair::getSecond)))));
          }
-@@ -329,9 +329,9 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
+@@ -332,9 +332,9 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
              if (!iblockdata.o()) {
                  this.f = null;
              } else {
 -                this.f = new VoxelShape[IBlockData.a.a.length];
 +                this.f = new VoxelShape[a.length]; // Paper - decompile fix
-                 voxelshape = block.h(iblockdata, BlockAccessAir.INSTANCE, BlockPosition.ZERO);
+                 VoxelShape voxelshape = block.h(iblockdata, BlockAccessAir.INSTANCE, BlockPosition.ZERO);
 -                EnumDirection[] aenumdirection = IBlockData.a.a;
 +                EnumDirection[] aenumdirection = a; // Paper - decompile fix
                  int i = aenumdirection.length;
  
                  for (int j = 0; j < i; ++j) {
-@@ -342,8 +342,9 @@ public class IBlockData extends BlockDataAbstract<Block, IBlockData> implements
-             }
- 
-             voxelshape = block.b(iblockdata, BlockAccessAir.INSTANCE, BlockPosition.ZERO, VoxelShapeCollision.a());
-+            final VoxelShape final_voxelshape = voxelshape; // Paper - decompile fix
-             this.g = Arrays.stream(EnumDirection.EnumAxis.values()).anyMatch((enumdirection_enumaxis) -> {
--                return voxelshape.b(enumdirection_enumaxis) < 0.0D || voxelshape.c(enumdirection_enumaxis) > 1.0D;
-+                return final_voxelshape.b(enumdirection_enumaxis) < 0.0D || final_voxelshape.c(enumdirection_enumaxis) > 1.0D; // Paper - decompile fix
-             });
-         }
-     }
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index bf7e0d17ef..ee22bb0387 100644
+index b4b73e5f04..3a86c519c0 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
-@@ -147,17 +147,17 @@ public interface IEntityAccess {
+@@ -39,7 +39,7 @@ public interface IEntityAccess {
+             return Stream.empty();
+         } else {
+             AxisAlignedBB axisalignedbb1 = axisalignedbb.g(1.0E-7D);
+-            Stream stream = this.getEntities(entity, axisalignedbb1).stream().filter((entity1) -> {
++            Stream<AxisAlignedBB> stream = this.getEntities(entity, axisalignedbb1).stream().filter((entity1) -> { // Paper - decompile fix
+                 return !set.contains(entity1);
+             }).filter((entity1) -> {
+                 return entity == null || !entity.x(entity1);
+@@ -47,7 +47,6 @@ public interface IEntityAccess {
+                 return Stream.of(entity1.aq(), entity == null ? null : entity.j(entity1));
+             }).filter(Objects::nonNull);
+ 
+-            axisalignedbb1.getClass();
+             return stream.filter(axisalignedbb1::c).map(VoxelShapes::a);
+         }
+     }
+@@ -149,17 +148,17 @@ public interface IEntityAccess {
  
      @Nullable
      default <T extends EntityLiving> T a(Class<? extends T> oclass, PathfinderTargetCondition pathfindertargetcondition, @Nullable EntityLiving entityliving, double d0, double d1, double d2, AxisAlignedBB axisalignedbb) {
@@ -331,7 +315,7 @@ index bf7e0d17ef..ee22bb0387 100644
  
              if (pathfindertargetcondition.a(entityliving, t1)) {
                  double d4 = t1.e(d0, d1, d2);
-@@ -190,10 +190,10 @@ public interface IEntityAccess {
+@@ -192,10 +191,10 @@ public interface IEntityAccess {
      default <T extends EntityLiving> List<T> a(Class<? extends T> oclass, PathfinderTargetCondition pathfindertargetcondition, EntityLiving entityliving, AxisAlignedBB axisalignedbb) {
          List<T> list = this.a(oclass, axisalignedbb, (Predicate) null);
          List<T> list1 = Lists.newArrayList();
@@ -440,7 +424,7 @@ index 4cb78c6a3f..e15d286710 100644
          this.f = 0;
  
 diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
-index 41a5d1dc29..b3799ab564 100644
+index 62c39f9baa..376219a1cd 100644
 --- a/src/main/java/net/minecraft/server/SystemUtils.java
 +++ b/src/main/java/net/minecraft/server/SystemUtils.java
 @@ -45,8 +45,8 @@ public class SystemUtils {
@@ -454,7 +438,7 @@ index 41a5d1dc29..b3799ab564 100644
      }
  
      public static String a(String s, @Nullable MinecraftKey minecraftkey) {
-@@ -154,8 +154,8 @@ public class SystemUtils {
+@@ -158,8 +158,8 @@ public class SystemUtils {
      public static <T> T b(Iterable<T> iterable, @Nullable T t0) {
          Iterator<T> iterator = iterable.iterator();
  
@@ -465,7 +449,7 @@ index 41a5d1dc29..b3799ab564 100644
  
          for (object1 = null; iterator.hasNext(); object1 = object) {
              object = iterator.next();
-@@ -180,7 +180,7 @@ public class SystemUtils {
+@@ -184,7 +184,7 @@ public class SystemUtils {
      }
  
      public static <K> Strategy<K> i() {
@@ -474,7 +458,7 @@ index 41a5d1dc29..b3799ab564 100644
      }
  
      public static <V> CompletableFuture<List<V>> b(List<? extends CompletableFuture<? extends V>> list) {
-@@ -191,7 +191,7 @@ public class SystemUtils {
+@@ -195,7 +195,7 @@ public class SystemUtils {
          list.forEach((completablefuture1) -> {
              int i = list1.size();
  
@@ -517,7 +501,7 @@ index 73f9da1fdb..2a4e4f7859 100644
          hashmap.put(VillagerProfession.CLERIC, a(ImmutableMap.of(1, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.ROTTEN_FLESH, 32, 8, 2), new VillagerTrades.h(Items.REDSTONE, 1, 2, 1)}, 2, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.GOLD_INGOT, 3, 6, 10), new VillagerTrades.h(Items.LAPIS_LAZULI, 1, 1, 5)}, 3, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.RABBIT_FOOT, 2, 6, 20), new VillagerTrades.h(Blocks.GLOWSTONE, 4, 1, 6, 10)}, 4, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.SCUTE, 4, 6, 30), new VillagerTrades.b(Items.GLASS_BOTTLE, 9, 6, 30), new VillagerTrades.h(Items.ENDER_PEARL, 5, 1, 15)}, 5, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.NETHER_WART, 22, 6, 30), new VillagerTrades.h(Items.EXPERIENCE_BOTTLE, 3, 1, 30)})));
          hashmap.put(VillagerProfession.ARMORER, a(ImmutableMap.of(1, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.COAL, 15, 8, 2), new VillagerTrades.h(new ItemStack(Items.IRON_LEGGINGS), 7, 1, 6, 1, 0.2F), new VillagerTrades.h(new ItemStack(Items.IRON_BOOTS), 4, 1, 6, 1, 0.2F), new VillagerTrades.h(new ItemStack(Items.IRON_HELMET), 5, 1, 6, 1, 0.2F), new VillagerTrades.h(new ItemStack(Items.IRON_CHESTPLATE), 9, 1, 6, 1, 0.2F)}, 2, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.IRON_INGOT, 4, 6, 10), new VillagerTrades.h(new ItemStack(Items.pP), 36, 1, 6, 5, 0.2F), new VillagerTrades.h(new ItemStack(Items.CHAINMAIL_BOOTS), 1, 1, 6, 5, 0.2F), new VillagerTrades.h(new ItemStack(Items.CHAINMAIL_LEGGINGS), 3, 1, 6, 5, 0.2F)}, 3, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.b(Items.LAVA_BUCKET, 1, 6, 20), new VillagerTrades.b(Items.DIAMOND, 1, 6, 20), new VillagerTrades.h(new ItemStack(Items.CHAINMAIL_HELMET), 1, 1, 6, 10, 0.2F), new VillagerTrades.h(new ItemStack(Items.CHAINMAIL_CHESTPLATE), 4, 1, 6, 10, 0.2F), new VillagerTrades.h(new ItemStack(Items.SHIELD), 5, 1, 6, 10, 0.2F)}, 4, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.e(Items.DIAMOND_LEGGINGS, 14, 2, 15, 0.2F), new VillagerTrades.e(Items.DIAMOND_BOOTS, 8, 2, 15, 0.2F)}, 5, new VillagerTrades.IMerchantRecipeOption[]{new VillagerTrades.e(Items.DIAMOND_HELMET, 8, 2, 30, 0.2F), new VillagerTrades.e(Items.DIAMOND_CHESTPLATE, 16, 2, 30, 0.2F)})));
 diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java
-index b251a1d7d9..3c5b3fe101 100644
+index 0b950aae63..f5f540032f 100644
 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java
 +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java
 @@ -37,7 +37,7 @@ public class WorldPersistentData {
@@ -529,15 +513,24 @@ index b251a1d7d9..3c5b3fe101 100644
  
              this.a(t1);
              return t1;
-@@ -64,7 +64,7 @@ public class WorldPersistentData {
+@@ -46,7 +46,7 @@ public class WorldPersistentData {
-             }
-         }
  
--        return persistentbase;
+     @Nullable
-+        return (T) persistentbase; // Paper - decompile fix
+     public <T extends PersistentBase> T b(Supplier<T> supplier, String s) {
-     }
+-        PersistentBase persistentbase = (PersistentBase) this.data.get(s);
++        T persistentbase = (T) this.data.get(s); // Paper - decompile fix
  
-     public void a(PersistentBase persistentbase) {
+         if (persistentbase == null && !this.data.containsKey(s)) {
+             persistentbase = this.c(supplier, s);
+@@ -62,7 +62,7 @@ public class WorldPersistentData {
+             File file = this.a(s);
+ 
+             if (file.exists()) {
+-                T t0 = (PersistentBase) supplier.get();
++                T t0 = supplier.get(); // Paper - decompile fix
+                 NBTTagCompound nbttagcompound = this.a(s, SharedConstants.a().getWorldVersion());
+ 
+                 t0.a(nbttagcompound.getCompound("data"));
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0004-MC-Utils.patch

@@ -1,4 +1,4 @@
-From 1b856bff3ec4ae600d4f5f9339e68b2644a6da7f Mon Sep 17 00:00:00 2001
+From 7c5ce6c9fd1f84aad2ca77e5834685659027f8e1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
@@ -55,7 +55,7 @@ index b370316574..841c7d1904 100644
          return this.d.containsKey(iblockstate);
      }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 70d9342422..b56a044b3a 100644
+index daf406637c..2613de6624 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -120,6 +120,7 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -92,7 +92,7 @@ index 70d9342422..b56a044b3a 100644
              return this.d(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2));
          }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index bdda2e63ae..0905fbdc41 100644
+index 5005643853..2a6ae10a11 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -25,7 +25,7 @@ import org.apache.logging.log4j.Logger;
@@ -182,10 +182,10 @@ index 857b2f8868..bbf136614c 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index dcf2d38df5..95356b82ff 100644
+index f1e807296c..710d40b43a 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -66,6 +66,58 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -64,6 +64,58 @@ public class ChunkProviderServer extends IChunkProvider {
          return this.playerChunkMap.c();
      }
  
@@ -316,7 +316,7 @@ index 4411d5640a..28a6be7ab0 100644
          this.a();
          packetdataserializer.writeByte(this.i);
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index 4f69e23271..8f5f61f602 100644
+index c2ec2c2823..54a05cdb86 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -6,6 +6,8 @@ import org.bukkit.event.entity.EntityUnleashEvent;
@@ -329,10 +329,10 @@ index 4f69e23271..8f5f61f602 100644
          super(entitytypes, world);
      }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index d4fff5b72e..ec1da887c6 100644
+index 01ce810683..6d7b313aeb 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -143,6 +143,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -144,6 +144,7 @@ public abstract class EntityInsentient extends EntityLiving {
          return this.goalTarget;
      }
  
@@ -341,7 +341,7 @@ index d4fff5b72e..ec1da887c6 100644
          // CraftBukkit start - fire event
          setGoalTarget(entityliving, EntityTargetEvent.TargetReason.UNKNOWN, true);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 61319d6c20..40173aa35b 100644
+index f115d0b931..e0b12e1fd7 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -126,6 +126,7 @@ public abstract class EntityLiving extends Entity {
@@ -353,10 +353,10 @@ index 61319d6c20..40173aa35b 100644
      @Override
      public float getBukkitYaw() {
 diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
-index 6ab4c78b35..76142d5dc2 100644
+index 9895124579..f97958652a 100644
 --- a/src/main/java/net/minecraft/server/EntityMonster.java
 +++ b/src/main/java/net/minecraft/server/EntityMonster.java
-@@ -4,6 +4,7 @@ import java.util.function.Predicate;
+@@ -5,6 +5,7 @@ import java.util.function.Predicate;
  
  public abstract class EntityMonster extends EntityCreature implements IMonster {
  
@@ -365,7 +365,7 @@ index 6ab4c78b35..76142d5dc2 100644
          super(entitytypes, world);
          this.f = 5;
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 8c918d0d68..56a2d7df5e 100644
+index 0c712f77de..f603950b2e 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -5,6 +5,7 @@ import com.mojang.datafixers.types.Type;
@@ -437,7 +437,7 @@ index 6e365f402c..577b227758 100644
          return this.getType(blockposition).h();
      }
 diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java
-index 729bac3ab5..7308c0c319 100644
+index b3725f15e3..233399e8bb 100644
 --- a/src/main/java/net/minecraft/server/IWorldReader.java
 +++ b/src/main/java/net/minecraft/server/IWorldReader.java
 @@ -39,6 +39,7 @@ public interface IWorldReader extends IIBlockAccess {
@@ -449,7 +449,7 @@ index 729bac3ab5..7308c0c319 100644
      IChunkAccess getChunkAt(int i, int j, ChunkStatus chunkstatus, boolean flag);
  
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index e975265a28..aa6a58dd88 100644
+index 91168181b2..7bcc723998 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -37,10 +37,19 @@ import org.bukkit.event.world.StructureGrowEvent;
@@ -945,7 +945,7 @@ index 4e20cfba41..363ab5da12 100644
          int j = 0;
          ChunkSection[] achunksection = chunk.getSections();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 67c8a5efc7..78dca8932f 100644
+index 62387f5099..5599d0e71f 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -63,6 +63,14 @@ public class PlayerChunk {
@@ -964,7 +964,7 @@ index 67c8a5efc7..78dca8932f 100644
      public CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> getStatusFutureUnchecked(ChunkStatus chunkstatus) {
          CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture = (CompletableFuture) this.statusFutures.get(chunkstatus.c());
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 58f9946455..ae194b981f 100644
+index 9062767efa..d40600c103 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -67,9 +67,9 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -1072,7 +1072,7 @@ index 4efcb8b595..60948afa4e 100644
          return this.b.size();
      }
 diff --git a/src/main/java/net/minecraft/server/SystemUtils.java b/src/main/java/net/minecraft/server/SystemUtils.java
-index b3799ab564..5fae5a1233 100644
+index 376219a1cd..59164684e0 100644
 --- a/src/main/java/net/minecraft/server/SystemUtils.java
 +++ b/src/main/java/net/minecraft/server/SystemUtils.java
 @@ -58,7 +58,7 @@ public class SystemUtils {
@@ -1085,7 +1085,7 @@ index b3799ab564..5fae5a1233 100644
  
      public static long getTimeMillis() {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 91e50ccea1..a2b1aba49f 100644
+index e9d65c9275..32981c4422 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -210,6 +210,40 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -1181,5 +1181,5 @@ index 755f7f2649..cd910f3dcb 100644
 +    // Paper end
  }
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0006-Add-MinecraftKey-Information-to-Objects.patch

@@ -1,4 +1,4 @@
-From 67f4795e1c1691f3616728b83f6b3ee4d3c82704 Mon Sep 17 00:00:00 2001
+From 9288b14bdaf7935ff4fbfbdea3642072a8d737fa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 01:40:13 -0400
 Subject: [PATCH] Add MinecraftKey Information to Objects
@@ -6,7 +6,7 @@ Subject: [PATCH] Add MinecraftKey Information to Objects
 Stores the reference to the objects respective MinecraftKey
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index b5f318c00d..ce190d88d6 100644
+index 5626ae4e3a..360abc05e4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -175,7 +175,7 @@ public class PaperCommand extends Command {
@@ -19,7 +19,7 @@ index b5f318c00d..ce190d88d6 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 45e2ce618a..7af4771681 100644
+index 3d03fb1b87..7e347c7c99 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -49,7 +49,7 @@ import org.bukkit.event.player.PlayerTeleportEvent;
@@ -31,7 +31,7 @@ index 45e2ce618a..7af4771681 100644
  
      // CraftBukkit start
      private static final int CURRENT_LEVEL = 2;
-@@ -1682,12 +1682,31 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
+@@ -1731,12 +1731,31 @@ public abstract class Entity implements INamableTileEntity, ICommandListener {
          return true;
      }
  
@@ -65,7 +65,7 @@ index 45e2ce618a..7af4771681 100644
  
      protected abstract void a(NBTTagCompound nbttagcompound);
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index 56a2d7df5e..98eb0d24cc 100644
+index f603950b2e..eaacc9bff8 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -238,6 +238,7 @@ public class EntityTypes<T extends Entity> {
@@ -92,7 +92,7 @@ index 0000000000..743142d030
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index fa6ec71061..4ccdd7583e 100644
+index 5b0153352f..8f9820f492 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -11,7 +11,7 @@ import org.bukkit.inventory.InventoryHolder;
@@ -141,5 +141,5 @@ index fa6ec71061..4ccdd7583e 100644
      public World getWorld() {
          return this.world;
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch

@@ -1,4 +1,4 @@
-From 83b848b12d968842683048230efc851c676064af Mon Sep 17 00:00:00 2001
+From f6c6445c4fbbe78e58f0cdfb01cf9be18e04ce00 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:10:36 -0400
 Subject: [PATCH] Store reference to current Chunk for Entity and Block
@@ -8,7 +8,7 @@ This enables us a fast reference to the entities current chunk instead
 of having to look it up by hashmap lookups.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 0905fbdc41..dbe7e5c013 100644
+index 2a6ae10a11..24d69778f0 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -29,7 +29,7 @@ public class Chunk implements IChunkAccess {
@@ -90,7 +90,7 @@ index 0905fbdc41..dbe7e5c013 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7af4771681..708f6c97c6 100644
+index 7e347c7c99..0c7bf3ae3f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -133,7 +133,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -102,7 +102,7 @@ index 7af4771681..708f6c97c6 100644
      public int chunkX; public int getChunkX() { return chunkX; } // Paper - OBFHELPER
      public int chunkY; public int getChunkY() { return chunkY; } // Paper - OBFHELPER
      public int chunkZ; public int getChunkZ() { return chunkZ; } // Paper - OBFHELPER
-@@ -1683,6 +1683,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1732,6 +1732,39 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      // Paper start
@@ -143,7 +143,7 @@ index 7af4771681..708f6c97c6 100644
      private String entityKeyString;
  
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 4ccdd7583e..382498d193 100644
+index 8f9820f492..e8a90e01f5 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -51,6 +51,15 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -188,5 +188,5 @@ index f22959ee15..a98f6f3389 100644
          /**
           * Order is *EXTREMELY* important -- keep it right! =D
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,4 +1,4 @@
-From 5a761ebfc0d56a6e7dedfb85960bbc03ed3aa68d Mon Sep 17 00:00:00 2001
+From 76dcdc64de5d833b1e1af35a33a9351fb39ddb68 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
@@ -302,7 +302,7 @@ index 5518ec1e54..0c65afccfd 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index b2e5bcf57c..78b0e78474 100644
+index ee9a571bf2..4b9e51b30f 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -31,6 +31,15 @@ public class Block implements IMaterial {
@@ -322,7 +322,7 @@ index b2e5bcf57c..78b0e78474 100644
      private final float frictionFactor;
      protected final BlockStateList<Block, IBlockData> blockStateList;
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 8075cc4827..3de0f69758 100644
+index f3c5c729ff..ab9b7bbd31 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -573,6 +573,7 @@ public class Chunk implements IChunkAccess {
@@ -342,10 +342,10 @@ index 8075cc4827..3de0f69758 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 24222fa1f8..bef6618d8f 100644
+index 710d40b43a..22aba06270 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -297,7 +297,9 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -301,7 +301,9 @@ public class ChunkProviderServer extends IChunkProvider {
  
      public void save(boolean flag) {
          this.tickDistanceManager();
@@ -366,8 +366,8 @@ index 24222fa1f8..bef6618d8f 100644
 +                        this.world.timings.chunkTicks.stopTiming(); // Spigot // Paper
                      }
                  }
-             }
+             });
-@@ -433,9 +435,7 @@ public class ChunkProviderServer extends IChunkProvider {
+@@ -432,9 +434,7 @@ public class ChunkProviderServer extends IChunkProvider {
              this.world.getMethodProfiler().exit();
          }
  
@@ -378,7 +378,7 @@ index 24222fa1f8..bef6618d8f 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 2e09900f45..1ebb16f0f6 100644
+index 1894509df8..ad3ade3c5c 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1,5 +1,6 @@
@@ -388,7 +388,7 @@ index 2e09900f45..1ebb16f0f6 100644
  import com.google.common.collect.Maps;
  import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
  import it.unimi.dsi.fastutil.longs.LongSet;
-@@ -406,7 +407,7 @@ public class ChunkRegionLoader {
+@@ -407,7 +408,7 @@ public class ChunkRegionLoader {
      private static void loadEntities(NBTTagCompound nbttagcompound, Chunk chunk) {
          NBTTagList nbttaglist = nbttagcompound.getList("Entities", 10);
          World world = chunk.getWorld();
@@ -397,7 +397,7 @@ index 2e09900f45..1ebb16f0f6 100644
  
          for (int i = 0; i < nbttaglist.size(); ++i) {
              NBTTagCompound nbttagcompound1 = nbttaglist.getCompound(i);
-@@ -418,8 +419,6 @@ public class ChunkRegionLoader {
+@@ -419,8 +420,6 @@ public class ChunkRegionLoader {
              chunk.d(true);
          }
  
@@ -406,7 +406,7 @@ index 2e09900f45..1ebb16f0f6 100644
          NBTTagList nbttaglist1 = nbttagcompound.getList("TileEntities", 10);
  
          for (int j = 0; j < nbttaglist1.size(); ++j) {
-@@ -436,7 +435,7 @@ public class ChunkRegionLoader {
+@@ -437,7 +436,7 @@ public class ChunkRegionLoader {
                  }
              }
          }
@@ -416,7 +416,7 @@ index 2e09900f45..1ebb16f0f6 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/CustomFunction.java b/src/main/java/net/minecraft/server/CustomFunction.java
-index 46e7737ca3..a3ef943066 100644
+index 12885cbd60..49de6e997a 100644
 --- a/src/main/java/net/minecraft/server/CustomFunction.java
 +++ b/src/main/java/net/minecraft/server/CustomFunction.java
 @@ -13,12 +13,22 @@ public class CustomFunction {
@@ -443,7 +443,7 @@ index 46e7737ca3..a3ef943066 100644
          return this.b;
      }
 diff --git a/src/main/java/net/minecraft/server/CustomFunctionData.java b/src/main/java/net/minecraft/server/CustomFunctionData.java
-index 9c9eef0ad9..b42fbf2c65 100644
+index 8346778383..8bc74add6d 100644
 --- a/src/main/java/net/minecraft/server/CustomFunctionData.java
 +++ b/src/main/java/net/minecraft/server/CustomFunctionData.java
 @@ -101,7 +101,7 @@ public class CustomFunctionData implements IResourcePackListener {
@@ -456,10 +456,19 @@ index 9c9eef0ad9..b42fbf2c65 100644
                  int j = 0;
                  CustomFunction.c[] acustomfunction_c = customfunction.b();
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index b60956218d..19e2df3098 100644
+index c088ff9692..c7ea4ec4fe 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -31,7 +31,7 @@ import org.apache.logging.log4j.Level;
+@@ -19,6 +19,8 @@ import java.util.Collections;
+ import java.util.List;
+ import java.util.Locale;
+ import java.util.Random;
++import java.util.concurrent.CompletableFuture;
++import java.util.concurrent.ExecutionException;
+ import java.util.function.BooleanSupplier;
+ import java.util.regex.Pattern;
+ import javax.annotation.Nullable;
+@@ -31,7 +33,7 @@ import org.apache.logging.log4j.Level;
  
  import org.bukkit.command.CommandSender;
  import org.bukkit.craftbukkit.LoggerOutputStream;
@@ -468,7 +477,7 @@ index b60956218d..19e2df3098 100644
  import org.bukkit.event.server.ServerCommandEvent;
  import org.bukkit.craftbukkit.util.Waitable;
  import org.bukkit.event.server.RemoteServerCommandEvent;
-@@ -428,7 +428,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -428,7 +430,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
      }
  
      public void handleCommandQueue() {
@@ -477,7 +486,7 @@ index b60956218d..19e2df3098 100644
          while (!this.serverCommandQueue.isEmpty()) {
              ServerCommand servercommand = (ServerCommand) this.serverCommandQueue.remove(0);
  
-@@ -443,7 +443,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -443,7 +445,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              // CraftBukkit end
          }
  
@@ -486,30 +495,56 @@ index b60956218d..19e2df3098 100644
      }
  
      @Override
-@@ -681,7 +681,20 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -664,6 +666,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
-                 return remoteControlCommandListener.getMessages();
+ 
+     @Override
+     public String executeRemoteCommand(String s) {
++        Waitable[] waitableArray = new Waitable[1];
+         this.remoteControlCommandListener.clearMessages();
+         this.executeSync(() -> {
+             // CraftBukkit start - fire RemoteServerCommandEvent
+@@ -672,10 +675,39 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+             if (event.isCancelled()) {
+                 return;
              }
-         };
++            // Paper start
--        processQueue.add(waitable);
++            if (s.toLowerCase().startsWith("timings") && s.toLowerCase().matches("timings (report|paste|get|merged|seperate)")) {
++                org.bukkit.command.BufferedCommandSender sender = new org.bukkit.command.BufferedCommandSender();
++                Waitable<String> waitable = new Waitable<String>() {
++                    @Override
++                    protected String evaluate() {
++                        return sender.getBuffer();
++                    }
++                };
++                waitableArray[0] = waitable;
++                co.aikar.timings.Timings.generateReport(new co.aikar.timings.TimingsReportListener(sender, waitable));
++            } else {
++            // Paper end
+             ServerCommand serverCommand = new ServerCommand(event.getCommand(), remoteControlCommandListener.f());
+             server.dispatchServerCommand(remoteConsole, serverCommand);
++            } // Paper
+             // CraftBukkit end
+         });
 +        // Paper start
-+        if (s.toLowerCase().startsWith("timings") && s.toLowerCase().matches("timings (report|paste|get|merged|seperate)")) {
++        if (waitableArray[0] != null) {
-+            org.bukkit.command.BufferedCommandSender sender = new org.bukkit.command.BufferedCommandSender();
++            //noinspection unchecked
-+            waitable = new Waitable<String>() {
++            Waitable<String> waitable = waitableArray[0];
-+                @Override
++            try {
-+                protected String evaluate() {
++                return waitable.get();
-+                    return sender.getBuffer();
++            } catch (java.util.concurrent.ExecutionException e) {
-+                }
++                throw new RuntimeException("Exception processing rcon command " + s, e.getCause());
-+            };
++            } catch (InterruptedException e) {
-+            co.aikar.timings.Timings.generateReport(new co.aikar.timings.TimingsReportListener(sender, waitable));
++                Thread.currentThread().interrupt(); // Maintain interrupted state
-+        } else {
++                throw new RuntimeException("Interrupted processing rcon command " + s, e);
-+            processQueue.add(waitable);
++            }
++
 +        }
 +        // Paper end
-         try {
+         return this.remoteControlCommandListener.getMessages();
-             return waitable.get();
+     }
-         } catch (java.util.concurrent.ExecutionException e) {
+ 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 708f6c97c6..c348d6bec3 100644
+index 0c7bf3ae3f..49f64e1507 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -29,7 +29,8 @@ import org.bukkit.command.CommandSender;
@@ -531,7 +566,7 @@ index 708f6c97c6..c348d6bec3 100644
      // Spigot start
      public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -487,7 +488,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -495,7 +496,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public void move(EnumMoveType enummovetype, Vec3D vec3d) {
@@ -539,7 +574,7 @@ index 708f6c97c6..c348d6bec3 100644
          if (this.noclip) {
              this.a(this.getBoundingBox().b(vec3d));
              this.recalcPosition();
-@@ -652,7 +652,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -660,7 +660,6 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
              this.world.getMethodProfiler().exit();
          }
@@ -548,7 +583,7 @@ index 708f6c97c6..c348d6bec3 100644
  
      protected Vec3D a(Vec3D vec3d, EnumMoveType enummovetype) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 40173aa35b..678dae6dae 100644
+index e0b12e1fd7..30aa4f56d3 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -35,7 +35,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -566,7 +601,7 @@ index 40173aa35b..678dae6dae 100644
      public void tick() {
 -        SpigotTimings.timerEntityBaseTick.startTiming(); // Spigot
          super.tick();
-         this.dk();
+         this.dl();
          this.o();
 @@ -2289,9 +2288,7 @@ public abstract class EntityLiving extends Entity {
              }
@@ -624,28 +659,19 @@ index 40173aa35b..678dae6dae 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 64318e6e78..c76620f2b3 100644
+index 41638b680d..73b1041c8c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1,5 +1,7 @@
+@@ -54,7 +54,7 @@ import org.bukkit.craftbukkit.CraftServer;
- package net.minecraft.server;
- 
-+import co.aikar.timings.Timings;
-+import com.google.common.base.Stopwatch;
- import com.google.common.collect.Lists;
- import com.google.common.collect.Maps;
- import com.google.gson.JsonElement;
-@@ -54,8 +56,8 @@ import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.craftbukkit.Main;
  import org.bukkit.event.server.ServerLoadEvent;
  // CraftBukkit end
 -import org.bukkit.craftbukkit.SpigotTimings; // Spigot
- import org.spigotmc.SlackActivityAccountant; // Spigot
 +import co.aikar.timings.MinecraftTimings; // Paper
+ 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
-@@ -671,6 +673,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
          // CraftBukkit end
          MinecraftServer.LOGGER.info("Stopping server");
@@ -653,7 +679,7 @@ index 64318e6e78..c76620f2b3 100644
          // CraftBukkit start
          if (this.server != null) {
              this.server.disablePlugins();
-@@ -948,7 +951,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -947,7 +948,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      protected void exit() {}
  
      protected void a(BooleanSupplier booleansupplier) {
@@ -662,7 +688,7 @@ index 64318e6e78..c76620f2b3 100644
          this.slackActivityAccountant.tickStarted(); // Spigot
          long i = SystemUtils.getMonotonicNanos();
  
-@@ -969,14 +972,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -968,14 +969,12 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
  
          if (autosavePeriod > 0 && this.ticks % autosavePeriod == 0) { // CraftBukkit
@@ -677,7 +703,7 @@ index 64318e6e78..c76620f2b3 100644
          }
  
          this.methodProfiler.enter("snooper");
-@@ -999,29 +1000,28 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -998,30 +997,29 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          this.methodProfiler.exit();
          org.spigotmc.WatchdogThread.tick(); // Spigot
          this.slackActivityAccountant.tickEnded(l); // Spigot
@@ -699,6 +725,7 @@ index 64318e6e78..c76620f2b3 100644
 -        SpigotTimings.commandFunctionsTimer.stopTiming(); // Spigot
 +        MinecraftTimings.commandFunctionsTimer.stopTiming(); // Spigot // Paper
          this.methodProfiler.exitEnter("levels");
+         Iterator iterator = this.getWorlds().iterator();
  
          // CraftBukkit start
          // Run tasks that are waiting on processing
@@ -715,16 +742,16 @@ index 64318e6e78..c76620f2b3 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 +1029,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1029,7 +1027,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-                 entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean("doDaylightCycle"))); // Add support for per player time
+                 entityplayer.playerConnection.sendPacket(new PacketPlayOutUpdateTime(entityplayer.world.getTime(), entityplayer.getPlayerTime(), entityplayer.world.getGameRules().getBoolean(GameRules.DO_DAYLIGHT_CYCLE))); // Add support for per player time
              }
          }
 -        SpigotTimings.timeUpdateTimer.stopTiming(); // Spigot
 +        MinecraftTimings.timeUpdateTimer.stopTiming(); // Spigot // Paper
  
-         // WorldServer worldserver; // CraftBukkit - dropped down
+         while (iterator.hasNext()) {
-         long i;
+             WorldServer worldserver = (WorldServer) iterator.next();
-@@ -1076,20 +1076,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1072,20 +1070,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
  
          this.methodProfiler.exitEnter("connection");
@@ -735,36 +762,37 @@ index 64318e6e78..c76620f2b3 100644
 +        MinecraftTimings.connectionTimer.stopTiming(); // Spigot
          this.methodProfiler.exitEnter("players");
 -        SpigotTimings.playerListTimer.startTiming(); // Spigot
-+        MinecraftTimings.playerListTimer.startTiming(); // Spigot
++        MinecraftTimings.playerListTimer.startTiming(); // Spigot // Paper
          this.playerList.tick();
 -        SpigotTimings.playerListTimer.stopTiming(); // Spigot
-+        MinecraftTimings.playerListTimer.stopTiming(); // Spigot
++        MinecraftTimings.playerListTimer.stopTiming(); // Spigot // Paper
          this.methodProfiler.exitEnter("server gui refresh");
  
 -        SpigotTimings.tickablesTimer.startTiming(); // Spigot
-+        MinecraftTimings.tickablesTimer.startTiming(); // Spigot
++        MinecraftTimings.tickablesTimer.startTiming(); // Spigot // Paper
-         for (int j = 0; j < this.tickables.size(); ++j) {
+         for (int i = 0; i < this.tickables.size(); ++i) {
-             ((Runnable) this.tickables.get(j)).run();
+             ((Runnable) this.tickables.get(i)).run();
          }
 -        SpigotTimings.tickablesTimer.stopTiming(); // Spigot
-+        MinecraftTimings.tickablesTimer.stopTiming(); // Spigot
++        MinecraftTimings.tickablesTimer.stopTiming(); // Spigot // Paper
  
          this.methodProfiler.exit();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 3d2436365f..db159baab2 100644
+index 9381734a3a..ef31a269e4 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -1,6 +1,8 @@
+@@ -1,7 +1,9 @@
  package net.minecraft.server;
  
++import co.aikar.timings.Timing; // Paper
  import com.google.common.collect.ImmutableList;
-+import co.aikar.timings.Timing;
+ import com.google.common.collect.Iterables;
-+import com.google.common.collect.ComparisonChain;
++import com.google.common.collect.ComparisonChain; // Paper
  import com.google.common.collect.Lists;
  import com.google.common.collect.Queues;
  import com.google.common.collect.Sets;
-@@ -479,7 +481,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -477,7 +479,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
          });
  
          return completablefuture.thenComposeAsync((either) -> {
@@ -773,7 +801,7 @@ index 3d2436365f..db159baab2 100644
                  try {
                      CompletableFuture<Either<IChunkAccess, PlayerChunk.Failure>> completablefuture1 = chunkstatus.a(this.world, this.chunkGenerator, this.definedStructureManager, this.lightEngine, (ichunkaccess) -> {
                          return this.c(playerchunk);
-@@ -965,6 +967,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -967,6 +969,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
  
          PlayerChunkMap.EntityTracker playerchunkmap_entitytracker;
          ObjectIterator objectiterator;
@@ -781,7 +809,7 @@ index 3d2436365f..db159baab2 100644
  
          for (objectiterator = this.trackedEntities.values().iterator(); objectiterator.hasNext(); playerchunkmap_entitytracker.trackerEntry.a()) {
              playerchunkmap_entitytracker = (PlayerChunkMap.EntityTracker) objectiterator.next();
-@@ -982,13 +985,16 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -984,13 +987,16 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                  playerchunkmap_entitytracker.e = sectionposition1;
              }
          }
@@ -799,7 +827,7 @@ index 3d2436365f..db159baab2 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ae194b981f..d20037bd00 100644
+index d40600c103..fa37c19c69 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -880,7 +908,7 @@ index cb6d50ea70..9ba03f8ed0 100644
              throw CancelledPacketHandleException.INSTANCE;
          }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 017db63a4c..fc3422cca3 100644
+index ee22d6c81a..fb6b48e3fe 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1,5 +1,6 @@
@@ -954,7 +982,7 @@ index 061730c560..c5890f5dcc 100644
              this.g.clear();
          }
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 382498d193..a833781e59 100644
+index e8a90e01f5..0956eff603 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -9,11 +9,12 @@ import org.bukkit.craftbukkit.persistence.CraftPersistentDataContainer;
@@ -973,7 +1001,7 @@ index 382498d193..a833781e59 100644
      private static final CraftPersistentDataTypeRegistry DATA_TYPE_REGISTRY = new CraftPersistentDataTypeRegistry();
      public final CraftPersistentDataContainer persistentDataContainer = new CraftPersistentDataContainer(DATA_TYPE_REGISTRY);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a2b1aba49f..2a0a7f2480 100644
+index 32981c4422..0e09adf7dc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,7 @@
@@ -1040,7 +1068,7 @@ index a2b1aba49f..2a0a7f2480 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 508cdc6a0c..089468835b 100644
+index 95eb36d15c..09560368fd 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1,5 +1,7 @@
@@ -1132,7 +1160,7 @@ index 508cdc6a0c..089468835b 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 4413066eea..834c16172b 100644
+index 61ed2ff50a..75b7d3cca8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1926,12 +1926,31 @@ public final class CraftServer implements Server {
@@ -1340,10 +1368,10 @@ index 38f211526b..0000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index c94a41d029..037b0bc685 100644
+index 00aecdc472..c6daf693c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1740,6 +1740,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1749,6 +1749,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
@@ -1522,7 +1550,7 @@ index e52ef47b78..3d90b34268 100644
          this.value = value;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
-index c88704f69e..f7fdd0727b 100644
+index 7ae4e7288b..fa32d4bb7e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftMagicNumbers.java
 @@ -271,6 +271,13 @@ public final class CraftMagicNumbers implements UnsafeValues {
@@ -1601,5 +1629,5 @@ index 4c947a9352..106e9d7e2d 100644
      }
  }
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0013-Allow-nerfed-mobs-to-jump.patch

@@ -1,4 +1,4 @@
-From 49d72c58219676d02bbbea2a263cbd0fb9719d44 Mon Sep 17 00:00:00 2001
+From 5b97ebeb6ed39563881aebabe1c14a2061b568dc Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 13:24:16 -0600
 Subject: [PATCH] Allow nerfed mobs to jump
@@ -31,10 +31,10 @@ index 2e869004c8..8a6856e0fd 100644
          this.b.setJumping(this.a);
          this.a = false;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index ec1da887c6..679dda76e4 100644
+index 6d7b313aeb..3a96f70d89 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -31,6 +31,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -32,6 +32,7 @@ public abstract class EntityInsentient extends EntityLiving {
      private final EntityAIBodyControl c;
      protected NavigationAbstract navigation;
      public PathfinderGoalSelector goalSelector;
@@ -42,7 +42,7 @@ index ec1da887c6..679dda76e4 100644
      public PathfinderGoalSelector targetSelector;
      private EntityLiving goalTarget;
      private final EntitySenses bz;
-@@ -636,6 +637,12 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -637,6 +638,12 @@ public abstract class EntityInsentient extends EntityLiving {
          // Spigot Start
          if ( this.fromMobSpawner )
          {
@@ -56,7 +56,7 @@ index ec1da887c6..679dda76e4 100644
          }
          // Spigot End
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
-index 040a64471f..a10532b0f8 100644
+index 71b399c65c..2e23b5de59 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalFloat.java
 @@ -8,10 +8,12 @@ public class PathfinderGoalFloat extends PathfinderGoal {
@@ -73,7 +73,7 @@ index 040a64471f..a10532b0f8 100644
      public boolean a() {
          double d0 = (double) this.a.getHeadHeight() < 0.4D ? 0.2D : 0.4D;
 @@ -19,6 +21,7 @@ public class PathfinderGoalFloat extends PathfinderGoal {
-         return this.a.isInWater() && this.a.ce() > d0 || this.a.aC();
+         return this.a.isInWater() && this.a.cf() > d0 || this.a.aD();
      }
  
 +    public void update() { this.e(); } // Paper - OBFHELPER
@@ -81,5 +81,5 @@ index 040a64471f..a10532b0f8 100644
      public void e() {
          if (this.a.getRandom().nextFloat() < 0.8F) {
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0014-Add-configurable-despawn-distances-for-living-entiti.patch

@@ -1,4 +1,4 @@
-From 25f87007f232a25b78220f21213e7bd43fa13920 Mon Sep 17 00:00:00 2001
+From 3518f124123b64cdd39895cc24b2abd9dfe98be3 Mon Sep 17 00:00:00 2001
 From: Suddenly <suddenly@suddenly.coffee>
 Date: Tue, 1 Mar 2016 13:51:54 -0600
 Subject: [PATCH] Add configurable despawn distances for living entities
@@ -30,10 +30,10 @@ index 341038fc4d..3e1f4be10f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 679dda76e4..d020414f98 100644
+index 3a96f70d89..a2247fa1dd 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -612,11 +612,11 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -613,11 +613,11 @@ public abstract class EntityInsentient extends EntityLiving {
              if (entityhuman != null) {
                  double d0 = entityhuman.h(this);
  
@@ -48,5 +48,5 @@ index 679dda76e4..d020414f98 100644
                  } else if (d0 < 1024.0D) {
                      this.ticksFarFromPlayer = 0;
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0016-Drop-falling-block-and-tnt-entities-at-the-specified.patch

@@ -1,4 +1,4 @@
-From 72c9924c43d2d39544698b14e6332ce719556754 Mon Sep 17 00:00:00 2001
+From 124f2ebcda485739ff4e7772dc5dfc8bdb680d42 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Tue, 1 Mar 2016 14:14:15 -0600
 Subject: [PATCH] Drop falling block and tnt entities at the specified height
@@ -24,10 +24,10 @@ index 3f734327c0..1ed58f4bba 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c348d6bec3..f5647a171d 100644
+index 49f64e1507..187374666b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1788,6 +1788,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1837,6 +1837,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          return this.a(itemstack, 0.0F);
      }
  
@@ -36,7 +36,7 @@ index c348d6bec3..f5647a171d 100644
      public EntityItem a(ItemStack itemstack, float f) {
          if (itemstack.isEmpty()) {
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index c9c903367f..fee5e67877 100644
+index 7b7048090d..7fb0c0e068 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -88,6 +88,16 @@ public class EntityFallingBlock extends Entity {
@@ -46,7 +46,7 @@ index c9c903367f..fee5e67877 100644
 +
 +            // Paper start - Configurable EntityFallingBlock height nerf
 +            if (this.world.paperConfig.fallingBlockHeightNerf != 0 && this.locY > this.world.paperConfig.fallingBlockHeightNerf) {
-+                if (this.dropItem && this.world.getGameRules().getBoolean("doEntityDrops")) {
++                if (this.dropItem && this.world.getGameRules().getBoolean(GameRules.DO_ENTITY_DROPS)) {
 +                    this.a(block);
 +                }
 +
@@ -57,7 +57,7 @@ index c9c903367f..fee5e67877 100644
                  blockposition = new BlockPosition(this);
                  boolean flag = this.block.getBlock() instanceof BlockConcretePowder;
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index ba86a07344..e3001570f9 100644
+index 775192a598..e988abd67c 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -57,6 +57,11 @@ public class EntityTNTPrimed extends Entity {

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

@@ -1,4 +1,4 @@
-From 381d17f1aafb8da42668e4afd391b97e50ab645c Mon Sep 17 00:00:00 2001
+From a764546cf091e3868032edb7d31b436787669e29 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 c76620f2b3..2fc8c192b3 100644
+index 73b1041c8c..5e0f28b3fe 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1287,7 +1287,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1281,7 +1281,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      }
  
      public String getServerModName() {
@@ -32,7 +32,7 @@ index c76620f2b3..2fc8c192b3 100644
  
      public CrashReport b(CrashReport crashreport) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 834c16172b..b03687cd3e 100644
+index 75b7d3cca8..a51b917d08 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -196,7 +196,7 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -116,5 +116,5 @@ index 27297204f1..70b187190f 100644
                  log.log( Level.SEVERE, "------------------------------" );
                  //
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0019-Add-version-history-to-version-command.patch

@@ -1,4 +1,4 @@
-From 7199ce661ad75664bd3d0d08b8e63f645e7688dd Mon Sep 17 00:00:00 2001
+From 88ad52a8150b3e8dbfc84307364cfc13827a6a99 Mon Sep 17 00:00:00 2001
 From: Kyle Wood <demonwav@gmail.com>
 Date: Thu, 1 Mar 2018 19:37:52 -0600
 Subject: [PATCH] Add version history to version command
@@ -192,10 +192,10 @@ index 0000000000..aac3f66cb2
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 19e2df3098..f0e2250cd8 100644
+index c7ea4ec4fe..6e1509c2c1 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -160,6 +160,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -162,6 +162,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
              return false;
          }
          com.destroystokyo.paper.PaperConfig.registerCommands();
@@ -204,5 +204,5 @@ index 19e2df3098..f0e2250cd8 100644
  
          this.setSpawnAnimals(dedicatedserverproperties.spawnAnimals);
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0020-Player-affects-spawning-API.patch

@@ -1,11 +1,11 @@
-From 02a1ec99a67ce0478e09e67f050ae89309517b33 Mon Sep 17 00:00:00 2001
+From fe2a4b3a0eb87faf8512700171147012ded647c5 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 14:47:52 -0600
 Subject: [PATCH] Player affects spawning API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 28791cca90..418e2fccdc 100644
+index 4735f6e673..1a41a9c1d9 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -70,6 +70,9 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,10 +19,10 @@ index 28791cca90..418e2fccdc 100644
      // CraftBukkit start
      public boolean fauxSleeping;
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index d020414f98..0ecbf873bf 100644
+index a2247fa1dd..4fa345db65 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -609,7 +609,7 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -610,7 +610,7 @@ public abstract class EntityInsentient extends EntityLiving {
          if (!this.isPersistent() && !this.I()) {
              EntityHuman entityhuman = this.world.findNearbyPlayer(this, -1.0D);
  
@@ -32,12 +32,12 @@ index d020414f98..0ecbf873bf 100644
  
                  if (d0 > world.paperConfig.hardDespawnDistance) { // CraftBukkit - remove isTypeNotPersistent() check // Paper - custom despawn distances
 diff --git a/src/main/java/net/minecraft/server/EntitySilverfish.java b/src/main/java/net/minecraft/server/EntitySilverfish.java
-index dbbc34d91b..d823c6b6d9 100644
+index e66cdc49ca..2979cc8b66 100644
 --- a/src/main/java/net/minecraft/server/EntitySilverfish.java
 +++ b/src/main/java/net/minecraft/server/EntitySilverfish.java
-@@ -106,7 +106,7 @@ public class EntitySilverfish extends EntityMonster {
+@@ -100,7 +100,7 @@ public class EntitySilverfish extends EntityMonster {
-         if (super.a(generatoraccess, enummobspawn)) {
+         if (d(entitytypes, generatoraccess, enummobspawn, blockposition, random)) {
-             EntityHuman entityhuman = this.world.a(EntitySilverfish.b, (EntityLiving) this);
+             EntityHuman entityhuman = generatoraccess.a(EntitySilverfish.b, (double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D);
  
 -            return entityhuman == null;
 +            return !(entityhuman != null && !entityhuman.affectsSpawning) && entityhuman == null; // Paper - Affects Spawning API
@@ -45,10 +45,10 @@ index dbbc34d91b..d823c6b6d9 100644
              return false;
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 037b0bc685..76728b1785 100644
+index c6daf693c5..00d6fc4b32 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1642,7 +1642,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1651,7 +1651,19 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      @Override
      public String getLocale() {
          return getHandle().locale;
@@ -69,5 +69,5 @@ index 037b0bc685..76728b1785 100644
      @Override
      public void updateCommands() {
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,4 +1,4 @@
-From 4112a8f586cfe8127c6637b52b8b2132498ffa42 Mon Sep 17 00:00:00 2001
+From c04a10fa0cfb08d11e768bdf75a7a329c5de7601 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,10 +12,10 @@ 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 2fc8c192b3..cf7a75b2e2 100644
+index 5e0f28b3fe..0a6a8c372d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -150,7 +150,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -147,7 +147,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      public org.bukkit.command.ConsoleCommandSender console;
      public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
      public ConsoleReader reader;
@@ -24,7 +24,7 @@ index 2fc8c192b3..cf7a75b2e2 100644
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
      public File bukkitDataPackFolder;
-@@ -160,7 +160,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -157,7 +157,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      // Spigot start
      public static final int TPS = 20;
      public static final int TICK_TIME = 1000000000 / TPS;
@@ -33,7 +33,7 @@ index 2fc8c192b3..cf7a75b2e2 100644
      public final double[] recentTps = new double[ 3 ];
      public final SlackActivityAccountant slackActivityAccountant = new SlackActivityAccountant();
      // Spigot end
-@@ -757,6 +757,57 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -754,6 +754,57 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      {
          return ( avg * exp ) + ( tps * ( 1 - exp ) );
      }
@@ -91,7 +91,7 @@ index 2fc8c192b3..cf7a75b2e2 100644
      // Spigot End
  
      public void run() {
-@@ -769,30 +820,38 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -766,30 +817,38 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
                  // Spigot start
                  Arrays.fill( recentTps, 20 );
@@ -137,10 +137,10 @@ index 2fc8c192b3..cf7a75b2e2 100644
 +                    //MinecraftServer.currentTick = (int) (System.currentTimeMillis() / 50); // CraftBukkit // Paper - don't overwrite current tick time
 +                    lastTick = curTime;
                      this.nextTick += 50L;
-                     if (this.T) {
+                     if (this.S) {
-                         this.T = false;
+                         this.S = false;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index b03687cd3e..d37f4cdf4a 100644
+index a51b917d08..1776c49b00 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1923,6 +1923,17 @@ public final class CraftServer implements Server {
@@ -203,5 +203,5 @@ index be2e31deae..6d21c32692 100644
          return ( ( tps > 18.0 ) ? ChatColor.GREEN : ( tps > 16.0 ) ? ChatColor.YELLOW : ChatColor.RED ).toString()
                  + ( ( tps > 20.0 ) ? "*" : "" ) + Math.min( Math.round( tps * 100.0 ) / 100.0, 20.0 );
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0024-Only-refresh-abilities-if-needed.patch

@@ -1,14 +1,14 @@
-From e86917c2c413b8457b81acd9a11bbd8fd704e08a Mon Sep 17 00:00:00 2001
+From 24913c949ff63f25778ed470bb31cc3c5c67180b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:12:03 -0600
 Subject: [PATCH] Only refresh abilities if needed
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 76728b1785..e180655989 100644
+index 00d6fc4b32..3d14319b75 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1331,12 +1331,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1340,12 +1340,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public void setFlying(boolean value) {
@@ -24,5 +24,5 @@ index 76728b1785..e180655989 100644
  
      @Override
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,11 +1,11 @@
-From fcf34927ee0a09db8755a8bff558a72be6a2d624 Mon Sep 17 00:00:00 2001
+From 05d8b8cd1f57968af4eb878382bbd42dc5cd3087 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
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index f5647a171d..205376f6af 100644
+index 187374666b..0bfa78bd22 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -163,6 +163,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -16,7 +16,7 @@ index f5647a171d..205376f6af 100644
      // Spigot start
      public final org.spigotmc.ActivationRange.ActivationType activationType = org.spigotmc.ActivationRange.initializeEntityActivationType(this);
      public final boolean defaultActivationState;
-@@ -1546,6 +1547,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1595,6 +1596,11 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
                  this.bukkitEntity.storeBukkitValues(nbttagcompound);
              }
              // CraftBukkit end
@@ -28,7 +28,7 @@ index f5647a171d..205376f6af 100644
              return nbttagcompound;
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Saving entity NBT");
-@@ -1668,6 +1674,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1717,6 +1723,13 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              this.getBukkitEntity().readBukkitValues(nbttagcompound);
              // CraftBukkit end
  
@@ -42,7 +42,7 @@ index f5647a171d..205376f6af 100644
          } catch (Throwable throwable) {
              CrashReport crashreport = CrashReport.a(throwable, "Loading entity NBT");
              CrashReportSystemDetails crashreportsystemdetails = crashreport.a("Entity being loaded");
-@@ -1745,6 +1758,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1794,6 +1807,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      protected abstract void b(NBTTagCompound nbttagcompound);
  
@@ -51,7 +51,7 @@ index f5647a171d..205376f6af 100644
          NBTTagList nbttaglist = new NBTTagList();
          double[] adouble1 = adouble;
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index a4984aa9a8..23a1f8c77c 100644
+index 7fb0c0e068..9d86beda9e 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -253,6 +253,14 @@ public class EntityFallingBlock extends Entity {
@@ -70,7 +70,7 @@ index a4984aa9a8..23a1f8c77c 100644
  
      public void a(boolean flag) {
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index e3001570f9..e0535604b6 100644
+index e988abd67c..f2ee53ab90 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -104,6 +104,14 @@ public class EntityTNTPrimed extends Entity {
@@ -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 089468835b..fc582fead6 100644
+index 09560368fd..8e2f34ded7 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1095,6 +1095,11 @@ public class WorldServer extends World {
+@@ -1093,6 +1093,11 @@ public class WorldServer extends World {
                  this.I.add(((EntityInsentient) entity).getNavigation());
              }
              entity.valid = true; // CraftBukkit

Spigot-Server-Patches/0027-Configurable-top-of-nether-void-damage.patch

@@ -1,4 +1,4 @@
-From c3ea72d0ce6cbf68d57705e3b527a724c52a8f05 Mon Sep 17 00:00:00 2001
+From 07d9bf17efeb0de32a8d0d7ab72d6c139d1d51e8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 1 Mar 2016 23:58:50 -0600
 Subject: [PATCH] Configurable top of nether void damage
@@ -29,7 +29,7 @@ index 1ed58f4bba..a797a57671 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 205376f6af..8165655c31 100644
+index 0bfa78bd22..32ed5ac429 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -397,9 +397,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -40,7 +40,7 @@ index 205376f6af..8165655c31 100644
 +        // Extracted to own function
 +        /*
          if (this.locY < -64.0D) {
-             this.ae();
+             this.af();
          }
 +        */
 +        this.performVoidDamage();
@@ -66,16 +66,16 @@ index 205376f6af..8165655c31 100644
      protected void E() {
          if (this.portalCooldown > 0) {
              --this.portalCooldown;
-@@ -476,6 +493,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -484,6 +501,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
          this.fireTicks = 0;
      }
  
-+   protected final void doVoidDamage() { this.ae(); } // Paper - OBFHELPER
++    protected final void doVoidDamage() { this.af(); } // Paper - OBFHELPER
-     protected void ae() {
+     protected void af() {
          this.die();
      }
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index 9dcf8d7142..2a2105cbce 100644
+index ff5d128176..e1a684b370 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -182,9 +182,15 @@ public abstract class EntityMinecartAbstract extends Entity {
@@ -86,7 +86,7 @@ index 9dcf8d7142..2a2105cbce 100644
 +        // Extracted to own function
 +        /*
          if (this.locY < -64.0D) {
-             this.ae();
+             this.af();
          }
 +        */
 +        this.performVoidDamage();
@@ -95,5 +95,5 @@ index 9dcf8d7142..2a2105cbce 100644
          // this.doPortalTick(); // CraftBukkit - handled in postTick
          if (this.world.isClientSide) {
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0030-Configurable-end-credits.patch

@@ -1,4 +1,4 @@
-From 08f004e8c862bfb241bd86d5b5877b6416cd3eda Mon Sep 17 00:00:00 2001
+From 7cfb4c83487da77cd975787dbdb2a5bac003b3d1 Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
@@ -20,7 +20,7 @@ index a797a57671..c2b9690a0c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f7cf02f588..e60ead5ecb 100644
+index 90bcb01e3a..b907600db9 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -32,7 +32,7 @@ index f7cf02f588..e60ead5ecb 100644
      private final RecipeBookServer recipeBook;
      private Vec3D cr;
      private int cs;
-@@ -704,6 +704,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -706,6 +706,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              this.getWorldServer().removePlayer(this);
              if (!this.viewingCredits) {
                  this.viewingCredits = true;

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

@@ -1,4 +1,4 @@
-From fcb8f0562a2ea393e6b63cc5a86e9ca0d16857ca Mon Sep 17 00:00:00 2001
+From d36da1b37c9f54484374dc44f57812a19bc59b86 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
@@ -25,7 +25,7 @@ index c2b9690a0c..a5ec0bc0e0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index e1c628f177..bcff117619 100644
+index 7c1305164d..594e7bd94c 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -172,7 +172,7 @@ public class Explosion {
@@ -123,10 +123,10 @@ index e1c628f177..bcff117619 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index cf7a75b2e2..454e28fc47 100644
+index 0a6a8c372d..52c0d52046 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1131,6 +1131,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1125,6 +1125,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
                  this.methodProfiler.exit();
                  this.methodProfiler.exit();
@@ -135,7 +135,7 @@ index cf7a75b2e2..454e28fc47 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3cbaeb387b..1db06c6d94 100644
+index 1915dd9145..b5029ab733 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -19,6 +19,7 @@ import org.apache.logging.log4j.util.Supplier;
@@ -155,5 +155,5 @@ index 3cbaeb387b..1db06c6d94 100644
      public CraftWorld getWorld() {
          return this.world;
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0037-Send-absolute-position-the-first-time-an-entity-is-s.patch

@@ -1,11 +1,11 @@
-From 9df71e45d0c780ac4c202a044e0335985cff89f4 Mon Sep 17 00:00:00 2001
+From 4f60c9d49368eedc399fcbe3b4f301bf9fe25578 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Wed, 2 Mar 2016 23:13:07 -0600
 Subject: [PATCH] Send absolute position the first time an entity is seen
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 315c3d9165..aaf3a54b08 100644
+index cf0e1a6a0c..f04a9d18c4 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -77,10 +77,10 @@ index 315c3d9165..aaf3a54b08 100644
  
                  this.c();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index db159baab2..d9d253ea09 100644
+index ef31a269e4..07a1796c77 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -1083,10 +1083,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1085,10 +1085,14 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
          private final Entity tracker;
          private final int trackingDistance;
          private SectionPosition e;
@@ -97,7 +97,7 @@ index db159baab2..d9d253ea09 100644
              this.tracker = entity;
              this.trackingDistance = i;
              this.e = SectionPosition.a(entity);
-@@ -1168,7 +1172,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -1170,7 +1174,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                      entityplayer.removeQueue.remove(Integer.valueOf(this.tracker.getId()));
                      // CraftBukkit end
  
@@ -107,5 +107,5 @@ index db159baab2..d9d253ea09 100644
                      }
                  } else if (this.trackedPlayers.remove(entityplayer)) {
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0039-Configurable-container-update-tick-rate.patch

@@ -1,4 +1,4 @@
-From 1e6542580ad5efd8f40f15718f4600ea12491bd8 Mon Sep 17 00:00:00 2001
+From 91280bfceb4e92ed99055b27ca39f2493c82b7bd Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
@@ -19,7 +19,7 @@ index e4e00e2e1c..d663b15ceb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1dba939967..4603165280 100644
+index b907600db9..462c666735 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -72,6 +72,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -30,7 +30,7 @@ index 1dba939967..4603165280 100644
  
      // CraftBukkit start
      public String displayName;
-@@ -349,7 +350,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -351,7 +352,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              --this.noDamageTicks;
          }
  
@@ -45,5 +45,5 @@ index 1dba939967..4603165280 100644
              this.closeInventory();
              this.activeContainer = this.defaultContainer;
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch

@@ -1,4 +1,4 @@
-From 20d1bce64066eaf1ebf9f057a9bd8362f1dea167 Mon Sep 17 00:00:00 2001
+From 0cd703d13d59f0b5200d1aeb1fc39cafeb96f13e Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle
@@ -19,18 +19,18 @@ index 2782970393..be91b11242 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index 30bc933c21..96cf4bccea 100644
+index c3d4d00483..039050f634 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
-@@ -276,7 +276,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
+@@ -274,7 +274,7 @@ public class EntitySlime extends EntityInsentient implements IMonster {
                  }
  
                  ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(blockposition);
--                boolean flag = SeededRandom.a(chunkcoordintpair.x, chunkcoordintpair.z, generatoraccess.getSeed(), world.spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot
+-                boolean flag = SeededRandom.a(chunkcoordintpair.x, chunkcoordintpair.z, generatoraccess.getSeed(), generatoraccess.getMinecraftWorld().spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot
-+                boolean flag = world.paperConfig.allChunksAreSlimeChunks ||  SeededRandom.a(chunkcoordintpair.x, chunkcoordintpair.z, generatoraccess.getSeed(), world.spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot // Paper
++                boolean flag = generatoraccess.getMinecraftWorld().paperConfig.allChunksAreSlimeChunks || SeededRandom.a(chunkcoordintpair.x, chunkcoordintpair.z, generatoraccess.getSeed(), generatoraccess.getMinecraftWorld().spigotConfig.slimeSeed).nextInt(10) == 0; // Spigot // Paper
  
-                 if (this.random.nextInt(10) == 0 && flag && this.locY < 40.0D) {
+                 if (random.nextInt(10) == 0 && flag && blockposition.getY() < 40) {
-                     return super.a(generatoraccess, enummobspawn);
+                     return a(entitytypes, generatoraccess, enummobspawn, blockposition, random);
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0049-Player-Tab-List-and-Title-APIs.patch

@@ -1,4 +1,4 @@
-From 4f9b2c61d849dfea7732bf99b9c53db523c7c357 Mon Sep 17 00:00:00 2001
+From d17dab532a462b6b3b0e9d27c213e61b4df54141 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -52,7 +52,7 @@ index 3a6e780007..535056c64e 100644
  
          if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e180655989..b87971e6dd 100644
+index 3d14319b75..982b06b840 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -62,7 +62,7 @@ index e180655989..b87971e6dd 100644
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -209,6 +210,96 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -211,6 +212,96 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
@@ -160,5 +160,5 @@ index e180655989..b87971e6dd 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0054-Configurable-inter-world-teleportation-safety.patch

@@ -1,4 +1,4 @@
-From ad67102bfd8df77af0ec58a81eccc6e2fcdfd81d Mon Sep 17 00:00:00 2001
+From 68f778350062b11e8bc9c8ed3d28dc510d10f129 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Configurable inter-world teleportation safety
@@ -30,10 +30,10 @@ index 320fd07c62..94f5c90b3c 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b87971e6dd..a338b0f09b 100644
+index 982b06b840..f4b3b7ff0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -746,7 +746,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -755,7 +755,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          if (fromWorld == toWorld) {
              entity.playerConnection.teleport(to);
          } else {
@@ -43,5 +43,5 @@ index b87971e6dd..a338b0f09b 100644
          return true;
      }
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0055-Add-exception-reporting-event.patch

@@ -1,4 +1,4 @@
-From 7e62a116dc2216f57c4523f24f8989162cbe1afe Mon Sep 17 00:00:00 2001
+From 3d3ad0b026a88bc8cb8403058596eeb4d9c482fe Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -49,7 +49,7 @@ index 0000000000..f699ce18ca
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index e990445196..9b65972569 100644
+index f6f5b72de3..ec64391a4a 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,6 @@
@@ -80,10 +80,10 @@ index e990445196..9b65972569 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 5b6b533055..4c2cdcf160 100644
+index 22aba06270..3da7e10a92 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-@@ -16,6 +16,9 @@ import java.util.function.BooleanSupplier;
+@@ -14,6 +14,9 @@ import java.util.function.BooleanSupplier;
  import java.util.function.Function;
  import java.util.function.Supplier;
  import javax.annotation.Nullable;
@@ -121,10 +121,10 @@ index 2cb0962ff1..21a8ed3231 100644
                         }
                          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index d9d253ea09..e0e11b6f2e 100644
+index 07a1796c77..808c178157 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -646,6 +646,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -644,6 +644,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                  this.world.checkSession();
              } catch (ExceptionWorldConflict exceptionworldconflict) {
                  PlayerChunkMap.LOGGER.error("Couldn't save chunk; already in use by another instance of Minecraft?", exceptionworldconflict);
@@ -132,7 +132,7 @@ index d9d253ea09..e0e11b6f2e 100644
                  return false;
              }
  
-@@ -673,6 +674,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -671,6 +672,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
                  return true;
              } catch (Exception exception) {
                  PlayerChunkMap.LOGGER.error("Failed to save chunk {},{}", chunkcoordintpair.x, chunkcoordintpair.z, exception);
@@ -168,7 +168,7 @@ index d4a9af975d..88b5aa3a51 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 82f9ad7f0c..f4f842b863 100644
+index a54d653372..4aa65c1934 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -8,6 +8,7 @@ import org.apache.logging.log4j.LogManager;
@@ -187,7 +187,7 @@ index 82f9ad7f0c..f4f842b863 100644
                                                          return;
                                                      }
  
-@@ -208,6 +210,7 @@ public final class SpawnerCreature {
+@@ -210,6 +212,7 @@ public final class SpawnerCreature {
                                  entity = biomebase_biomemeta.b.a(generatoraccess.getMinecraftWorld());
                              } catch (Exception exception) {
                                  SpawnerCreature.LOGGER.warn("Failed to create mob", exception);
@@ -196,7 +196,7 @@ index 82f9ad7f0c..f4f842b863 100644
                              }
  
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index beeb9ccb8d..bb3aa4a376 100644
+index 0a1d342c13..347608531f 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
 @@ -1,5 +1,7 @@
@@ -207,7 +207,7 @@ index beeb9ccb8d..bb3aa4a376 100644
  import java.util.Iterator;
  import javax.annotation.Nullable;
  
-@@ -98,6 +100,7 @@ public class VillageSiege {
+@@ -97,6 +99,7 @@ public class VillageSiege {
                  entityzombie.prepare(this.a, this.a.getDamageScaler(new BlockPosition(entityzombie)), EnumMobSpawn.EVENT, (GroupDataEntity) null, (NBTTagCompound) null);
              } catch (Exception exception) {
                  exception.printStackTrace();
@@ -216,7 +216,7 @@ index beeb9ccb8d..bb3aa4a376 100644
              }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c4d476eb61..b4ed1e4435 100644
+index 17d1dc93bc..f3f10ca60e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2,6 +2,9 @@ package net.minecraft.server;
@@ -255,10 +255,10 @@ index c4d476eb61..b4ed1e4435 100644
              return;
              // Paper end
 diff --git a/src/main/java/net/minecraft/server/WorldPersistentData.java b/src/main/java/net/minecraft/server/WorldPersistentData.java
-index 3c5b3fe101..47a4ea9985 100644
+index f5f540032f..00e9a17355 100644
 --- a/src/main/java/net/minecraft/server/WorldPersistentData.java
 +++ b/src/main/java/net/minecraft/server/WorldPersistentData.java
-@@ -113,6 +113,7 @@ public class WorldPersistentData {
+@@ -121,6 +121,7 @@ public class WorldPersistentData {
              nbttagcompound = GameProfileSerializer.a(this.c, DataFixTypes.SAVED_DATA, nbttagcompound1, j, i);
          } catch (Throwable throwable4) {
              throwable = throwable4;
@@ -313,5 +313,5 @@ index 8823f94f7b..552daf4376 100644
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0057-Disable-Scoreboards-for-non-players-by-default.patch

@@ -1,4 +1,4 @@
-From 880183aec51a5b5a20c61fb20be1c179c4fb0022 Mon Sep 17 00:00:00 2001
+From dde42087398f92114c7ae967d6caf403e0e0649a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -25,10 +25,10 @@ index 94f5c90b3c..30f0dcfd51 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 8165655c31..3d739c4316 100644
+index 32ed5ac429..39ca7d5870 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2213,6 +2213,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2262,6 +2262,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
  
      @Nullable
      public ScoreboardTeamBase getScoreboardTeam() {
@@ -37,7 +37,7 @@ index 8165655c31..3d739c4316 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 061f708aea..d6475338b5 100644
+index 6cb95a6606..0b21c0b8dd 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -582,6 +582,7 @@ public abstract class EntityLiving extends Entity {
@@ -49,5 +49,5 @@ index 061f708aea..d6475338b5 100644
  
              if (!flag) {
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0059-Complete-resource-pack-API.patch

@@ -1,11 +1,11 @@
-From b3c61b17f49c297966866352c023fa16ba469bb8 Mon Sep 17 00:00:00 2001
+From 1d52cfde6af6ca1ad7481a70c38ef816cffedd8e Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index def713f495..f8aa8b1405 100644
+index 4ca45743d0..e4a273dbe2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1347,7 +1347,11 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -22,10 +22,10 @@ index def713f495..f8aa8b1405 100644
      // CraftBukkit end
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a338b0f09b..8f80582a78 100644
+index f4b3b7ff0b..2e0621b889 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -132,6 +132,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -134,6 +134,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      private double health = 20;
      private boolean scaledHealth = false;
      private double healthScale = 20;
@@ -36,7 +36,7 @@ index a338b0f09b..8f80582a78 100644
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
          super(server, entity);
-@@ -1746,6 +1750,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1755,6 +1759,32 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      public boolean getAffectsSpawning() {
          return this.getHandle().affectsSpawning;
      }
@@ -70,5 +70,5 @@ index a338b0f09b..8f80582a78 100644
  
      @Override
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0068-Custom-replacement-for-eaten-items.patch

@@ -1,11 +1,11 @@
-From 8986c076e68f65f37e3e8fb065e471d9247f348a Mon Sep 17 00:00:00 2001
+From d5041d93476ed1f9f670c659ded86491a9527d7b Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index d6475338b5..4409588fbb 100644
+index 0b21c0b8dd..645b7f605c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2817,12 +2817,13 @@ public abstract class EntityLiving extends Entity {
@@ -35,7 +35,7 @@ index d6475338b5..4409588fbb 100644
 +            // Paper end
              this.a(this.getRaisedHand(), itemstack);
              // CraftBukkit end
-             this.dp();
+             this.dq();
 +            // Paper start - if the replacement is anything but the default, update the client inventory
 +            if (this instanceof EntityPlayer && !com.google.common.base.Objects.equal(defaultReplacement, itemstack)) {
 +                ((EntityPlayer) this).getBukkitEntity().updateInventory();
@@ -45,5 +45,5 @@ index d6475338b5..4409588fbb 100644
  
      }
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0069-handle-NaN-health-absorb-values-and-repair-bad-data.patch

@@ -1,11 +1,11 @@
-From 25b39b5bf37a6abe1b22dd67b3cfb72ea427c597 Mon Sep 17 00:00:00 2001
+From 981ffa42e50a7095946db729a10e3245920bc903 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4409588fbb..d202d3d65f 100644
+index 645b7f605c..18e152b8fb 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -543,7 +543,13 @@ public abstract class EntityLiving extends Entity {
@@ -44,10 +44,10 @@ index 4409588fbb..d202d3d65f 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 8f80582a78..34ae747004 100644
+index 2e0621b889..d0d61fd290 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1565,6 +1565,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1574,6 +1574,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void setRealHealth(double health) {
@@ -56,5 +56,5 @@ index 8f80582a78..34ae747004 100644
      }
  
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0072-Configurable-spawn-chances-for-skeleton-horses.patch

@@ -1,4 +1,4 @@
-From e65746258a6e9c85f67eac3c8d98a3601d8adf00 Mon Sep 17 00:00:00 2001
+From 246374c9fd3be8f68807b6de904eb12e31ad53ee Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
@@ -22,18 +22,18 @@ index 98049567f4..2a71381dae 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7b78946ece..6328558975 100644
+index 2ed2cb8935..cefe8340d4 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -388,7 +388,7 @@ public class WorldServer extends World {
              blockposition = this.a(this.a(j, 0, k, 15));
              if (this.isRainingAt(blockposition)) {
                  DifficultyDamageScaler difficultydamagescaler = this.getDamageScaler(blockposition);
--                boolean flag1 = this.getGameRules().getBoolean("doMobSpawning") && this.random.nextDouble() < (double) difficultydamagescaler.b() * 0.01D;
+-                boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * 0.01D;
-+                boolean flag1 = this.getGameRules().getBoolean("doMobSpawning") && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper;
++                boolean flag1 = this.getGameRules().getBoolean(GameRules.DO_MOB_SPAWNING) && this.random.nextDouble() < (double) difficultydamagescaler.b() * paperConfig.skeleHorseSpawnChance; // Paper
  
                  if (flag1) {
                      EntityHorseSkeleton entityhorseskeleton = (EntityHorseSkeleton) EntityTypes.SKELETON_HORSE.a((World) this);
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,4 +1,4 @@
-From b59fad98a704c3befb5105a84f13bea0dc72fcf1 Mon Sep 17 00:00:00 2001
+From e3ab9802cf0972e1795420e3ca058095e95b082e 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
@@ -19,7 +19,7 @@ index 9bf42bb5ef..0526af776d 100644
              }
          }
 diff --git a/src/main/java/net/minecraft/server/BlockTallPlant.java b/src/main/java/net/minecraft/server/BlockTallPlant.java
-index 469a3be057..f2c429f22e 100644
+index ef392f5fe8..227fe073fd 100644
 --- a/src/main/java/net/minecraft/server/BlockTallPlant.java
 +++ b/src/main/java/net/minecraft/server/BlockTallPlant.java
 @@ -55,7 +55,7 @@ public class BlockTallPlant extends BlockPlant {
@@ -32,19 +32,19 @@ index 469a3be057..f2c429f22e 100644
          }
          // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 454e28fc47..40b9bff98f 100644
+index 52c0d52046..4e1c03a78c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1096,6 +1096,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1091,6 +1091,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-         // CraftBukkit - dropTickTime
+         while (iterator.hasNext()) {
-         for (Iterator iterator = this.getWorlds().iterator(); iterator.hasNext();) {
              WorldServer worldserver = (WorldServer) iterator.next();
+ 
 +            worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
-             i = SystemUtils.getMonotonicNanos();
              if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit
                  this.methodProfiler.a(() -> {
+                     return worldserver.getWorldData().getName() + " " + IRegistry.DIMENSION_TYPE.getKey(worldserver.worldProvider.getDimensionManager());
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4ec6a860d5..c8a859d7ba 100644
+index 822db5d4c0..93a061b6b2 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -440,7 +440,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -66,7 +66,7 @@ index 4ec6a860d5..c8a859d7ba 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 6328558975..4568336f11 100644
+index cefe8340d4..513892aa85 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 {
@@ -78,5 +78,5 @@ index 6328558975..4568336f11 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) {
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,14 +1,14 @@
-From a3d0b728b00a72793b20fe081d80ab77cb3aa149 Mon Sep 17 00:00:00 2001
+From ddb9473e7b3367cf7d4e3096db17b419289fac46 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 4568336f11..9f7258ad62 100644
+index 513892aa85..7bfe2b047b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1101,6 +1101,7 @@ public class WorldServer extends World {
+@@ -1099,6 +1099,7 @@ public class WorldServer extends World {
                  entity.origin = entity.getBukkitEntity().getLocation();
              }
              // Paper end
@@ -16,7 +16,7 @@ index 4568336f11..9f7258ad62 100644
          }
  
      }
-@@ -1110,6 +1111,7 @@ public class WorldServer extends World {
+@@ -1108,6 +1109,7 @@ public class WorldServer extends World {
          if (this.tickingEntities) {
              throw new IllegalStateException("Removing entity while ticking!");
          } else {
@@ -25,5 +25,5 @@ index 4568336f11..9f7258ad62 100644
              this.entitiesById.remove(entity.getId());
              this.unregisterEntity(entity);
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0078-EntityPathfindEvent.patch

@@ -1,4 +1,4 @@
-From 9cc229d9a2b2e314802d77dd02a9183da09afff3 Mon Sep 17 00:00:00 2001
+From 3f79320ddf65e87431feaf8e92b1bb636425c970 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityPathfindEvent
 Fires when an Entity decides to start moving to a location.
 
 diff --git a/src/main/java/net/minecraft/server/Navigation.java b/src/main/java/net/minecraft/server/Navigation.java
-index aacaecd82d..bc30e3f339 100644
+index 04ccf141ce..e15728668e 100644
 --- a/src/main/java/net/minecraft/server/Navigation.java
 +++ b/src/main/java/net/minecraft/server/Navigation.java
 @@ -60,7 +60,7 @@ public class Navigation extends NavigationAbstract {
@@ -17,9 +17,9 @@ index aacaecd82d..bc30e3f339 100644
 +        return this.b(new BlockPosition(entity), entity); // Paper - Forward target entity
      }
  
-     private int s() {
+     private int t() {
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 75e01c2420..d04eb1bbfe 100644
+index 81dd8e4e89..130367099b 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -4,7 +4,7 @@ import javax.annotation.Nullable;
@@ -92,5 +92,5 @@ index 9dfca6067f..551ff417bd 100644
  
      @Override
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0085-Fix-reducedDebugInfo-not-initialized-on-client.patch

@@ -1,21 +1,21 @@
-From 91f40ee8e13da62895289b96f50dbf77eb84b89c Mon Sep 17 00:00:00 2001
+From 95ca52c5dcfff825afa02b18d9216d0db8ff4837 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 00bab3f758..66f4691918 100644
+index 35bda2e1d6..cce5305fbe 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -162,6 +162,7 @@ public abstract class PlayerList {
          playerconnection.sendPacket(new PacketPlayOutHeldItemSlot(entityplayer.inventory.itemInHandIndex));
          playerconnection.sendPacket(new PacketPlayOutRecipeUpdate(this.server.getCraftingManager().b()));
          playerconnection.sendPacket(new PacketPlayOutTags(this.server.getTagRegistry()));
-+        playerconnection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, (byte) (worldserver.getGameRules().getBoolean("reducedDebugInfo") ? 22 : 23))); // Paper - fix this rule not being initialized on the client
++        playerconnection.sendPacket(new PacketPlayOutEntityStatus(entityplayer, (byte) (worldserver.getGameRules().getBoolean(GameRules.REDUCED_DEBUG_INFO) ? 22 : 23))); // Paper - fix this rule not being initialized on the client
          this.d(entityplayer);
          entityplayer.getStatisticManager().c();
          entityplayer.B().a(entityplayer);
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0090-Workaround-for-setting-passengers-on-players.patch

@@ -1,4 +1,4 @@
-From 0ffc1dcaad7b97949787de5112efce7a69d8ffab Mon Sep 17 00:00:00 2001
+From f21f5724ba148e88b8e363592282ac48d8bdf0a0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
@@ -6,10 +6,10 @@ Subject: [PATCH] Workaround for setting passengers on players
 SPIGOT-1915 & GH-114
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 34ae747004..cc31b8d4ac 100644
+index d0d61fd290..57f2499cad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -755,6 +755,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -764,6 +764,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return true;
      }
  
@@ -28,5 +28,5 @@ index 34ae747004..cc31b8d4ac 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0093-Configurable-Player-Collision.patch

@@ -1,4 +1,4 @@
-From 760971cf0af6bdafbafd20368498ac95094d3ada Mon Sep 17 00:00:00 2001
+From e74d304c76e68157f46252480a0f8fe71fbf2831 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
@@ -19,10 +19,10 @@ index 0cef1853f5..dc3438890b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 40b9bff98f..7a860231e4 100644
+index 4e1c03a78c..f88e42423d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -439,6 +439,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -436,6 +436,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              this.server.getPluginManager().callEvent(new org.bukkit.event.world.WorldLoadEvent(worldserver.getWorld()));
          }
  
@@ -57,7 +57,7 @@ index b0740965a4..6b1a914d2f 100644
              packetdataserializer.a(this.c);
              packetdataserializer.a(this.d);
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 779117b5db..ca6863adc4 100644
+index d368b39751..ee5297dc38 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -72,6 +72,7 @@ public abstract class PlayerList {
@@ -115,5 +115,5 @@ index 779117b5db..ca6863adc4 100644
  
      // CraftBukkit start
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0097-Implement-PlayerLocaleChangeEvent.patch

@@ -1,11 +1,11 @@
-From d6261ae0b5190c624e74af4283658c118657d816 Mon Sep 17 00:00:00 2001
+From f614a869a397b63bc5321e076ab70267ef518974 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 73af650c0c..ee5f2f0afa 100644
+index 462c666735..c5dbcbe590 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -37,7 +37,7 @@ import org.bukkit.inventory.MainHand;
@@ -17,7 +17,7 @@ index 73af650c0c..ee5f2f0afa 100644
      public PlayerConnection playerConnection;
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
-@@ -1447,13 +1447,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1449,13 +1449,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              PlayerChangedMainHandEvent event = new PlayerChangedMainHandEvent(getBukkitEntity(), getMainHand() == EnumMainHand.LEFT ? MainHand.LEFT : MainHand.RIGHT);
              this.server.server.getPluginManager().callEvent(event);
          }
@@ -40,10 +40,10 @@ index 73af650c0c..ee5f2f0afa 100644
          this.cl = packetplayinsettings.e();
          this.getDataWatcher().set(EntityPlayer.bt, (byte) packetplayinsettings.f());
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cc31b8d4ac..397349963d 100644
+index 57f2499cad..d854d48446 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1749,8 +1749,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1758,8 +1758,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
      @Override
      public String getLocale() {
@@ -56,7 +56,7 @@ index cc31b8d4ac..397349963d 100644
      }
  
      // Paper start
-@@ -1840,7 +1842,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1849,7 +1851,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          @Override
          public String getLocale()
          {

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

@@ -1,4 +1,4 @@
-From 5c2318cc96c81ecb1bec910cd84762c20cbfb5b1 Mon Sep 17 00:00:00 2001
+From aa72827fd9ad7117a8a9fdeb5a4ef07fa6d5bed8 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,10 +6,10 @@ 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 7a860231e4..d3d8fffeb0 100644
+index f88e42423d..f489d47c60 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -61,6 +61,7 @@ import co.aikar.timings.MinecraftTimings; // Paper
+@@ -59,6 +59,7 @@ import org.spigotmc.SlackActivityAccountant; // Spigot
  
  public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTask> implements IMojangStatistics, ICommandListener, AutoCloseable, Runnable {
  
@@ -17,15 +17,15 @@ index 7a860231e4..d3d8fffeb0 100644
      public static final Logger LOGGER = LogManager.getLogger();
      public static final File b = new File("usercache.json");
      public static final WorldSettings c = (new WorldSettings((long) "North Carolina".hashCode(), EnumGamemode.SURVIVAL, true, false, WorldType.NORMAL)).a();
-@@ -167,6 +168,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -164,6 +165,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      public MinecraftServer(OptionSet options, Proxy proxy, DataFixer datafixer, CommandDispatcher commanddispatcher, YggdrasilAuthenticationService yggdrasilauthenticationservice, MinecraftSessionService minecraftsessionservice, GameProfileRepository gameprofilerepository, UserCache usercache, WorldLoadListenerFactory worldloadlistenerfactory, String s) {
          super("Server");
 +        SERVER = this; // Paper - better singleton
-         this.ae = new ResourceManager(EnumResourcePackType.SERVER_DATA, this.serverThread);
+         this.ad = new ResourceManager(EnumResourcePackType.SERVER_DATA, this.serverThread);
          this.resourcePackRepository = new ResourcePackRepository<>(ResourcePackLoader::new);
-         this.ai = new CraftingManager();
+         this.ah = new CraftingManager();
-@@ -1906,7 +1908,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1907,7 +1909,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      @Deprecated
      public static MinecraftServer getServer() {
@@ -35,5 +35,5 @@ index 7a860231e4..d3d8fffeb0 100644
      // CraftBukkit end
  }
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,4 +1,4 @@
-From a23bab59c9483788dcb442e61f8fa9b42ec98326 Mon Sep 17 00:00:00 2001
+From 6beaf59f9a063d38ff89c82b77c1fd8d4b076705 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
@@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 418e2fccdc..892922ca63 100644
+index 1a41a9c1d9..1a1b1dd1e8 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -590,6 +590,12 @@ public abstract class EntityHuman extends EntityLiving {
@@ -30,7 +30,7 @@ index 418e2fccdc..892922ca63 100644
              return entityitem;
          }
 diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
-index 61892fec98..acbd381c8c 100644
+index fc08158937..090d3dbd31 100644
 --- a/src/main/java/net/minecraft/server/WorldMap.java
 +++ b/src/main/java/net/minecraft/server/WorldMap.java
 @@ -31,6 +31,7 @@ public class WorldMap extends PersistentBase {
@@ -49,15 +49,15 @@ index 61892fec98..acbd381c8c 100644
          // CraftBukkit end
      }
  
-@@ -110,6 +112,7 @@ public class WorldMap extends PersistentBase {
+@@ -115,6 +117,7 @@ public class WorldMap extends PersistentBase {
-             this.l.put(mapiconbanner.f(), mapiconbanner);
+                 this.l.put(mapiconbanner.f(), mapiconbanner);
-             this.a(mapiconbanner.c(), (GeneratorAccess) null, mapiconbanner.f(), (double) mapiconbanner.a().getX(), (double) mapiconbanner.a().getZ(), 180.0D, mapiconbanner.d());
+                 this.a(mapiconbanner.c(), (GeneratorAccess) null, mapiconbanner.f(), (double) mapiconbanner.a().getX(), (double) mapiconbanner.a().getZ(), 180.0D, mapiconbanner.d());
-         }
+             }
 +        vanillaRender.buffer = colors; // Paper
  
-         NBTTagList nbttaglist1 = nbttagcompound.getList("frames", 10);
+             NBTTagList nbttaglist1 = nbttagcompound.getList("frames", 10);
  
-@@ -184,6 +187,7 @@ public class WorldMap extends PersistentBase {
+@@ -190,6 +193,7 @@ public class WorldMap extends PersistentBase {
          this.b();
      }
  
@@ -65,7 +65,7 @@ index 61892fec98..acbd381c8c 100644
      public void a(EntityHuman entityhuman, ItemStack itemstack) {
          if (!this.humans.containsKey(entityhuman)) {
              WorldMap.WorldMapHumanTracker worldmap_worldmaphumantracker = new WorldMap.WorldMapHumanTracker(entityhuman);
-@@ -419,6 +423,21 @@ public class WorldMap extends PersistentBase {
+@@ -425,6 +429,21 @@ public class WorldMap extends PersistentBase {
  
      public class WorldMapHumanTracker {
  
@@ -87,7 +87,7 @@ index 61892fec98..acbd381c8c 100644
          public final EntityHuman trackee;
          private boolean d = true;
          private int e;
-@@ -435,9 +454,12 @@ public class WorldMap extends PersistentBase {
+@@ -441,9 +460,12 @@ public class WorldMap extends PersistentBase {
          @Nullable
          public Packet<?> a(ItemStack itemstack) {
              // CraftBukkit start
@@ -102,10 +102,10 @@ index 61892fec98..acbd381c8c 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 9f7258ad62..d69ad6820b 100644
+index 7bfe2b047b..7b19d74597 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -1038,6 +1038,7 @@ public class WorldServer extends World {
+@@ -1036,6 +1036,7 @@ public class WorldServer extends World {
                          {
                              if ( iter.next().trackee == entity )
                              {
@@ -127,5 +127,5 @@ index 256a131781..5768cd512e 100644
  
      public RenderData() {
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,4 +1,4 @@
-From 06b292dd14d20731596c660752b2ac0d64971546 Mon Sep 17 00:00:00 2001
+From b9e60337d725ca6dfb42893d103124c0f0f68b36 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 d3d8fffeb0..f142ed9a3b 100644
+index f489d47c60..ff879d9bd0 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -739,7 +739,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -736,7 +736,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          // Spigot start
          if (org.spigotmc.SpigotConfig.saveUserCacheOnStopOnly) {
              LOGGER.info("Saving usercache.json");
@@ -106,5 +106,5 @@ index 57d053e9ff..ea02567554 100644
      }
  
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0107-Optional-TNT-doesn-t-move-in-water.patch

@@ -1,4 +1,4 @@
-From 1bac817fad6ad059f0b65e06887d5aea60364761 Mon Sep 17 00:00:00 2001
+From 9098716df661037fb74460e7b22722ef5443d970 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
@@ -32,13 +32,13 @@ index 805aa56999..92ab55182f 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1cc7b9f60e..4ef333ef12 100644
+index b91eaebc0e..44709d5d46 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2645,6 +2645,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2694,6 +2694,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
-     public boolean bD() {
+     public boolean bE() {
 +        // Paper start
 +        return this.pushedByWater();
 +    }
@@ -49,11 +49,11 @@ index 1cc7b9f60e..4ef333ef12 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index e0535604b6..baeb85142b 100644
+index f2ee53ab90..dc0d944ea0 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -80,7 +80,27 @@ public class EntityTNTPrimed extends Entity {
-             this.ax();
+             this.ay();
              this.world.addParticle(Particles.SMOKE, this.locX, this.locY + 0.5D, this.locZ, 0.0D, 0.0D, 0.0D);
          }
 -
@@ -94,7 +94,7 @@ index e0535604b6..baeb85142b 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index aaf3a54b08..afd8748da8 100644
+index f04a9d18c4..cd7e0299ac 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -36,7 +36,7 @@ public class EntityTrackerEntry {
@@ -107,5 +107,5 @@ index aaf3a54b08..afd8748da8 100644
      private java.util.Map<EntityPlayer, Boolean> trackedPlayerMap = null;
  
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,4 +1,4 @@
-From 166a5a9e1a03057324fe82d5aa496a783c509bea Mon Sep 17 00:00:00 2001
+From 8409d78cc274cec36417a15ca55786b0ec91d791 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 d69ad6820b..f03804bfbb 100644
+index 7b19d74597..cb2b55de52 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -928,6 +928,7 @@ public class WorldServer extends World {
+@@ -926,6 +926,7 @@ public class WorldServer extends World {
      // CraftBukkit start
      private boolean addEntity0(Entity entity, CreatureSpawnEvent.SpawnReason spawnReason) {
          org.spigotmc.AsyncCatcher.catchOp( "entity add"); // Spigot
@@ -20,5 +20,5 @@ index d69ad6820b..f03804bfbb 100644
              // WorldServer.LOGGER.warn("Tried to add entity {} but it was marked as removed already", EntityTypes.getName(entity.getEntityType())); // CraftBukkit
              return false;
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0115-Re-track-players-that-dismount-from-other-players.patch

@@ -1,14 +1,14 @@
-From 919059f2d0e417cb86a796468ab611442c587181 Mon Sep 17 00:00:00 2001
+From 711bddf91f2f0f5faa884ddee9c23fc82c932cad Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index ee5f2f0afa..55ec0bb14e 100644
+index c5dbcbe590..2d29e9d866 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -978,6 +978,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -980,6 +980,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          if (entity1 != entity && this.playerConnection != null) {
              this.playerConnection.a(this.locX, this.locY, this.locZ, this.yaw, this.pitch);
          }

Spigot-Server-Patches/0122-Auto-fix-bad-Y-levels-on-player-login.patch

@@ -1,4 +1,4 @@
-From d146d1ef94f021d54ffa33ac26d6f21402122d18 Mon Sep 17 00:00:00 2001
+From 806c5048a46d06f9448db8d45fe6be4eabe4f911 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -6,10 +6,10 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 5db5e15ac8..a7bf433a7f 100644
+index 2d29e9d866..7b0c89ce7a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -191,6 +191,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -193,6 +193,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
      @Override
      public void a(NBTTagCompound nbttagcompound) {
          super.a(nbttagcompound);
@@ -18,5 +18,5 @@ index 5db5e15ac8..a7bf433a7f 100644
              if (this.getMinecraftServer().getForceGamemode()) {
                  this.playerInteractManager.setGameMode(this.getMinecraftServer().getGamemode());
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0124-Add-EntityZapEvent.patch

@@ -1,11 +1,11 @@
-From 0a6ae4866a84d4a1c9a948775e8adfd1736fcf6b Mon Sep 17 00:00:00 2001
+From 488f3c7f82abf9110bec823d81b0d5848a1eb2f8 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 01202e4d53..616075569f 100644
+index 23621a0dc9..0d099d2fd6 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -168,6 +168,12 @@ public class EntityPig extends EntityAnimal {
@@ -22,10 +22,10 @@ index 01202e4d53..616075569f 100644
          if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
              return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 1400b3f44b..4119709cb8 100644
+index 14125f519d..5e56447e7d 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
-@@ -584,6 +584,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+@@ -618,6 +618,12 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
      public void onLightningStrike(EntityLightning entitylightning) {
          EntityWitch entitywitch = (EntityWitch) EntityTypes.WITCH.a(this.world);
  

Spigot-Server-Patches/0128-Optimise-removeQueue.patch

@@ -1,11 +1,11 @@
-From 612c295c15b346d0b04a58b456f10b21a19353f6 Mon Sep 17 00:00:00 2001
+From 552c591c8c4d8848e81c63e8dc4e25433f43098f Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0e0faef89e..8254b8d68d 100644
+index 7b0c89ce7a..fc4b3945d6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
@@ -27,7 +27,7 @@ index 0e0faef89e..8254b8d68d 100644
      private final AdvancementDataPlayer advancementDataPlayer;
      private final ServerStatisticManager serverStatisticManager;
      private float lastHealthScored = Float.MIN_VALUE;
-@@ -365,13 +367,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -367,13 +369,20 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          while (!this.removeQueue.isEmpty()) {
              int i = Math.min(this.removeQueue.size(), Integer.MAX_VALUE);
              int[] aint = new int[i];
@@ -50,7 +50,7 @@ index 0e0faef89e..8254b8d68d 100644
  
              this.playerConnection.sendPacket(new PacketPlayOutEntityDestroy(aint));
          }
-@@ -1321,7 +1330,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1323,7 +1332,14 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          this.lastHealthSent = -1.0F;
          this.lastFoodSent = -1;
          // this.recipeBook.a((RecipeBook) entityplayer.recipeBook); // CraftBukkit

Spigot-Server-Patches/0139-Properly-fix-item-duplication-bug.patch

@@ -1,4 +1,4 @@
-From b4a1a1e7a6699bbd267a11f664b485f24d251b28 Mon Sep 17 00:00:00 2001
+From 25310ce37d460f67350b589d4c816932835d3bc8 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -6,10 +6,10 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8254b8d68d..14ea4641dc 100644
+index fc4b3945d6..18c71640f5 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -1794,7 +1794,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1796,7 +1796,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      protected boolean isFrozen() {
@@ -19,7 +19,7 @@ index 8254b8d68d..14ea4641dc 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d2c178429d..f88ec07835 100644
+index 49d2299eff..6632b80d2a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2544,7 +2544,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

Spigot-Server-Patches/0140-String-based-Action-Bar-API.patch

@@ -1,4 +1,4 @@
-From 62e87ec4fc7f367cea59ba5d18cdc0c0784ff7c9 Mon Sep 17 00:00:00 2001
+From f1d16cb1aee6052f8cce8e79053ce2ff6ef0e923 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
@@ -42,10 +42,10 @@ index c96f3ed176..1f6a126329 100644
      public static boolean isMainThread() {
          return MinecraftServer.getServer().isMainThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 397349963d..b584432639 100644
+index d854d48446..d064153829 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -215,6 +215,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -217,6 +217,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      // Paper start
@@ -65,5 +65,5 @@ index 397349963d..b584432639 100644
      public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
           if (header != null) {
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0143-Provide-E-TE-Chunk-count-stat-methods.patch

@@ -1,4 +1,4 @@
-From 900e8111d9cac68491c28375de1fe4b74aca4b74 Mon Sep 17 00:00:00 2001
+From c4c9bd77113a059d54e10603eb602a8454310e36 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,10 +7,10 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index bddfc796db..6f8c2a1d2b 100644
+index 7c2eba8aa4..b8e16e1870 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -265,6 +265,35 @@ public class CraftWorld implements World {
+@@ -264,6 +264,35 @@ public class CraftWorld implements World {
      private int waterAnimalSpawn = -1;
      private int ambientSpawn = -1;
  
@@ -47,5 +47,5 @@ index bddfc796db..6f8c2a1d2b 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0145-Don-t-allow-entities-to-ride-themselves-572.patch

@@ -1,14 +1,14 @@
-From cad06e39a8171eb2e160d68118cf82dd0a8ab356 Mon Sep 17 00:00:00 2001
+From f75ca265343834ec3ad756ba51d8c526b5b532e4 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c5576e0325..e1ad87f2fe 100644
+index 58f7bb658f..f541011a34 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -1993,6 +1993,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2042,6 +2042,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      protected boolean addPassenger(Entity entity) { // CraftBukkit
@@ -17,5 +17,5 @@ index c5576e0325..e1ad87f2fe 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0147-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch

@@ -1,4 +1,4 @@
-From c9f38b6192671a5eca7f0220f100ed9dc534ada7 Mon Sep 17 00:00:00 2001
+From 674113294741991783d32f1717fe1f1cc111c56e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 78b0e78474..03d3090b3f 100644
+index 4b9e51b30f..c72ae7e251 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -511,13 +511,13 @@ public class Block implements IMaterial {
@@ -17,7 +17,7 @@ index 78b0e78474..03d3090b3f 100644
  
 -    protected void dropExperience(World world, BlockPosition blockposition, int i) {
 +    protected void dropExperience(World world, BlockPosition blockposition, int i, EntityPlayer player) { // Paper
-         if (!world.isClientSide && world.getGameRules().getBoolean("doTileDrops")) {
+         if (!world.isClientSide && world.getGameRules().getBoolean(GameRules.DO_TILE_DROPS)) {
              while (i > 0) {
                  int j = EntityExperienceOrb.getOrbValue(i);
  
@@ -41,7 +41,7 @@ index 2d2cd09ad1..ed88e208d0 100644
  
                      world.triggerEffect(1042, blockposition, 0);
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 6ac0546029..0baec5e119 100644
+index 0421052d21..f015c023e2 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -607,7 +607,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -54,7 +54,7 @@ index 6ac0546029..0baec5e119 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index bfba08fb24..49668f2c21 100644
+index a4cd502bca..214ecdb884 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -16,9 +16,59 @@ public class EntityExperienceOrb extends Entity {
@@ -134,7 +134,7 @@ index bfba08fb24..49668f2c21 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 758559d35d..2a351701b4 100644
+index 05fa5cd6af..d9767de12e 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -404,7 +404,7 @@ public class EntityFishingHook extends Entity {
@@ -147,7 +147,7 @@ index 758559d35d..2a351701b4 100644
                      // CraftBukkit end
                      if (itemstack1.getItem().a(TagsItem.FISHES)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 5622c08f19..b402818008 100644
+index 45c024ca24..cb2f3eb458 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -385,7 +385,8 @@ public abstract class EntityLiving extends Entity {
@@ -174,23 +174,23 @@ index 4ac5cce062..05970c5644 100644
  
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index a18bd29fe8..89792eec45 100644
+index dc1ba69f68..013b3a1ca8 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
-@@ -512,7 +512,7 @@ public class EntityTurtle extends EntityAnimal {
+@@ -508,7 +508,7 @@ public class EntityTurtle extends EntityAnimal {
              Random random = this.animal.getRandom();
  
-             if (this.b.getGameRules().getBoolean("doMobLoot")) {
+             if (this.b.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
 -                this.b.addEntity(new EntityExperienceOrb(this.b, this.animal.locX, this.animal.locY, this.animal.locZ, random.nextInt(7) + 1));
-+                this.b.addEntity(new EntityExperienceOrb(this.b, this.animal.locX, this.animal.locY, this.animal.locZ, random.nextInt(7) + 1, org.bukkit.entity.ExperienceOrb.SpawnReason.BREED, entityplayer)); // Paper
++                this.b.addEntity(new EntityExperienceOrb(this.b, this.animal.locX, this.animal.locY, this.animal.locZ, random.nextInt(7) + 1, org.bukkit.entity.ExperienceOrb.SpawnReason.BREED, entityplayer)); // Paper;
              }
  
          }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 4119709cb8..b25f3d1592 100644
+index 5e56447e7d..9311cc5bd6 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
-@@ -426,7 +426,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
+@@ -429,7 +429,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
          }
  
          if (merchantrecipe.isRewardExp()) {
@@ -200,7 +200,7 @@ index 4119709cb8..b25f3d1592 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index f39de1131f..46a349e73a 100644
+index b9aa512952..c179e11e4c 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -147,7 +147,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -213,11 +213,11 @@ index f39de1131f..46a349e73a 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index d25a05736e..9d0b1ffefa 100644
+index 363a98bece..0cc34400be 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 @@ -117,7 +117,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
-             if (this.b.getGameRules().getBoolean("doMobLoot")) {
+             if (this.b.getGameRules().getBoolean(GameRules.DO_MOB_LOOT)) {
                  // CraftBukkit start - use event experience
                  if (experience > 0) {
 -                    this.b.addEntity(new EntityExperienceOrb(this.b, this.animal.locX, this.animal.locY, this.animal.locZ, experience));
@@ -226,7 +226,7 @@ index d25a05736e..9d0b1ffefa 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 23f64ad001..ff8b11e7ea 100644
+index 4ccc77e4f6..e306b138db 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -367,7 +367,7 @@ public class PlayerInteractManager {
@@ -252,7 +252,7 @@ index d2698e847c..edc4a5c34e 100644
  
      public SlotFurnaceResult(EntityHuman entityhuman, IInventory iinventory, int i, int j, int k) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index d68826aa7b..0f6cd246ae 100644
+index 0cb2e6d874..2bbd3663a7 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -554,7 +554,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@@ -265,10 +265,10 @@ index d68826aa7b..0f6cd246ae 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index cd93ad3e05..9f449d1d3b 100644
+index b8e16e1870..47a54102a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1610,7 +1610,7 @@ public class CraftWorld implements World {
+@@ -1609,7 +1609,7 @@ public class CraftWorld implements World {
          } else if (TNTPrimed.class.isAssignableFrom(clazz)) {
              entity = new EntityTNTPrimed(world, x, y, z, null);
          } else if (ExperienceOrb.class.isAssignableFrom(clazz)) {

Spigot-Server-Patches/0150-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch

@@ -1,14 +1,14 @@
-From cdc20e1375c0f46573a23d5c583bedf890432527 Mon Sep 17 00:00:00 2001
+From a8776e3e3d6d0fa4f7e873ecf5bf0613c035c811 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index e0e11b6f2e..fba9f4b8a1 100644
+index 808c178157..6960e46ec6 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -81,7 +81,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -79,7 +79,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
          this.v = new AtomicInteger();
          this.playerMap = new PlayerMap();
          this.trackedEntities = new Int2ObjectOpenHashMap();
@@ -17,7 +17,7 @@ index e0e11b6f2e..fba9f4b8a1 100644
          this.definedStructureManager = definedstructuremanager;
          this.x = worldserver.getWorldProvider().getDimensionManager().a(file);
          this.world = worldserver;
-@@ -324,7 +324,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -322,7 +322,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
          // Spigot start
          org.spigotmc.SlackActivityAccountant activityAccountant = this.world.getMinecraftServer().slackActivityAccountant;
          activityAccountant.startActivity(0.5);
@@ -26,7 +26,7 @@ index e0e11b6f2e..fba9f4b8a1 100644
          // Spigot end
          while (longiterator.hasNext()) { // Spigot
              long j = longiterator.nextLong();
-@@ -346,7 +346,9 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -344,7 +344,9 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
  
          Runnable runnable;
  
@@ -38,5 +38,5 @@ index e0e11b6f2e..fba9f4b8a1 100644
          }
  
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0151-Do-not-let-armorstands-drown.patch

@@ -1,11 +1,11 @@
-From c02767e8da2a6471be996d0edde117a2831755a1 Mon Sep 17 00:00:00 2001
+From bf168d4122dee870e39cb2350a42dd74d9dcff28 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 1ae3ffa666..81226d6042 100644
+index ccdd0d27e3..62a878d13d 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -798,5 +798,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,26 +20,26 @@ index 1ae3ffa666..81226d6042 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 5e58930e81..ed528faada 100644
+index 7695404790..3961ae1710 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -223,6 +223,7 @@ public abstract class EntityLiving extends Entity {
          super.a(d0, flag, iblockdata, blockposition);
      }
  
-+    public boolean canBreatheUnderwater() { return this.cl(); } // Paper - OBFHELPER
++    public boolean canBreatheUnderwater() { return this.cm(); } // Paper - OBFHELPER
-     public boolean cl() {
+     public boolean cm() {
          return this.getMonsterType() == EnumMonsterType.UNDEAD;
      }
 @@ -262,7 +263,7 @@ public abstract class EntityLiving extends Entity {
  
          if (this.isAlive()) {
              if (this.a(TagsFluid.WATER) && this.world.getType(new BlockPosition(this.locX, this.locY + (double) this.getHeadHeight(), this.locZ)).getBlock() != Blocks.BUBBLE_COLUMN) {
--                if (!this.cl() && !MobEffectUtil.c(this) && !flag1) {
+-                if (!this.cm() && !MobEffectUtil.c(this) && !flag1) {
-+                if (!this.canBreatheUnderwater() && !MobEffectUtil.c(this) && !flag1) { // Paper - use OBFHELPER so it can be overridden
++                if (!this.canBreatheUnderwater() && !MobEffectUtil.c(this) && !flag1) {  // Paper - use OBFHELPER so it can be overridden
-                     this.setAirTicks(this.k(this.getAirTicks()));
+                     this.setAirTicks(this.l(this.getAirTicks()));
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,4 +1,4 @@
-From c97f19e82e8c08078c80d80946a841db54bf6475 Mon Sep 17 00:00:00 2001
+From d32338b1651e63ce6cb2dc9caf8996f4001d8a92 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,10 +30,10 @@ 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 f142ed9a3b..e7b89b3206 100644
+index ff879d9bd0..302a015790 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -80,6 +80,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -78,6 +78,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      public final Map<DimensionManager, WorldServer> worldServer = Maps.newLinkedHashMap(); // CraftBukkit - keep order, k+v already use identity methods
      private PlayerList playerList;
      private volatile boolean isRunning = true;
@@ -41,7 +41,7 @@ index f142ed9a3b..e7b89b3206 100644
      private boolean isStopped;
      private int ticks;
      protected final Proxy proxy;
-@@ -702,7 +703,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -699,7 +700,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 f142ed9a3b..e7b89b3206 100644
              try { Thread.sleep(100); } catch (InterruptedException ex) {} // CraftBukkit - SPIGOT-625 - give server at least a chance to send packets
          }
  
-@@ -756,8 +757,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -753,8 +754,13 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          return this.isRunning;
      }
  
@@ -64,7 +64,7 @@ index f142ed9a3b..e7b89b3206 100644
          if (flag) {
              try {
                  this.serverThread.join();
-@@ -767,6 +773,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -764,6 +770,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
          }
  
      }
@@ -73,7 +73,7 @@ index f142ed9a3b..e7b89b3206 100644
      // Spigot Start
      private static double calcTps(double avg, double exp, double tps)
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 99aedfe8d5..88bda7f417 100644
+index ccf8b7c707..d23e4e5e3d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1041,10 +1041,15 @@ public abstract class PlayerList {
@@ -307,5 +307,5 @@ index ccea803f58..aefea3a9a8 100644
 +
  }
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,4 +1,4 @@
-From 1c5f8f4095dcb4c7f249db92c5900cc91568a090 Mon Sep 17 00:00:00 2001
+From f0943de513aa9ab6b3b92f860e03f978e904d834 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 251fa0bc36..d379d33d15 100644
+index e8134bf0eb..ef508bbd71 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -41,10 +41,27 @@
@@ -143,10 +143,10 @@ index 0000000000..685deaa0e5
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index f0e2250cd8..37020dcba5 100644
+index 6e1509c2c1..26b35855e1 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -83,6 +83,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -85,6 +85,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
                  if (!org.bukkit.craftbukkit.Main.useConsole) {
                      return;
                  }
@@ -156,7 +156,7 @@ index f0e2250cd8..37020dcba5 100644
                  jline.console.ConsoleReader bufferedreader = reader;
                  // CraftBukkit end
  
-@@ -105,6 +108,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -107,6 +110,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
                      DedicatedServer.LOGGER.error("Exception handling console input", ioexception);
                  }
  
@@ -165,7 +165,7 @@ index f0e2250cd8..37020dcba5 100644
              }
          };
  
-@@ -116,6 +121,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -118,6 +123,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
          }
          global.addHandler(new org.bukkit.craftbukkit.util.ForwardLogHandler());
  
@@ -175,7 +175,7 @@ index f0e2250cd8..37020dcba5 100644
          final org.apache.logging.log4j.core.Logger logger = ((org.apache.logging.log4j.core.Logger) LogManager.getRootLogger());
          for (org.apache.logging.log4j.core.Appender appender : logger.getAppenders().values()) {
              if (appender instanceof org.apache.logging.log4j.core.appender.ConsoleAppender) {
-@@ -124,6 +132,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -126,6 +134,8 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
          }
  
          new org.bukkit.craftbukkit.util.TerminalConsoleWriterThread(System.out, this.reader).start();
@@ -185,10 +185,10 @@ index f0e2250cd8..37020dcba5 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 e7b89b3206..6b83f9769a 100644
+index 302a015790..4cf05e56fb 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -50,7 +50,7 @@ import org.apache.commons.lang3.Validate;
+@@ -48,7 +48,7 @@ import org.apache.commons.lang3.Validate;
  import org.apache.logging.log4j.LogManager;
  import org.apache.logging.log4j.Logger;
  // CraftBukkit start
@@ -197,7 +197,7 @@ index e7b89b3206..6b83f9769a 100644
  import org.bukkit.Bukkit;
  import org.bukkit.craftbukkit.CraftServer;
  import org.bukkit.craftbukkit.Main;
-@@ -151,7 +151,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -148,7 +148,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      public OptionSet options;
      public org.bukkit.command.ConsoleCommandSender console;
      public org.bukkit.command.RemoteConsoleCommandSender remoteConsole;
@@ -206,8 +206,8 @@ index e7b89b3206..6b83f9769a 100644
      public static int currentTick = 0; // Paper - Further improve tick loop
      public java.util.Queue<Runnable> processQueue = new java.util.concurrent.ConcurrentLinkedQueue<Runnable>();
      public int autosavePeriod;
-@@ -200,7 +200,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -197,7 +197,9 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-         this.K = s;
+         this.J = s;
          // CraftBukkit start
          this.options = options;
 +        // Paper start - Handled by TerminalConsoleAppender
@@ -216,7 +216,7 @@ index e7b89b3206..6b83f9769a 100644
          if (System.console() == null && System.getProperty("jline.terminal") == null) {
              System.setProperty("jline.terminal", "jline.UnsupportedTerminal");
              Main.useJline = false;
-@@ -221,6 +223,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -218,6 +220,8 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
                  LOGGER.warn((String) null, ex);
              }
          }
@@ -225,7 +225,7 @@ index e7b89b3206..6b83f9769a 100644
          Runtime.getRuntime().addShutdownHook(new org.bukkit.craftbukkit.util.ServerShutdownThread(this));
      }
      // CraftBukkit end
-@@ -930,7 +934,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -927,7 +931,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              } finally {
                  // CraftBukkit start - Restore terminal to original settings
                  try {
@@ -234,7 +234,7 @@ index e7b89b3206..6b83f9769a 100644
                  } catch (Exception ignored) {
                  }
                  // CraftBukkit end
-@@ -1415,7 +1419,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1409,7 +1413,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
  
      @Override
      public void sendMessage(IChatBaseComponent ichatbasecomponent) {
@@ -244,7 +244,7 @@ index e7b89b3206..6b83f9769a 100644
  
      public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 88bda7f417..f169e7edcd 100644
+index d23e4e5e3d..6a77707983 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -76,8 +76,7 @@ public abstract class PlayerList {
@@ -258,7 +258,7 @@ index 88bda7f417..f169e7edcd 100644
  
          this.k = new GameProfileBanList(PlayerList.a);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index d80bed4544..b6ae46ae00 100644
+index 91618e1cc4..6528705809 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -41,7 +41,6 @@ import java.util.function.Consumer;
@@ -592,5 +592,5 @@ index 490a9acc70..08b6bb7f97 100644
              <AppenderRef ref="TerminalConsole" level="info"/>
          </Root>
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0158-Item-canEntityPickup.patch

@@ -1,14 +1,14 @@
-From 972de0128357ccf41238c727e4e7e2632a297cd1 Mon Sep 17 00:00:00 2001
+From 7624eca940fe78d29f514c7fa7b2a38222c4c287 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:17 -0500
 Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 0ecbf873bf..c2771c5d94 100644
+index 4fa345db65..c20374d77b 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
-@@ -510,6 +510,11 @@ public abstract class EntityInsentient extends EntityLiving {
+@@ -511,6 +511,11 @@ public abstract class EntityInsentient extends EntityLiving {
                  EntityItem entityitem = (EntityItem) iterator.next();
  
                  if (!entityitem.dead && !entityitem.getItemStack().isEmpty() && !entityitem.q()) {
@@ -21,7 +21,7 @@ index 0ecbf873bf..c2771c5d94 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 18b12f319b..d9c7a21504 100644
+index 0569ad9af8..c0b81223f1 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -19,6 +19,7 @@ public class EntityItem extends Entity {
@@ -54,5 +54,5 @@ index cc593fbc99..3f552b5905 100644
      public String toString() {
          return "CraftItem";
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,4 +1,4 @@
-From 2cf4de6d996010167423ced2f51e557dace53588 Mon Sep 17 00:00:00 2001
+From 223f10e2086757e709798bb3d5c232c416812710 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
@@ -7,7 +7,7 @@ Establishes base extension of profile systems for future edits too
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 new file mode 100644
-index 000000000..b151a13c1
+index 0000000000..b151a13c1b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 @@ -0,0 +1,280 @@
@@ -293,7 +293,7 @@ index 000000000..b151a13c1
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 new file mode 100644
-index 000000000..25836b975
+index 0000000000..25836b975b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 @@ -0,0 +1,30 @@
@@ -329,7 +329,7 @@ index 000000000..25836b975
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 new file mode 100644
-index 000000000..3bcdb8f93
+index 0000000000..3bcdb8f93f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -0,0 +1,17 @@
@@ -352,7 +352,7 @@ index 000000000..3bcdb8f93
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 new file mode 100644
-index 000000000..4b2a67423
+index 0000000000..4b2a67423f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -0,0 +1,29 @@
@@ -387,7 +387,7 @@ index 000000000..4b2a67423
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 new file mode 100644
-index 000000000..3aceb0ea8
+index 0000000000..3aceb0ea8a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 @@ -0,0 +1,11 @@
@@ -403,7 +403,7 @@ index 000000000..3aceb0ea8
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 1f6a12632..6d278a0da 100644
+index 1f6a126329..6d278a0da5 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,7 +1,10 @@
@@ -429,10 +429,10 @@ index 1f6a12632..6d278a0da 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 6b83f9769..5817e9452 100644
+index 4cf05e56fb..bf63e9ff33 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1246,7 +1246,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1240,7 +1240,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
              DispenserRegistry.init();
              DispenserRegistry.c();
              String s = "."; // PAIL?
@@ -441,8 +441,8 @@ index 6b83f9769..5817e9452 100644
              MinecraftSessionService minecraftsessionservice = yggdrasilauthenticationservice.createMinecraftSessionService();
              GameProfileRepository gameprofilerepository = yggdrasilauthenticationservice.createProfileRepository();
              UserCache usercache = new UserCache(gameprofilerepository, new File(s, MinecraftServer.b.getName()));
-@@ -1706,6 +1706,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -1700,6 +1700,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-         this.H = i;
+         this.G = i;
      }
  
 +    public final MinecraftSessionService getSessionService() { return this.getMinecraftSessionService(); } // Paper - OBFHELPER
@@ -450,7 +450,7 @@ index 6b83f9769..5817e9452 100644
          return this.minecraftSessionService;
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index b0d883d49..1d4bf64b1 100644
+index b0d883d493..1d4bf64b1b 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -43,7 +43,7 @@ public class UserCache {
@@ -486,7 +486,7 @@ index b0d883d49..1d4bf64b1 100644
  
          private UserCacheEntry(GameProfile gameprofile, Date date) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 656a21316..80f4ba11f 100644
+index f1bacaa316..40ac5a9757 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -196,6 +196,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;

Spigot-Server-Patches/0163-Shoulder-Entities-Release-API.patch

@@ -1,11 +1,11 @@
-From b86ebd4b25955c9582631781b2e6b19876a6bea5 Mon Sep 17 00:00:00 2001
+From 71e205fc8189f676cc4600851d7812d351f91db0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index cfcbd1a2e5..b8fe15f1a1 100644
+index 0974135c65..d1f01bb640 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1781,20 +1781,45 @@ public abstract class EntityHuman extends EntityLiving {
@@ -59,10 +59,10 @@ index cfcbd1a2e5..b8fe15f1a1 100644
      @Override
      public abstract boolean isSpectator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 93c8441f48..e37e08c37e 100644
+index 5cc5074a5e..e4d9300be2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -662,6 +662,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -664,6 +664,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
          getHandle().getCooldownTracker().a(CraftMagicNumbers.getItem(material), ticks);
      }
  
@@ -96,5 +96,5 @@ index 93c8441f48..e37e08c37e 100644
      public boolean discoverRecipe(NamespacedKey recipe) {
          return discoverRecipes(Arrays.asList(recipe)) != 0;
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0166-Entity-fromMobSpawner.patch

@@ -1,11 +1,11 @@
-From 8bfd88071a06c17ab2881e6fabd298099be816c1 Mon Sep 17 00:00:00 2001
+From d63672d137904d533b23538d91e2349181a48e02 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e15fd1dc72..0915dede9a 100644
+index 187441e87d..83b6bfeb43 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -184,6 +184,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -16,7 +16,7 @@ index e15fd1dc72..0915dede9a 100644
      protected int numCollisions = 0; // Paper
      public void inactiveTick() { }
      // Spigot end
-@@ -1585,6 +1586,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1634,6 +1635,10 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (this.origin != null) {
                  nbttagcompound.set("Paper.Origin", this.createList(origin.getX(), origin.getY(), origin.getZ()));
              }
@@ -27,7 +27,7 @@ index e15fd1dc72..0915dede9a 100644
              // Paper end
              return nbttagcompound;
          } catch (Throwable throwable) {
-@@ -1713,6 +1718,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -1762,6 +1767,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
              if (!originTag.isEmpty()) {
                  origin = new Location(world.getWorld(), originTag.getDoubleAt(0), originTag.getDoubleAt(1), originTag.getDoubleAt(2));
              }
@@ -37,7 +37,7 @@ index e15fd1dc72..0915dede9a 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index b3af4ba233..7d140a6f5a 100644
+index 13e62e3d7f..4bd511dd7c 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -133,6 +133,7 @@ public abstract class MobSpawnerAbstract {
@@ -64,5 +64,5 @@ index ed496d03ae..b000bc8c71 100644
      // Paper end
  }
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0169-Implement-getI18NDisplayName.patch

@@ -1,4 +1,4 @@
-From 2e64dd84f1f9bb2eb6a69cfbc6f3447305b99d51 Mon Sep 17 00:00:00 2001
+From bb223cd0e09381cf7c62fc08b25013e5790b1a82 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:59:38 -0400
 Subject: [PATCH] Implement getI18NDisplayName
@@ -8,10 +8,10 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
-index 8fe8e28aa3..295c01b281 100644
+index c0c13798f8..6012739331 100644
 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java
 +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
-@@ -44,10 +44,12 @@ public class LocaleLanguage {
+@@ -65,10 +65,12 @@ public class LocaleLanguage {
  
      }
  
@@ -48,5 +48,5 @@ index 1dc21e08db..7099eeda4e 100644
      // Paper end
  }
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0170-ProfileWhitelistVerifyEvent.patch

@@ -1,11 +1,11 @@
-From 8c5a1023a3d4569ad9de7a16bed9b9b3abb59e7b Mon Sep 17 00:00:00 2001
+From db62c709bbc0622ea837fdcd760c04366ac762a0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f169e7edcd..90fd7d96b3 100644
+index 6a77707983..a167843bfb 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -521,9 +521,9 @@ public abstract class PlayerList {
@@ -46,7 +46,7 @@ index f169e7edcd..90fd7d96b3 100644
 +    // Paper end
  
      public boolean isOp(GameProfile gameprofile) {
-         return this.operators.d(gameprofile) || this.server.b(gameprofile) && this.server.getWorldServer(DimensionManager.OVERWORLD).getWorldData().u() || this.u;
+         return this.operators.d(gameprofile) || this.server.b(gameprofile) && this.server.getWorldServer(DimensionManager.OVERWORLD).getWorldData().t() || this.u;
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0172-Ocelot-despawns-should-honor-nametags-and-leash.patch

@@ -1,14 +1,14 @@
-From dc46b1f8046fa3721f6b8c7bb5c617911c8915c9 Mon Sep 17 00:00:00 2001
+From f7877d26120925dbabe0977916bc73476426ac68 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:54:40 -0500
 Subject: [PATCH] Ocelot despawns should honor nametags and leash
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index af1ff95182..1713bead27 100644
+index f50efe782a..0f1c259595 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
-@@ -81,7 +81,7 @@ public class EntityOcelot extends EntityAnimal {
+@@ -82,7 +82,7 @@ public class EntityOcelot extends EntityAnimal {
  
      @Override
      public boolean isTypeNotPersistent(double d0) {
@@ -18,5 +18,5 @@ index af1ff95182..1713bead27 100644
  
      @Override
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0177-Use-Log4j-IOStreams-to-redirect-System.out-err-to-lo.patch

@@ -1,4 +1,4 @@
-From 644a9462b31264d07fffbbd7898fa676dd0e9cd1 Mon Sep 17 00:00:00 2001
+From e231bdeb4f428f995d8de30ae00651cef191147b Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Mon, 18 Sep 2017 12:00:03 +0200
 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
@@ -12,7 +12,7 @@ results in a separate line, even though it should not result in
 a line break. Log4j's implementation handles it correctly.
 
 diff --git a/pom.xml b/pom.xml
-index d379d33d15..80359d1bf5 100644
+index ef508bbd71..5c401a71c5 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,11 @@
@@ -28,10 +28,10 @@ index d379d33d15..80359d1bf5 100644
              <groupId>org.ow2.asm</groupId>
              <artifactId>asm</artifactId>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 37020dcba5..c2c676e3bb 100644
+index 26b35855e1..c093747bb2 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
-@@ -135,8 +135,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
+@@ -137,8 +137,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
          */
          // Paper end
  
@@ -45,5 +45,5 @@ index 37020dcba5..c2c676e3bb 100644
  
          thread.setDaemon(true);
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0183-Expose-client-protocol-version-and-virtual-host.patch

@@ -1,4 +1,4 @@
-From fae9bf2123e9e1de003d617d8df7747819290a5c Mon Sep 17 00:00:00 2001
+From 15855906cc02f96933838633a10a24733a24618a Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -111,10 +111,10 @@ index 4f008e4723..8545146fb1 100644
          return this.a;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b584432639..d4fed1a512 100644
+index d064153829..9d2a8a2da0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -182,6 +182,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -184,6 +184,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
      }
  
@@ -136,5 +136,5 @@ index b584432639..d4fed1a512 100644
      public double getEyeHeight(boolean ignorePose) {
          if (ignorePose) {
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0185-Send-attack-SoundEffects-only-to-players-who-can-see.patch

@@ -1,4 +1,4 @@
-From de1b242d8873695302a2ef6af149b7b1305971dd Mon Sep 17 00:00:00 2001
+From 492d1245c3a9cc3a18c95c4db09b6f44df606ed8 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 31 Oct 2017 03:26:18 +0100
 Subject: [PATCH] Send attack SoundEffects only to players who can see the
@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index b8fe15f1a1..ec0982b587 100644
+index d1f01bb640..3b978528ba 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -941,6 +941,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -23,7 +23,7 @@ index b8fe15f1a1..ec0982b587 100644
 +    // Paper end
 +
      public void attack(Entity entity) {
-         if (entity.br()) {
+         if (entity.bs()) {
              if (!entity.t(this)) {
 @@ -965,7 +974,7 @@ public abstract class EntityHuman extends EntityLiving {
                      int i = b0 + EnchantmentManager.b((EntityLiving) this);
@@ -40,7 +40,7 @@ index b8fe15f1a1..ec0982b587 100644
  
 -                            this.world.a((EntityHuman) null, this.locX, this.locY, this.locZ, SoundEffects.ENTITY_PLAYER_ATTACK_SWEEP, this.getSoundCategory(), 1.0F, 1.0F);
 +                            sendSoundEffect(this, this.locX, this.locY, this.locZ, SoundEffects.ENTITY_PLAYER_ATTACK_SWEEP, this.getSoundCategory(), 1.0F, 1.0F);  // Paper - send while respecting visibility
-                             this.dE();
+                             this.dF();
                          }
  
 @@ -1068,15 +1077,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -72,7 +72,7 @@ index b8fe15f1a1..ec0982b587 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 250767b94e..3d5b3892f1 100644
+index 4498a21073..ed78bba710 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -671,6 +671,10 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@@ -87,5 +87,5 @@ index 250767b94e..3d5b3892f1 100644
  
      public abstract void a(@Nullable EntityHuman entityhuman, Entity entity, SoundEffect soundeffect, SoundCategory soundcategory, float f, float f1);
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0195-Ability-to-apply-mending-to-XP-API.patch

@@ -1,4 +1,4 @@
-From fa4cb878b8a7aedf524f2f17a1357215f99f6cb7 Mon Sep 17 00:00:00 2001
+From 3891a5f730f2b9b9b85b2e10d3caf2416244d591 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index 6f64b8db3a..b6a40e22a8 100644
+index 8c658079f7..16e6d95cf1 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -241,6 +241,11 @@ public class EnchantmentManager {
@@ -26,7 +26,7 @@ index 6f64b8db3a..b6a40e22a8 100644
      public static Entry<EnumItemSlot, ItemStack> b(Enchantment enchantment, EntityLiving entityliving) {
          Map<EnumItemSlot, ItemStack> map = enchantment.a(entityliving);
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 704a48c8ea..64d71a9a2a 100644
+index 8c25695669..6a5954889e 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -251,10 +251,12 @@ public class EntityExperienceOrb extends Entity {
@@ -43,10 +43,10 @@ index 704a48c8ea..64d71a9a2a 100644
          return i * 2;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d4fed1a512..7f1138cbbf 100644
+index 9d2a8a2da0..d8ce699e3e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1054,8 +1054,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1063,8 +1063,39 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          return GameMode.getByValue(getHandle().playerInteractManager.getGameMode().getId());
      }
  
@@ -88,5 +88,5 @@ index d4fed1a512..7f1138cbbf 100644
      }
  
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0196-Make-max-squid-spawn-height-configurable.patch

@@ -1,4 +1,4 @@
-From a7ab9844e754c48ee9feb8284079ae581329f5b2 Mon Sep 17 00:00:00 2001
+From d6c58af2097797188b9223dd7ab2fb2b428a59d8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
@@ -21,19 +21,19 @@ index 2a50d6babf..c3e61bdfe3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 815844dab2..d5dff4b88c 100644
+index 338c203b33..aafb7df0c8 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
-@@ -170,7 +170,8 @@ public class EntitySquid extends EntityWaterAnimal {
+@@ -171,7 +171,8 @@ public class EntitySquid extends EntityWaterAnimal {
+     }
  
-     @Override
+     public static boolean b(EntityTypes<EntitySquid> entitytypes, GeneratorAccess generatoraccess, EnumMobSpawn enummobspawn, BlockPosition blockposition, Random random) {
-     public boolean a(GeneratorAccess generatoraccess, EnumMobSpawn enummobspawn) {
+-        return blockposition.getY() > generatoraccess.getMinecraftWorld().spigotConfig.squidSpawnRangeMin && blockposition.getY() < generatoraccess.getSeaLevel(); // Spigot
--        return this.locY > this.world.spigotConfig.squidSpawnRangeMin && this.locY < (double) generatoraccess.getSeaLevel(); // Spigot
++        final double maxHeight = generatoraccess.getMinecraftWorld().paperConfig.squidMaxSpawnHeight > 0 ? generatoraccess.getMinecraftWorld().paperConfig.squidMaxSpawnHeight : generatoraccess.getSeaLevel(); // Paper
-+        final double maxHeight = world.paperConfig.squidMaxSpawnHeight > 0 ? world.paperConfig.squidMaxSpawnHeight : world.getSeaLevel();
++        return blockposition.getY() > generatoraccess.getMinecraftWorld().spigotConfig.squidSpawnRangeMin && blockposition.getY() < maxHeight; // Spigot // Paper
-+        return this.locY > this.world.spigotConfig.squidSpawnRangeMin && this.locY < maxHeight; // Spigot // Paper
      }
  
      public void a(float f, float f1, float f2) {
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0197-PreCreatureSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 85440e9c1108aa2da61d7e8b3e9d1844b00a0b7d Mon Sep 17 00:00:00 2001
+From 5ec4e4eb79464575a464f37d17f6c282708019d9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@@ -15,16 +15,17 @@ instead and save a lot of server resources.
 See: https://github.com/PaperMC/Paper/issues/917
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 93fad14d3..55764deec 100644
+index 59bd9ccd70..6f5d8b0315 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-@@ -103,6 +103,27 @@ public abstract class MobSpawnerAbstract {
+@@ -104,6 +104,28 @@ public abstract class MobSpawnerAbstract {
-                     double d4 = j >= 2 ? nbttaglist.h(1) : (double) (blockposition.getY() + world.random.nextInt(3) - 1);
                      double d5 = j >= 3 ? nbttaglist.h(2) : (double) blockposition.getZ() + (world.random.nextDouble() - world.random.nextDouble()) * (double) this.spawnRange + 0.5D;
  
+                     if (world.c(((EntityTypes) optional.get()).a(d3, d4, d5)) && EntityPositionTypes.a((EntityTypes) optional.get(), world.getMinecraftWorld(), EnumMobSpawn.SPAWNER, new BlockPosition(d3, d4, d5), world.getRandom())) {
 +                    // Paper start
 +                    EntityTypes entityType = optional.get();
-+                    String key = entityType.getKey().getKey();
++                    String key = EntityTypes.getName(entityType).getKey();
++
 +                    org.bukkit.entity.EntityType type = org.bukkit.entity.EntityType.fromName(key);
 +                    if (type != null) {
 +                        com.destroystokyo.paper.event.entity.PreCreatureSpawnEvent event;
@@ -43,11 +44,11 @@ index 93fad14d3..55764deec 100644
 +                    }
 +                    // Paper end
 +
-                     if (world.c(((EntityTypes) optional.get()).a(d3, d4, d5))) {
                          Entity entity = EntityTypes.a(nbttagcompound, world, (entity1) -> {
                              entity1.setPositionRotation(d3, d4, d5, entity1.yaw, entity1.pitch);
+                             return entity1;
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index f4f842b86..d25c7231d 100644
+index 4aa65c1934..4458b48ee8 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -38,7 +38,7 @@ public final class SpawnerCreature {
@@ -60,7 +61,7 @@ index f4f842b86..d25c7231d 100644
  
                      while (true) {
 @@ -74,6 +74,25 @@ public final class SpawnerCreature {
-                                                 if (entitypositiontypes_surface != null && a(entitypositiontypes_surface, (IWorldReader) world, (BlockPosition) blockposition_mutableblockposition, entitytypes) && world.c(entitytypes.a((double) f, (double) k, (double) f1))) {
+                                                 if (a(entitypositiontypes_surface, (IWorldReader) world, (BlockPosition) blockposition_mutableblockposition, entitytypes) && EntityPositionTypes.a(entitytypes, world, EnumMobSpawn.NATURAL, blockposition_mutableblockposition, world.random) && world.c(entitytypes.a((double) f, (double) k, (double) f1))) {
                                                      EntityInsentient entityinsentient;
  
 +                                                    // Paper start
@@ -86,5 +87,5 @@ index f4f842b86..d25c7231d 100644
                                                          Entity entity = entitytypes.a(world);
  
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0198-PlayerNaturallySpawnCreaturesEvent.patch

@@ -1,4 +1,4 @@
-From 209546c8d53f63aff9bda7a065410f2a67700c62 Mon Sep 17 00:00:00 2001
+From 38ed795fadbf5334cbdca6de8d6e4c496ce3fa56 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:36:02 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@@ -9,10 +9,10 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index fba9f4b8a1..6c0a1eb413 100644
+index 6960e46ec6..1212f3f67d 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -764,11 +764,23 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
+@@ -755,12 +755,24 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
          chunkRange = (chunkRange > world.spigotConfig.viewDistance) ? (byte) world.spigotConfig.viewDistance : chunkRange;
          chunkRange = (chunkRange > 8) ? 8 : chunkRange;
  
@@ -20,8 +20,9 @@ index fba9f4b8a1..6c0a1eb413 100644
 +        final int finalChunkRange = chunkRange; // Paper for lambda below
 +        //double blockRange = (reducedRange) ? Math.pow(chunkRange << 4, 2) : 16384.0D; // Paper - use from event
          // Spigot end
+         long i = chunkcoordintpair.pair();
  
-         return this.playerMap.a(chunkcoordintpair.pair()).noneMatch((entityplayer) -> {
+         return !this.u.d(i) ? true : this.playerMap.a(i).noneMatch((entityplayer) -> {
 -            return !entityplayer.isSpectator() && a(chunkcoordintpair, (Entity) entityplayer) < blockRange; // Spigot
 +            // Paper start -
 +            com.destroystokyo.paper.event.entity.PlayerNaturallySpawnCreaturesEvent event;
@@ -39,5 +40,5 @@ index fba9f4b8a1..6c0a1eb413 100644
      }
  
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,4 +1,4 @@
-From 6747ff7b9cae62d7ec93763bc7a3aa881522ccac Mon Sep 17 00:00:00 2001
+From 6652b707a44fa9f349b165c09cadc2e2d8f882b3 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,24 +177,25 @@ index 0000000000..a85466bc7e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5817e94525..7e27f10790 100644
+index bf63e9ff33..f21b825719 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1,6 +1,7 @@
+@@ -1,5 +1,8 @@
  package net.minecraft.server;
  
- import co.aikar.timings.Timings;
++import co.aikar.timings.Timings;
 +import com.destroystokyo.paper.event.server.PaperServerListPingEvent;
- import com.google.common.base.Stopwatch;
++import com.google.common.base.Stopwatch;
  import com.google.common.collect.Lists;
  import com.google.common.collect.Maps;
-@@ -1046,7 +1047,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+ import com.google.gson.JsonElement;
-         if (i - this.Z >= 5000000000L) {
+@@ -1043,7 +1046,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-             this.Z = i;
+         if (i - this.Y >= 5000000000L) {
+             this.Y = i;
              this.serverPing.setPlayerSample(new ServerPing.ServerPingPlayerSample(this.getMaxPlayers(), this.getPlayerCount()));
 -            GameProfile[] agameprofile = new GameProfile[Math.min(this.getPlayerCount(), 12)];
 +            GameProfile[] agameprofile = new GameProfile[Math.min(this.getPlayerCount(), org.spigotmc.SpigotConfig.playerSample)]; // Paper
-             int j = MathHelper.nextInt(this.q, 0, this.getPlayerCount() - agameprofile.length);
+             int j = MathHelper.nextInt(this.p, 0, this.getPlayerCount() - agameprofile.length);
  
              for (int k = 0; k < agameprofile.length; ++k) {
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
@@ -259,5 +260,5 @@ index bd601333ee..6c5430ff94 100644
      }
  
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0212-Player.setPlayerProfile-API.patch

@@ -1,4 +1,4 @@
-From 0cea2bb18bd8e45e4cf93be12818899450543aea Mon Sep 17 00:00:00 2001
+From 290b3fd4259af66943157d89e26bb8002ed8fe15 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:29:48 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index cc9b265182..f4f1037b3d 100644
+index 3a01cbe014..1c73572c40 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -65,7 +65,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -48,7 +48,7 @@ index 7c3b9c0b97..d4d752ddb4 100644
                              uniqueId = i.getId();
                              // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 7f1138cbbf..e6d2a40b6a 100644
+index d8ce699e3e..28f97f9b0b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,6 +1,8 @@
@@ -60,7 +60,7 @@ index 7f1138cbbf..e6d2a40b6a 100644
  import com.google.common.base.Preconditions;
  import com.google.common.collect.ImmutableSet;
  import com.google.common.io.BaseEncoding;
-@@ -1194,8 +1196,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1203,8 +1205,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          hiddenPlayers.put(player.getUniqueId(), hidingPlugins);
  
          // Remove this player from the hidden player's EntityTrackerEntry
@@ -75,7 +75,7 @@ index 7f1138cbbf..e6d2a40b6a 100644
          PlayerChunkMap.EntityTracker entry = tracker.trackedEntities.get(other.getId());
          if (entry != null) {
              entry.clear(getHandle());
-@@ -1236,8 +1243,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1245,8 +1252,13 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
          }
          hiddenPlayers.remove(player.getUniqueId());
  
@@ -90,7 +90,7 @@ index 7f1138cbbf..e6d2a40b6a 100644
  
          getHandle().playerConnection.sendPacket(new PacketPlayOutPlayerInfo(PacketPlayOutPlayerInfo.EnumPlayerInfoAction.ADD_PLAYER, other));
  
-@@ -1246,6 +1258,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1255,6 +1267,46 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              entry.updatePlayer(getHandle());
          }
      }
@@ -138,5 +138,5 @@ index 7f1138cbbf..e6d2a40b6a 100644
      public void removeDisconnectingPlayer(Player player) {
          hiddenPlayers.remove(player.getUniqueId());
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0218-Flag-to-disable-the-channel-limit.patch

@@ -1,4 +1,4 @@
-From 81be9a41aa804f639e0f8e065ef62ab7cc595dbd Mon Sep 17 00:00:00 2001
+From bcd066472315825b03e4b1c71f701ceff331e79e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 31 Mar 2018 17:04:26 +0100
 Subject: [PATCH] Flag to disable the channel limit
@@ -9,10 +9,10 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e6d2a40b6a..b49c3029fc 100644
+index 28f97f9b0b..9ff2281c15 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -137,6 +137,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -139,6 +139,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      // Paper start
      private org.bukkit.event.player.PlayerResourcePackStatusEvent.Status resourcePackStatus;
      private String resourcePackHash;
@@ -20,7 +20,7 @@ index e6d2a40b6a..b49c3029fc 100644
      // Paper end
  
      public CraftPlayer(CraftServer server, EntityPlayer entity) {
-@@ -1460,7 +1461,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1469,7 +1470,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
      }
  
      public void addChannel(String channel) {
@@ -30,5 +30,5 @@ index e6d2a40b6a..b49c3029fc 100644
          if (channels.add(channel)) {
              server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0219-Add-method-to-open-already-placed-sign.patch

@@ -1,14 +1,14 @@
-From c381ed5d5e1001fc73bad1d0ead10ec81ce7848e Mon Sep 17 00:00:00 2001
+From 46f626578c1dca38ae56b655bc58d65623ba6be8 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:29:37 +0300
 Subject: [PATCH] Add method to open already placed sign
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index e37e08c37e..300826a0f2 100644
+index e4d9300be2..6acb15043e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -761,4 +761,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -763,4 +763,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
              entity.remove();
          }
      }
@@ -27,5 +27,5 @@ index e37e08c37e..300826a0f2 100644
 +    // Paper end
  }
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0222-EndermanEscapeEvent.patch

@@ -1,4 +1,4 @@
-From 6b1dab7ac9e67f2f82456b264ad7f1fcb8d4bff9 Mon Sep 17 00:00:00 2001
+From 6bdfb8ccadb49bf6366901ad45a60a688ab58b32 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:15:55 -0400
 Subject: [PATCH] EndermanEscapeEvent
@@ -8,7 +8,7 @@ Fires an event anytime an enderman intends to teleport away from the player
 You may cancel this, enabling ranged attacks to damage the enderman for example.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 9d7c16dbfc..93f66181bf 100644
+index 0fb7793bdb..db351a2494 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -34,7 +34,7 @@ index 9d7c16dbfc..93f66181bf 100644
          if (!super.setGoalTarget(entityliving, reason, fireEvent)) {
 @@ -174,7 +181,7 @@ public class EntityEnderman extends EntityMonster {
          if (this.world.J() && this.ticksLived >= this.bC + 600) {
-             float f = this.aE();
+             float f = this.aF();
  
 -            if (f > 0.5F && this.world.f(new BlockPosition(this)) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F) {
 +            if (f > 0.5F && this.world.f(new BlockPosition(this)) && this.random.nextFloat() * 30.0F < (f - 0.4F) * 2.0F && this.tryEscape(EndermanEscapeEvent.Reason.RUNAWAY)) { // Paper
@@ -81,5 +81,5 @@ index 9d7c16dbfc..93f66181bf 100644
                          }
  
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,4 +1,4 @@
-From bfe328d4c5d86a9718b359e5b277e8790bb18f87 Mon Sep 17 00:00:00 2001
+From 280ecc1a95cda2a1b64c508670b900f902527210 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 ebd1ff1d50..5172ff53d3 100644
+index 1fddc5fda2..4ebc9b50fb 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 ebd1ff1d50..5172ff53d3 100644
      boolean tickingEntities;
      private final MinecraftServer server;
      private final WorldNBTStorage dataManager;
-@@ -1323,12 +1323,17 @@ public class WorldServer extends World {
+@@ -1321,12 +1321,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) {
@@ -43,10 +43,10 @@ index ebd1ff1d50..5172ff53d3 100644
  
              if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 9f449d1d3b..1323358b2e 100644
+index 47a54102a1..284699cfe9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -2039,11 +2039,17 @@ public class CraftWorld implements World {
+@@ -2075,11 +2075,17 @@ public class CraftWorld implements World {
  
      @Override
      public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {

Spigot-Server-Patches/0229-Allow-spawning-Item-entities-with-World.spawnEntity.patch

@@ -1,4 +1,4 @@
-From 163fbf0ca0b8ea71f9b674bd0e63ae76e88f12b9 Mon Sep 17 00:00:00 2001
+From 0979593c9d81786c5bcfe1c41ee65385280e719b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Jun 2018 20:39:20 -0400
 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@@ -8,10 +8,10 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1323358b2e..11d64203f2 100644
+index 284699cfe9..3ce366ab80 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1306,6 +1306,10 @@ public class CraftWorld implements World {
+@@ -1305,6 +1305,10 @@ public class CraftWorld implements World {
          if (Boat.class.isAssignableFrom(clazz)) {
              entity = new EntityBoat(world, x, y, z);
              entity.setPositionRotation(x, y, z, yaw, pitch);

Spigot-Server-Patches/0238-Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch

@@ -1,4 +1,4 @@
-From e3e6332d5ba432794e0d4197dc20270135c22c5d Mon Sep 17 00:00:00 2001
+From e54cc15c485c0393d77dc5537e748586b42ddc8b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Jun 2018 16:23:38 -0400
 Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors
@@ -6,10 +6,10 @@ Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors
 This code was causing NPE's in saving player data, potentially related to reloads.
 
 diff --git a/src/main/java/net/minecraft/server/RecipeBookServer.java b/src/main/java/net/minecraft/server/RecipeBookServer.java
-index 440e8f1342..091c4abbd1 100644
+index 121e1fd538..0e66bdda8c 100644
 --- a/src/main/java/net/minecraft/server/RecipeBookServer.java
 +++ b/src/main/java/net/minecraft/server/RecipeBookServer.java
-@@ -78,6 +78,10 @@ public class RecipeBookServer extends RecipeBook {
+@@ -79,6 +79,10 @@ public class RecipeBookServer extends RecipeBook {
  
          while (iterator.hasNext()) {
              MinecraftKey minecraftkey = (MinecraftKey) iterator.next();
@@ -20,7 +20,7 @@ index 440e8f1342..091c4abbd1 100644
  
              nbttaglist.add(new NBTTagString(minecraftkey.toString()));
          }
-@@ -88,6 +92,10 @@ public class RecipeBookServer extends RecipeBook {
+@@ -89,6 +93,10 @@ public class RecipeBookServer extends RecipeBook {
  
          while (iterator1.hasNext()) {
              MinecraftKey minecraftkey1 = (MinecraftKey) iterator1.next();
@@ -32,5 +32,5 @@ index 440e8f1342..091c4abbd1 100644
              nbttaglist1.add(new NBTTagString(minecraftkey1.toString()));
          }
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0243-Expand-Explosions-API.patch

@@ -1,4 +1,4 @@
-From 2b753cf3f3e6f495c2a3301e6ae1d468e1658c9a Mon Sep 17 00:00:00 2001
+From 6d7cf0c26050dcdd1d09bfc922a86afb81230752 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Jun 2018 23:17:24 -0400
 Subject: [PATCH] Expand Explosions API
@@ -6,10 +6,10 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 11ab222c54..10c91699c1 100644
+index 3ce366ab80..2bb01dd9c2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -753,6 +753,11 @@ public class CraftWorld implements World {
+@@ -752,6 +752,11 @@ public class CraftWorld implements World {
      public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks) {
          return !world.createExplosion(null, x, y, z, power, setFire, breakBlocks ? Explosion.Effect.BREAK : Explosion.Effect.NONE).wasCanceled;
      }
@@ -22,5 +22,5 @@ index 11ab222c54..10c91699c1 100644
      @Override
      public boolean createExplosion(Location loc, float power) {
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0244-LivingEntity-Hand-Raised-Item-Use-API.patch

@@ -1,4 +1,4 @@
-From c4cb28da63f884c61844903fde1d1c60c12fcdc1 Mon Sep 17 00:00:00 2001
+From b109ad1fa20944732d072622bc680c04ca9c0168 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:21:28 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 90099c814a..d2dddf1c72 100644
+index ca266029e4..1500e43eee 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -109,7 +109,7 @@ public abstract class EntityLiving extends Entity {
@@ -22,14 +22,14 @@ index 90099c814a..d2dddf1c72 100644
          return this.activeItem;
      }
  
-+    public int getItemUseRemainingTime() { return dm(); } // Paper - OBFHELPER
++    public int getItemUseRemainingTime() { return dn(); } // Paper - OBFHELPER
-     public int dm() {
+     public int dn() {
          return this.bo;
      }
  
-+    public int getHandRaisedTime() { return dn(); } // Paper - OBFHELPER
++    public int getHandRaisedTime() { return do_(); } // Paper - OBFHELPER
-     public int dn() {
+     public int do_() {
-         return this.isHandRaised() ? this.activeItem.k() - this.dm() : 0;
+         return this.isHandRaised() ? this.activeItem.k() - this.dn() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 index 513b3fac7f..8dea7d36b6 100644
@@ -62,5 +62,5 @@ index 513b3fac7f..8dea7d36b6 100644
      // Paper end
  }
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,14 +1,14 @@
-From 321b3eec743de39fea928a5d2293156fa470731d Mon Sep 17 00:00:00 2001
+From a6ea1dabbe73417ebaf2ed3a87fb21b5305c6aa3 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 4153dfe488..eef3b46e40 100644
+index 2bb01dd9c2..3dd9bec548 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1109,6 +1109,15 @@ public class CraftWorld implements World {
+@@ -1108,6 +1108,15 @@ public class CraftWorld implements World {
          return list;
      }
  

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

@@ -1,4 +1,4 @@
-From 0e039ed6ae2fe9550d288e94427b129bb48d12bb Mon Sep 17 00:00:00 2001
+From 58ba763c5947745c305f8c75eb447fd464f04162 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
@@ -7,11 +7,11 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index fc25b3c749..e316e2af7d 100644
+index ed1ba110c2..8b0094d1d3 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -149,7 +149,7 @@ public abstract class EntityHuman extends EntityLiving {
-         this.dA();
+         this.dB();
          super.tick();
          if (!this.world.isClientSide && this.activeContainer != null && !this.activeContainer.canUse(this)) {
 -            this.closeInventory();
@@ -34,10 +34,10 @@ index fc25b3c749..e316e2af7d 100644
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 14ea4641dc..7519827a88 100644
+index 18c71640f5..2ce6063221 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
-@@ -360,7 +360,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -362,7 +362,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
          // Paper end
          if (!this.world.isClientSide && !this.activeContainer.canUse(this)) {
@@ -46,7 +46,7 @@ index 14ea4641dc..7519827a88 100644
              this.activeContainer = this.defaultContainer;
          }
  
-@@ -534,7 +534,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -536,7 +536,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
          // SPIGOT-943 - only call if they have an inventory open
          if (this.activeContainer != this.defaultContainer) {
@@ -55,7 +55,7 @@ index 14ea4641dc..7519827a88 100644
          }
  
          String deathMessage = event.getDeathMessage();
-@@ -1056,7 +1056,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1058,7 +1058,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
              return OptionalInt.empty();
          } else {
              if (this.activeContainer != this.defaultContainer) {
@@ -64,7 +64,7 @@ index 14ea4641dc..7519827a88 100644
              }
  
              this.nextContainerCounter();
-@@ -1109,7 +1109,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1111,7 +1111,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
          }
          // CraftBukkit end
          if (this.activeContainer != this.defaultContainer) {
@@ -73,7 +73,7 @@ index 14ea4641dc..7519827a88 100644
          }
  
          // this.nextContainerCounter(); // CraftBukkit - moved up
-@@ -1173,7 +1173,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
+@@ -1175,7 +1175,12 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
  
      @Override
      public void closeInventory() {
@@ -88,7 +88,7 @@ index 14ea4641dc..7519827a88 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 498483930e..088873515c 100644
+index 7ee0a88234..13f406f507 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2056,7 +2056,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -101,7 +101,7 @@ index 498483930e..088873515c 100644
          this.player.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 90fd7d96b3..132a2ceb78 100644
+index a167843bfb..9e5cd22d7d 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -402,7 +402,7 @@ public abstract class PlayerList {
@@ -114,10 +114,10 @@ index 90fd7d96b3..132a2ceb78 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 5172ff53d3..139168291a 100644
+index 4ebc9b50fb..af947df472 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -981,7 +981,7 @@ public class WorldServer extends World {
+@@ -979,7 +979,7 @@ public class WorldServer extends World {
                  {
                      if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
                      {
@@ -126,7 +126,7 @@ index 5172ff53d3..139168291a 100644
                      }
                  }
              }
-@@ -1004,7 +1004,7 @@ public class WorldServer extends World {
+@@ -1002,7 +1002,7 @@ public class WorldServer extends World {
                      {
                          if ( h instanceof org.bukkit.craftbukkit.entity.CraftHumanEntity )
                          {
@@ -136,10 +136,10 @@ index 5172ff53d3..139168291a 100644
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 300826a0f2..4a941801b6 100644
+index 6acb15043e..cccc1be137 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-@@ -616,8 +616,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
+@@ -618,8 +618,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
  
      @Override
      public void closeInventory() {
@@ -155,10 +155,10 @@ index 300826a0f2..4a941801b6 100644
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index b49c3029fc..a22bb25ff7 100644
+index 9ff2281c15..36f6766a68 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -772,7 +772,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -781,7 +781,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
  
          // Close any foreign inventory
          if (getHandle().activeContainer != getHandle().defaultContainer) {

Spigot-Server-Patches/0252-Don-t-change-the-Entity-Random-seed-for-squids.patch

@@ -1,14 +1,14 @@
-From 798dadbf3dc752bca7033ab4aef3655df0f5460a Mon Sep 17 00:00:00 2001
+From 087c2d8c136a6e67b44483c56e4d75961a78e807 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:05:00 -0400
 Subject: [PATCH] Don't change the Entity Random seed for squids
 
 
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index d5dff4b88c..77c0ed42f4 100644
+index aafb7df0c8..bcea73a40b 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
-@@ -19,7 +19,7 @@ public class EntitySquid extends EntityWaterAnimal {
+@@ -21,7 +21,7 @@ public class EntitySquid extends EntityWaterAnimal {
  
      public EntitySquid(EntityTypes<? extends EntitySquid> entitytypes, World world) {
          super(entitytypes, world);
@@ -18,5 +18,5 @@ index d5dff4b88c..77c0ed42f4 100644
      }
  
 -- 
-2.21.0
+2.22.0
 

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

@@ -1,4 +1,4 @@
-From 81effc0fed2c976b2262086477b9693ed275de78 Mon Sep 17 00:00:00 2001
+From b2bae68a9c895972449ba774a74171469be8e13b 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 139168291a..8cffbabfb6 100644
+index af947df472..4efc310d93 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -966,7 +966,8 @@ public class WorldServer extends World {
+@@ -964,7 +964,8 @@ public class WorldServer extends World {
          if (entity1 == null) {
              return false;
          } else {
@@ -22,5 +22,5 @@ index 139168291a..8cffbabfb6 100644
          }
      }
 -- 
-2.21.0
+2.22.0
 

Spigot-Server-Patches/0256-add-more-information-to-Entity.toString.patch

@@ -1,4 +1,4 @@
-From d7c0f2fe52acd86d792d7f05e34a217d9694fc3d Mon Sep 17 00:00:00 2001
+From 93ae9c7de466e57d10430a20223b30b7ac1d350b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:13:28 -0400
 Subject: [PATCH] add more information to Entity.toString()
@@ -6,10 +6,10 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0915dede9a..ddfa88bac5 100644
+index 83b6bfeb43..bd3e610786 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
-@@ -2442,7 +2442,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
+@@ -2491,7 +2491,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
      }
  
      public String toString() {
@@ -19,5 +19,5 @@ index 0915dede9a..ddfa88bac5 100644
  
      public boolean isInvulnerable(DamageSource damagesource) {
 -- 
-2.21.0
+2.22.0