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

Developers!: You will need to clean up your work/Minecraft/1.13.2 folder
for this

Also, restore a patch that was dropped in the last upstream

Bukkit Changes:
279eeab3 Fix command description not being set
96e2bb18 Remove debug print from SyntheticEventTest

CraftBukkit Changes:
d3ed1516 Fix dangerously threaded beacons
217a293d Don't relocate joptsimple to allow --help to work.
1be05a21 Prepare for imminent Java 12 release
a49270b2 Mappings Update
5259d80c SPIGOT-4669: Fix PlayerTeleportEvent coordinates for relative teleports

Spigot Changes:
e6eb36f2 Rebuild patches

Spigot-API-Patches/0110-Add-getNearbyXXX-methods-to-Location.patch

@@ -0,0 +1,276 @@
+From 3d1f2e17aa510ecd93069a5adc6ad19795c73797 Mon Sep 17 00:00:00 2001
+From: BillyGalbreath <Blake.Galbreath@GMail.com>
+Date: Mon, 18 Jun 2018 00:41:46 -0500
+Subject: [PATCH] Add "getNearbyXXX" methods to Location
+
+
+diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
+index 3387fb477..768af6b15 100644
+--- a/src/main/java/org/bukkit/Location.java
++++ b/src/main/java/org/bukkit/Location.java
+@@ -10,6 +10,15 @@ import org.bukkit.util.Vector;
+ import org.jetbrains.annotations.NotNull;
+ import org.jetbrains.annotations.Nullable;
+ 
++// Paper start
++import java.util.Collection;
++import java.util.Collections;
++import java.util.function.Predicate;
++import org.bukkit.entity.Entity;
++import org.bukkit.entity.LivingEntity;
++import org.bukkit.entity.Player;
++// Paper end
++
+ /**
+  * Represents a 3-dimensional position in a world.
+  * <br>
+@@ -531,6 +540,246 @@ public class Location implements Cloneable, ConfigurationSerializable {
+         centerLoc.setZ(getBlockZ() + 0.5);
+         return centerLoc;
+     }
++
++    /**
++     * Returns a list of entities within a bounding box centered around a Location.
++     *
++     * Some implementations may impose artificial restrictions on the size of the search bounding box.
++     *
++     * @param x 1/2 the size of the box along x axis
++     * @param y 1/2 the size of the box along y axis
++     * @param z 1/2 the size of the box along z axis
++     * @return the collection of entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<Entity> getNearbyEntities(double x, double y, double z) {
++        if (world == null) {
++            throw new IllegalArgumentException("Location has no world");
++        }
++        return world.getNearbyEntities(this, x, y, z);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param radius X Radius
++     * @return the collection of entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<LivingEntity> getNearbyLivingEntities(double radius) {
++        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, radius, radius, radius);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xzRadius X/Z Radius
++     * @param yRadius Y Radius
++     * @return the collection of living entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<LivingEntity> getNearbyLivingEntities(double xzRadius, double yRadius) {
++        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, xzRadius, yRadius, xzRadius);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xRadius X Radius
++     * @param yRadius Y Radius
++     * @param zRadius Z radius
++     * @return the collection of living entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<LivingEntity> getNearbyLivingEntities(double xRadius, double yRadius, double zRadius) {
++        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, xRadius, yRadius, zRadius);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param radius Radius
++     * @param predicate a predicate used to filter results
++     * @return the collection of living entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<LivingEntity> getNearbyLivingEntities(double radius, @Nullable Predicate<LivingEntity> predicate) {
++        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, radius, radius, radius, predicate);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xzRadius X/Z Radius
++     * @param yRadius Y Radius
++     * @param predicate a predicate used to filter results
++     * @return the collection of living entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<LivingEntity> getNearbyLivingEntities(double xzRadius, double yRadius, @Nullable Predicate<LivingEntity> predicate) {
++        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, xzRadius, yRadius, xzRadius, predicate);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xRadius X Radius
++     * @param yRadius Y Radius
++     * @param zRadius Z radius
++     * @param predicate a predicate used to filter results
++     * @return the collection of living entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<LivingEntity> getNearbyLivingEntities(double xRadius, double yRadius, double zRadius, @Nullable Predicate<LivingEntity> predicate) {
++        return getNearbyEntitiesByType(org.bukkit.entity.LivingEntity.class, xRadius, yRadius, zRadius, predicate);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param radius X/Y/Z Radius
++     * @return the collection of players near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<Player> getNearbyPlayers(double radius) {
++        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, radius, radius, radius);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xzRadius X/Z Radius
++     * @param yRadius Y Radius
++     * @return the collection of players near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<Player> getNearbyPlayers(double xzRadius, double yRadius) {
++        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, xzRadius, yRadius, xzRadius);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xRadius X Radius
++     * @param yRadius Y Radius
++     * @param zRadius Z Radius
++     * @return the collection of players near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<Player> getNearbyPlayers(double xRadius, double yRadius, double zRadius) {
++        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, xRadius, yRadius, zRadius);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param radius X/Y/Z Radius
++     * @param predicate a predicate used to filter results
++     * @return the collection of players near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<Player> getNearbyPlayers(double radius, @Nullable Predicate<Player> predicate) {
++        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, radius, radius, radius, predicate);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xzRadius X/Z Radius
++     * @param yRadius Y Radius
++     * @param predicate a predicate used to filter results
++     * @return the collection of players near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<Player> getNearbyPlayers(double xzRadius, double yRadius, @Nullable Predicate<Player> predicate) {
++        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, xzRadius, yRadius, xzRadius, predicate);
++    }
++
++    /**
++     * Gets nearby players within the specified radius (bounding box)
++     * @param xRadius X Radius
++     * @param yRadius Y Radius
++     * @param zRadius Z Radius
++     * @param predicate a predicate used to filter results
++     * @return the collection of players near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public Collection<Player> getNearbyPlayers(double xRadius, double yRadius, double zRadius, @Nullable Predicate<Player> predicate) {
++        return getNearbyEntitiesByType(org.bukkit.entity.Player.class, xRadius, yRadius, zRadius, predicate);
++    }
++
++    /**
++     * Gets all nearby entities of the specified type, within the specified radius (bounding box)
++     * @param clazz Type to filter by
++     * @param radius X/Y/Z radius to search within
++     * @param <T> the entity type
++     * @return the collection of entities of type clazz near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, double radius) {
++        return getNearbyEntitiesByType(clazz, radius, radius, radius, null);
++    }
++
++    /**
++     * Gets all nearby entities of the specified type, within the specified radius, with x and x radius matching (bounding box)
++     * @param clazz Type to filter by
++     * @param xzRadius X/Z radius to search within
++     * @param yRadius Y radius to search within
++     * @param <T> the entity type
++     * @return the collection of entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, double xzRadius, double yRadius) {
++        return getNearbyEntitiesByType(clazz, xzRadius, yRadius, xzRadius, null);
++    }
++
++    /**
++     * Gets all nearby entities of the specified type, within the specified radius (bounding box)
++     * @param clazz Type to filter by
++     * @param xRadius X Radius
++     * @param yRadius Y Radius
++     * @param zRadius Z Radius
++     * @param <T> the entity type
++     * @return the collection of entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, double xRadius, double yRadius, double zRadius) {
++        return getNearbyEntitiesByType(clazz, xRadius, yRadius, zRadius, null);
++    }
++
++    /**
++     * Gets all nearby entities of the specified type, within the specified radius (bounding box)
++     * @param clazz Type to filter by
++     * @param radius X/Y/Z radius to search within
++     * @param predicate a predicate used to filter results
++     * @param <T> the entity type
++     * @return the collection of entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, double radius, @Nullable Predicate<T> predicate) {
++        return getNearbyEntitiesByType(clazz, radius, radius, radius, predicate);
++    }
++
++    /**
++     * Gets all nearby entities of the specified type, within the specified radius, with x and x radius matching (bounding box)
++     * @param clazz Type to filter by
++     * @param xzRadius X/Z radius to search within
++     * @param yRadius Y radius to search within
++     * @param predicate a predicate used to filter results
++     * @param <T> the entity type
++     * @return the collection of entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends T> clazz, double xzRadius, double yRadius, @Nullable Predicate<T> predicate) {
++        return getNearbyEntitiesByType(clazz, xzRadius, yRadius, xzRadius, predicate);
++    }
++
++    /**
++     * Gets all nearby entities of the specified type, within the specified radius (bounding box)
++     * @param clazz Type to filter by
++     * @param xRadius X Radius
++     * @param yRadius Y Radius
++     * @param zRadius Z Radius
++     * @param predicate a predicate used to filter results
++     * @param <T> the entity type
++     * @return the collection of entities near location. This will always be a non-null collection.
++     */
++    @NotNull
++    public <T extends Entity> Collection<T> getNearbyEntitiesByType(@Nullable Class<? extends Entity> clazz, double xRadius, double yRadius, double zRadius, @Nullable Predicate<T> predicate) {
++        if (world == null) {
++            throw new IllegalArgumentException("Location has no world");
++        }
++        return world.getNearbyEntitiesByType(clazz, this, xRadius, yRadius, zRadius, predicate);
++    }
+     // Paper end
+     @Override
+     public boolean equals(Object obj) {
+-- 
+2.21.0
+

Spigot-API-Patches/0111-PlayerReadyArrowEvent.patch

@@ -1,4 +1,4 @@
-From 7d9404735f62f21ff8abdfd04ff311e83f8f4450 Mon Sep 17 00:00:00 2001
+From 3cda6a60572fc259cad45a8139459d64f5e612de Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:09:27 -0400
 Subject: [PATCH] PlayerReadyArrowEvent

Spigot-API-Patches/0112-Add-EntityKnockbackByEntityEvent.patch

@@ -1,4 +1,4 @@
-From acf227fce14d905b08ae26e7dc84a1b5b1d058ce Mon Sep 17 00:00:00 2001
+From e511b78eb2bf54d781d89bcfb556bf3c152242ac Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:40:39 +0200
 Subject: [PATCH] Add EntityKnockbackByEntityEvent

Spigot-API-Patches/0113-Expand-Explosions-API.patch

@@ -1,4 +1,4 @@
-From 131511b623888266c1f263c0a85cd91ab890dff9 Mon Sep 17 00:00:00 2001
+From 9724f0d2d9d912f2d6c523950ddb5257b4e793df Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:24:42 -0500
 Subject: [PATCH] Expand Explosions API
@@ -6,7 +6,7 @@ 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/Location.java b/src/main/java/org/bukkit/Location.java
-index 3387fb477..56be7e5fa 100644
+index 768af6b15..e57e22a21 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -5,6 +5,7 @@ import java.util.Map;
@@ -17,11 +17,10 @@ index 3387fb477..56be7e5fa 100644
  import org.bukkit.util.NumberConversions;
  import org.bukkit.util.Vector;
  import org.jetbrains.annotations.NotNull;
-@@ -531,6 +532,87 @@ public class Location implements Cloneable, ConfigurationSerializable {
-         centerLoc.setZ(getBlockZ() + 0.5);
+@@ -541,6 +542,87 @@ public class Location implements Cloneable, ConfigurationSerializable {
          return centerLoc;
      }
-+
+ 
 +    /**
 +     * Creates explosion at this location with given power
 +     *
@@ -102,9 +101,10 @@ index 3387fb477..56be7e5fa 100644
 +    public boolean createExplosion(@NotNull Entity source, float power, boolean setFire, boolean breakBlocks) {
 +        return world.createExplosion(source, source.getLocation(), power, setFire, breakBlocks);
 +    }
-     // Paper end
-     @Override
-     public boolean equals(Object obj) {
++
+     /**
+      * Returns a list of entities within a bounding box centered around a Location.
+      *
 diff --git a/src/main/java/org/bukkit/World.java b/src/main/java/org/bukkit/World.java
 index bec405feb..dcc47cde5 100644
 --- a/src/main/java/org/bukkit/World.java

Spigot-API-Patches/0114-ItemStack-API-additions-for-quantity-flags-lore.patch

@@ -1,4 +1,4 @@
-From 639b480d0adabe542928fc67eb429075a4165e3d Mon Sep 17 00:00:00 2001
+From 4d3cc2c3c2ad606f01cea7d7be635e7ef1dd9e4a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 22 Jun 2018 22:59:18 -0400
 Subject: [PATCH] ItemStack API additions for quantity/flags/lore

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

@@ -1,4 +1,4 @@
-From 73b751f99086d330a0ae7ee23ef86bc7285ce418 Mon Sep 17 00:00:00 2001
+From f2d5cff8c7433166cab3ee3e4558b43f7ac9ded1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:19:19 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API

Spigot-API-Patches/0116-RangedEntity-API.patch

@@ -1,4 +1,4 @@
-From 1714ba00b49694e8134e075d1efcc2258213de83 Mon Sep 17 00:00:00 2001
+From 4edc97bf2dd769c484114310a58e1588666e9a12 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 26 Jun 2018 21:34:40 -0400
 Subject: [PATCH] RangedEntity API

Spigot-API-Patches/0117-Add-World.getEntity-UUID-API.patch

@@ -1,4 +1,4 @@
-From 19a954d1f19d9c3d5211d42c13b11991e61f5359 Mon Sep 17 00:00:00 2001
+From 99845fa0f02668b5e2832bf55b82ad4ac15a7fe0 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:07:16 +0200
 Subject: [PATCH] Add World.getEntity(UUID) API

Spigot-API-Patches/0118-InventoryCloseEvent-Reason-API.patch

@@ -1,4 +1,4 @@
-From 67edac3ee5ed7a4ccc201a7fa1ce0380146edc36 Mon Sep 17 00:00:00 2001
+From 6e0d5f987f21ccf9cb93bb8fafaece4a7e066736 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:52:52 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API

Spigot-API-Patches/0119-Entity-getChunk-API.patch

@@ -1,4 +1,4 @@
-From d25016411d092dd36d7e807178a41c8234563559 Mon Sep 17 00:00:00 2001
+From dc0c46f1dc30775f7790fca15bfcf4ec99f40fc2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:25:48 -0400
 Subject: [PATCH] Entity#getChunk API

Spigot-API-Patches/0120-Add-an-asterisk-to-legacy-API-plugins.patch

@@ -1,4 +1,4 @@
-From 839637a0c0acddcbe5b6089b22ca43c304297616 Mon Sep 17 00:00:00 2001
+From 607c463ca170254672f70fd10b81157db6b8b114 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 19 Jul 2018 15:07:02 -0500
 Subject: [PATCH] Add an asterisk to legacy API plugins

Spigot-API-Patches/0121-EnderDragon-Events.patch

@@ -1,4 +1,4 @@
-From 3277130260cb38dff43dc2bd7729a7853200b224 Mon Sep 17 00:00:00 2001
+From ca66c23763bf5a5e99d61b42651f0070e61b931d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:51:05 -0500
 Subject: [PATCH] EnderDragon Events

Spigot-API-Patches/0122-PlayerLaunchProjectileEvent.patch

@@ -1,4 +1,4 @@
-From 41a26a4f7bcee9d007e63faf6b8eddcea3ddb64d Mon Sep 17 00:00:00 2001
+From 6739996e04cca7984ebc73aedb8b09594575bee3 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 03:10:50 -0500
 Subject: [PATCH] PlayerLaunchProjectileEvent

Spigot-API-Patches/0123-PlayerElytraBoostEvent.patch

@@ -1,4 +1,4 @@
-From 512606bd2ea928ab0c900d85440f8107a17fa26f Mon Sep 17 00:00:00 2001
+From e499534f205a08bf1a17dcde59e8b0339d4c1b27 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:59:53 -0500
 Subject: [PATCH] PlayerElytraBoostEvent

Spigot-API-Patches/0124-EntityTransformedEvent.patch

@@ -1,4 +1,4 @@
-From 5b2eff30f6fc1cf8f9794b1599d1d92eb76928d6 Mon Sep 17 00:00:00 2001
+From 7d3567b6c8679fa401dd7a9a51f1d538b956e539 Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:28:53 -0400
 Subject: [PATCH] EntityTransformedEvent

Spigot-API-Patches/0125-Allow-disabling-armour-stand-ticking.patch

@@ -1,4 +1,4 @@
-From 0a6c99111a7f7d1073d78c96d66f43c7505ccc83 Mon Sep 17 00:00:00 2001
+From 33a1ab867848b574a4304c81f15f9d352c2b60cc Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:03 -0700
 Subject: [PATCH] Allow disabling armour stand ticking

Spigot-API-Patches/0126-SkeletonHorse-Additions.patch

@@ -1,4 +1,4 @@
-From d430d9a48360b597f8c3ce6acd840c1f3cc04222 Mon Sep 17 00:00:00 2001
+From ea94db0d6ee4a6a60472c9445d53004b075f60ad Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 27 Jul 2018 22:36:17 -0500
 Subject: [PATCH] SkeletonHorse Additions

Spigot-API-Patches/0127-Expand-Location-Manipulation-API.patch

@@ -1,4 +1,4 @@
-From d21ab857b2c8d97c44dd5cacab462cbb0f1ac3a8 Mon Sep 17 00:00:00 2001
+From 82398c9e4afd78705fc7d325811865fc13522765 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 25 Jul 2018 01:36:07 -0400
 Subject: [PATCH] Expand Location Manipulation API
@@ -6,10 +6,10 @@ Subject: [PATCH] Expand Location Manipulation API
 Adds set(x, y, z), add(base, x, y, z), subtract(base, x, y, z);
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index 56be7e5fa..d38f15142 100644
+index e57e22a21..84b7d93cf 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
-@@ -510,6 +510,54 @@ public class Location implements Cloneable, ConfigurationSerializable {
+@@ -519,6 +519,54 @@ public class Location implements Cloneable, ConfigurationSerializable {
      public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
  
      // Paper start

Spigot-API-Patches/0128-Expand-ArmorStand-API.patch

@@ -1,4 +1,4 @@
-From 468efde93189317e2ae14ff0990e974b6b733f92 Mon Sep 17 00:00:00 2001
+From 84ef806009cf85bcfd9231c9f87535f98dee2d74 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Thu, 26 Jul 2018 02:22:44 -0400
 Subject: [PATCH] Expand ArmorStand API

Spigot-API-Patches/0129-AnvilDamageEvent.patch

@@ -1,4 +1,4 @@
-From 8636d3804c388b59ab54bf2274e1db7c6ae2b578 Mon Sep 17 00:00:00 2001
+From ab42858dbd563351bcf17054a6bb46b72892a821 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 20 Jul 2018 23:36:55 -0500
 Subject: [PATCH] AnvilDamageEvent

Spigot-API-Patches/0130-Remove-deadlock-risk-in-firing-async-events.patch

@@ -1,4 +1,4 @@
-From 195b69c9c15d04fa20cddb7bff3f4e1e0e883389 Mon Sep 17 00:00:00 2001
+From 0c86016a1fb9b9fe7f97b02ce776db7f308c5381 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 00:32:05 -0400
 Subject: [PATCH] Remove deadlock risk in firing async events

Spigot-API-Patches/0131-Add-hand-to-bucket-events.patch

@@ -1,4 +1,4 @@
-From 9e361e0c92767cb7d2ad6bb92c87aa209063aaa6 Mon Sep 17 00:00:00 2001
+From b1f618ac17c88f9368f8946b906791dc9d62d62d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:20 -0500
 Subject: [PATCH] Add hand to bucket events

Spigot-API-Patches/0132-Add-TNTPrimeEvent.patch

@@ -1,4 +1,4 @@
-From b92f5c6e30580f47d938aa5e66fa862eb7d84a76 Mon Sep 17 00:00:00 2001
+From 45165a47c5ca5524f6990174947c219226c1aa90 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 15 Jul 2018 22:17:55 +0300
 Subject: [PATCH] Add TNTPrimeEvent

Spigot-API-Patches/0133-Provide-Chunk-Coordinates-as-a-Long-API.patch

@@ -1,4 +1,4 @@
-From 4b32b217a7ca97b0e6510757c7ab3608edb82ecb Mon Sep 17 00:00:00 2001
+From 447eebd1b98c8302e223ba21f6a5390fc1ac4491 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 4 Aug 2018 19:37:35 -0400
 Subject: [PATCH] Provide Chunk Coordinates as a Long API

Spigot-API-Patches/0134-Async-Chunks-API.patch

@@ -1,4 +1,4 @@
-From 81d02f48b1966b4ca49a858fa20de8a8b9f15c0e Mon Sep 17 00:00:00 2001
+From e0bd691e726a2082f30e462d6afb9e3004c1bc56 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 29 Feb 2016 17:43:33 -0600
 Subject: [PATCH] Async Chunks API

Spigot-API-Patches/0135-Make-EnderDragon-extend-Mob.patch

@@ -1,4 +1,4 @@
-From 8950d1f9eb04a8dd6dacd77d32c47c26cba3fcbc Mon Sep 17 00:00:00 2001
+From 0b4c65cdc26ae34774ce159206165ec61a519cff Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 10 Aug 2018 22:08:34 -0400
 Subject: [PATCH] Make EnderDragon extend Mob

Spigot-API-Patches/0136-Ability-to-get-Tile-Entities-from-a-chunk-without-sn.patch

@@ -1,4 +1,4 @@
-From 97a4ab01edbd67988b59a667d7faf3e15c12b532 Mon Sep 17 00:00:00 2001
+From 4f5dd88993320659d89a19cf35369636b0e3debe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:04:58 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots

Spigot-API-Patches/0137-Don-t-use-snapshots-for-Timings-Tile-Entity-reports.patch

@@ -1,4 +1,4 @@
-From 8561919e77b65a9c40210e7ecf497f5b30e031b3 Mon Sep 17 00:00:00 2001
+From 9b0f9c9ee09a34ffae2c2a19e184e5a4a81ecace Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:19:37 -0400
 Subject: [PATCH] Don't use snapshots for Timings Tile Entity reports

Spigot-API-Patches/0138-Allow-Blocks-to-be-accessed-via-a-long-key.patch

@@ -1,4 +1,4 @@
-From ac906f73eee22d9eb85008691f819c1e9e0d7bc3 Mon Sep 17 00:00:00 2001
+From d9d41debeb4d52f921e1751ed7f401aeba037dbd Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 14 Aug 2018 21:42:10 -0700
 Subject: [PATCH] Allow Blocks to be accessed via a long key
@@ -18,10 +18,10 @@ Y range: [0, 1023]
 X, Z range: [-67 108 864, 67 108 863]
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index d38f15142..d3cff9de8 100644
+index 84b7d93cf..334e31350 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
-@@ -569,6 +569,18 @@ public class Location implements Cloneable, ConfigurationSerializable {
+@@ -578,6 +578,18 @@ public class Location implements Cloneable, ConfigurationSerializable {
          blockLoc.setZ(getBlockZ());
          return blockLoc;
      }

Spigot-API-Patches/0139-Slime-Pathfinder-Events.patch

@@ -1,4 +1,4 @@
-From d8ce298f5b4e64dcf643b8c080c6e47d73c52113 Mon Sep 17 00:00:00 2001
+From d9ac230cc79f6ee8b01f988d6bbe07edf16b31db Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 08:18:27 -0500
 Subject: [PATCH] Slime Pathfinder Events

Spigot-API-Patches/0140-isChunkGenerated-API.patch

@@ -1,11 +1,11 @@
-From c8396200e161a36ea877c2f6a355145a24f9b0b0 Mon Sep 17 00:00:00 2001
+From e69f6fd86a2a77175c639ee9438deccd46f0f2c5 Mon Sep 17 00:00:00 2001
 From: cswhite2000 <18whitechristop@gmail.com>
 Date: Tue, 21 Aug 2018 19:39:46 -0700
 Subject: [PATCH] isChunkGenerated API
 
 
 diff --git a/src/main/java/org/bukkit/Location.java b/src/main/java/org/bukkit/Location.java
-index d3cff9de8..0966f5e03 100644
+index 334e31350..57ce443a5 100644
 --- a/src/main/java/org/bukkit/Location.java
 +++ b/src/main/java/org/bukkit/Location.java
 @@ -1,5 +1,6 @@
@@ -15,7 +15,7 @@ index d3cff9de8..0966f5e03 100644
  import java.util.HashMap;
  import java.util.Map;
  
-@@ -510,6 +511,15 @@ public class Location implements Cloneable, ConfigurationSerializable {
+@@ -519,6 +520,15 @@ public class Location implements Cloneable, ConfigurationSerializable {
      public boolean isChunkLoaded() { return world.isChunkLoaded(locToBlock(x) >> 4, locToBlock(z) >> 4); } // Paper
  
      // Paper start

Spigot-API-Patches/0141-Add-More-Creeper-API.patch

@@ -1,4 +1,4 @@
-From ff30ce1b5f7f61dfc6ad8e26fac0459dc0f7d8b7 Mon Sep 17 00:00:00 2001
+From f16fe791645fb69068ef0d3cf540a6106aa47e1e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 11:50:16 -0500
 Subject: [PATCH] Add More Creeper API

Spigot-API-Patches/0142-Add-PhantomPreSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 0061310b705004c430c5723f9a44bcf4b25ef811 Mon Sep 17 00:00:00 2001
+From c2f4f4916892115c29f047a6f294c0103d83cdaa Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 25 Aug 2018 19:56:42 -0500
 Subject: [PATCH] Add PhantomPreSpawnEvent

Spigot-API-Patches/0143-Add-source-block-to-BlockPhysicsEvent.patch

@@ -1,4 +1,4 @@
-From f8d3b059dcc85e1cb314e19265591247f9f2eb2f Mon Sep 17 00:00:00 2001
+From c273ba5e5fbb6580371f21b58d31659fa105de33 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Thu, 23 Aug 2018 16:14:25 +0800
 Subject: [PATCH] Add source block to BlockPhysicsEvent

Spigot-API-Patches/0144-Inventory-removeItemAnySlot.patch

@@ -1,4 +1,4 @@
-From fa6299812f51c7522de971796540aab08c18866a Mon Sep 17 00:00:00 2001
+From e50186ec5e456237ac93fed193aeb097f3960ab8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 28 Aug 2018 23:04:06 -0400
 Subject: [PATCH] Inventory#removeItemAnySlot

Spigot-API-Patches/0145-Add-ray-tracing-methods-to-LivingEntity.patch

@@ -1,4 +1,4 @@
-From e7f98812bb8a4822ac885809ae7daaae761c1c01 Mon Sep 17 00:00:00 2001
+From 7f59337d09a8d3aa24f52603aa0b5d05cfb4dd6a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:13:53 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity

Spigot-API-Patches/0146-Improve-death-events.patch

@@ -1,4 +1,4 @@
-From 135e46030a87ff3a31b86466e0c12ee0a44dc651 Mon Sep 17 00:00:00 2001
+From 0930e5799eef85630a49e526a2bf1942571a96ea Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:32:28 +0100
 Subject: [PATCH] Improve death events

Spigot-API-Patches/0147-Mob-Pathfinding-API.patch

@@ -1,4 +1,4 @@
-From c2924c0e572c8bc3f43828719a939aae0ebdc586 Mon Sep 17 00:00:00 2001
+From b1cb593f47c8e02a87189db2ac57ca0eb2886a1a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 12:39:06 -0400
 Subject: [PATCH] Mob Pathfinding API

Spigot-API-Patches/0148-Add-an-API-for-CanPlaceOn-and-CanDestroy-NBT-values.patch

@@ -1,4 +1,4 @@
-From bbec13144bdd56b0f6e6eec27c9c5dfc1a16b993 Mon Sep 17 00:00:00 2001
+From 177fd27d66c07d01d4826bfb5cc9dd992e21b887 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:35 +0300
 Subject: [PATCH] Add an API for CanPlaceOn and CanDestroy NBT values

Spigot-API-Patches/0149-Performance-Concurrency-Improvements-to-Permissions.patch

@@ -1,4 +1,4 @@
-From 70bd0d4e37da61457d7cf5e738c86df89660c2c7 Mon Sep 17 00:00:00 2001
+From 875d7e1da48a97e3d239c85b153b5db4f8bc4296 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 20:51:50 -0400
 Subject: [PATCH] Performance & Concurrency Improvements to Permissions

Spigot-API-Patches/0150-Add-ItemStackRecipeChoice-Draft-API.patch

@@ -1,4 +1,4 @@
-From 28da2c2e4131200abea38d1655801de42bff18ed Mon Sep 17 00:00:00 2001
+From b7cbdf7b28497f69afaf63fdae60c903231d2855 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 13 Sep 2018 21:39:26 -0400
 Subject: [PATCH] Add ItemStackRecipeChoice Draft API

Spigot-API-Patches/0151-Implement-furnace-cook-speed-multiplier-API.patch

@@ -1,4 +1,4 @@
-From 4894cb1a997439c5dedc66114a55483e169ecd6e Mon Sep 17 00:00:00 2001
+From 8b72b61b5b8b87c1c2bf8c1099edc27f893db680 Mon Sep 17 00:00:00 2001
 From: Tassu <git@tassu.me>
 Date: Thu, 13 Sep 2018 08:45:01 +0300
 Subject: [PATCH] Implement furnace cook speed multiplier API

Spigot-API-Patches/0152-PreSpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From c0ac9162f275d12dc0fcd47237528f9b124917a9 Mon Sep 17 00:00:00 2001
+From 9d711bd307bd1b1f02458a5af2f5513f396e630c Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:50:10 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent

Spigot-API-Patches/0153-Remove-Precondition-on-name-for-AttributeModifier.patch

@@ -1,4 +1,4 @@
-From 7c6a5a037b4afb0148ae12995168cf93a4ef452c Mon Sep 17 00:00:00 2001
+From e6fe9e0337266d2cfcae640d7ee44f840f4305bc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 22 Sep 2018 18:41:01 -0400
 Subject: [PATCH] Remove Precondition on name for AttributeModifier

Spigot-API-Patches/0154-Material-API-additions.patch

@@ -1,4 +1,4 @@
-From 515426e99ead7041a586709f651b989c9a2c0c61 Mon Sep 17 00:00:00 2001
+From d4d37f326a358195017d5c6cb1b72631cfeb1dfe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Oct 2018 21:14:29 -0400
 Subject: [PATCH] Material API additions

Spigot-API-Patches/0155-Add-Material-Tags.patch

@@ -1,4 +1,4 @@
-From bbddcaa72ff76ccf45773d20438a0c9982205e9c Mon Sep 17 00:00:00 2001
+From 990878599bcd6903ac503c61a7ad30242dad92ec Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 17 Jul 2018 01:27:15 -0400
 Subject: [PATCH] Add Material Tags

Spigot-API-Patches/0156-Allow-setting-the-vex-s-summoner.patch

@@ -1,4 +1,4 @@
-From 09b1a9e70d255773b6a9f16d41b15f1a4256a596 Mon Sep 17 00:00:00 2001
+From 2ab267b8452cec910e100702428427af8bc1a020 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 21:47:09 -0500
 Subject: [PATCH] Allow setting the vex's summoner

Spigot-API-Patches/0157-Add-LivingEntity-getTargetEntity.patch

@@ -1,4 +1,4 @@
-From 6fa603fb50284943a6142bb69261ad2c830ec573 Mon Sep 17 00:00:00 2001
+From 651f32be8d3fc9ddc408dcccfe8d888692ccd2cf Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:32:53 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity

Spigot-API-Patches/0158-Add-sun-related-API.patch

@@ -1,4 +1,4 @@
-From e335fe35e65c3d2a72b29e1b289261bbaebf205f Mon Sep 17 00:00:00 2001
+From c6e637e02b40c9f3f776f69f381303f107e69b28 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:15 -0500
 Subject: [PATCH] Add sun related API

Spigot-API-Patches/0159-Here-s-Johnny.patch

@@ -1,4 +1,4 @@
-From 3b65f3403373f14a5e09ef83dc71bdf9ed3b634b Mon Sep 17 00:00:00 2001
+From 28375eab2740571d7b9ab080ff28d55cf88c05b0 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 01:37:16 -0500
 Subject: [PATCH] Here's Johnny!

Spigot-API-Patches/0160-Turtle-API.patch

@@ -1,4 +1,4 @@
-From 6db595ca8a00176a0c80b9099899814b82387532 Mon Sep 17 00:00:00 2001
+From 93d7e253dd01d49f7dfdf75cc569fe077a335b6b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 28 Sep 2018 17:08:09 -0500
 Subject: [PATCH] Turtle API

Spigot-API-Patches/0161-Implement-getters-and-setters-for-EntityItem-owner-a.patch

@@ -1,4 +1,4 @@
-From 780eced4ecaac2ce7ce8917c2ee853267a7cf5ab Mon Sep 17 00:00:00 2001
+From 3f5b8f92e4b73c627c658d72067ff46ae36f0015 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 20:54:13 -0500
 Subject: [PATCH] Implement getters and setters for EntityItem owner and

Spigot-API-Patches/0162-Add-spectator-target-events.patch

@@ -1,4 +1,4 @@
-From e8268de43dc2e72d6643eb0ba83d6e625e0f6c32 Mon Sep 17 00:00:00 2001
+From bf13bc9b676e4081be6052781074e45aabd3f4ef Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:30:56 -0500
 Subject: [PATCH] Add spectator target events

Spigot-API-Patches/0163-Add-more-Witch-API.patch

@@ -1,4 +1,4 @@
-From 3365caed03fea3f98a35b79d1a6bf10b23f652dc Mon Sep 17 00:00:00 2001
+From 068856b69122e8ab43569374510bc6e600b0f93e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 03:47:26 -0500
 Subject: [PATCH] Add more Witch API

Spigot-API-Patches/0164-Make-the-default-permission-message-configurable.patch

@@ -1,4 +1,4 @@
-From d719713cdce6b07c8370daba53b6d8d7f1558722 Mon Sep 17 00:00:00 2001
+From b7cacf36728e66ddc98dcf78bd25bca50f64c54c Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:44:54 +0000
 Subject: [PATCH] Make the default permission message configurable
@@ -43,7 +43,7 @@ index 1df58f72a..66d22ba79 100644
       * Creates a PlayerProfile for the specified uuid, with name as null
       * @param uuid UUID to create profile for
 diff --git a/src/main/java/org/bukkit/command/Command.java b/src/main/java/org/bukkit/command/Command.java
-index 01ea1ca67..de016865f 100644
+index c2c19ed42..f0222fc27 100644
 --- a/src/main/java/org/bukkit/command/Command.java
 +++ b/src/main/java/org/bukkit/command/Command.java
 @@ -187,7 +187,7 @@ public abstract class Command {

Spigot-API-Patches/0165-Support-cancellation-supression-of-EntityDismount-Ve.patch

@@ -1,4 +1,4 @@
-From 4e2017501e66dc245fbf331a39e74e195f1ca38a Mon Sep 17 00:00:00 2001
+From e97571dcd023a7f76827b4bc9180cc4fe5af2a41 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 15:53:43 +0000
 Subject: [PATCH] Support cancellation supression of EntityDismount/VehicleExit

Spigot-API-Patches/0166-Add-more-Zombie-API.patch

@@ -1,4 +1,4 @@
-From cf45e86b812cf3bd808c94d8c44bfc5e7497c2ea Mon Sep 17 00:00:00 2001
+From fdbcb1a6bb278f25aaa97c8c6f313710727ec608 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:51 -0500
 Subject: [PATCH] Add more Zombie API

Spigot-API-Patches/0167-Change-the-reserved-channel-check-to-be-sensible.patch

@@ -1,4 +1,4 @@
-From af85993179d88c676d2fa478cd9c4756947700cd Mon Sep 17 00:00:00 2001
+From c1b1907746b894381dc0eace9190858895d9555f Mon Sep 17 00:00:00 2001
 From: DoNotSpamPls <7570108+DoNotSpamPls@users.noreply.github.com>
 Date: Tue, 23 Oct 2018 19:32:55 +0300
 Subject: [PATCH] Change the reserved channel check to be sensible

Spigot-API-Patches/0168-Add-PlayerConnectionCloseEvent.patch

@@ -1,4 +1,4 @@
-From a6886e4d276b22e0ec55a6550ca6a853371df5e1 Mon Sep 17 00:00:00 2001
+From dafaf73dbb7c18f78952f41aea292a09461cea3c Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:06 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent

Spigot-API-Patches/0169-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch

@@ -1,4 +1,4 @@
-From d1d6e116f40122181478b2577a8de5f1e484a344 Mon Sep 17 00:00:00 2001
+From b4adc58e8917f706d5c28c3b4eaae7f125ccd697 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:31:12 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed

Spigot-API-Patches/0170-BlockDestroyEvent.patch

@@ -1,4 +1,4 @@
-From e0e3f70a6b3bd804ad5eee80d9cd98bd68c04e10 Mon Sep 17 00:00:00 2001
+From b8447c34438a04b863e11cfa7a0ddf0524eca24f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:19:33 -0500
 Subject: [PATCH] BlockDestroyEvent

Spigot-API-Patches/0171-Add-ItemStack-Recipe-API-helper-methods.patch

@@ -1,4 +1,4 @@
-From 6f20f63b0dbe9562c28f5332c0e8920e476b1bea Mon Sep 17 00:00:00 2001
+From a8e16dac9cc63a3b497e841bab9ed83577784e9d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 28 Jan 2014 19:13:57 -0500
 Subject: [PATCH] Add ItemStack Recipe API helper methods

Spigot-API-Patches/0172-Add-WhitelistToggleEvent.patch

@@ -1,4 +1,4 @@
-From 99653d40030fd8ca61c0d491e1ff7cc256b39fea Mon Sep 17 00:00:00 2001
+From 5c5bc97af3a51e5f7352c07da4bf85e1a1127f0b Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 13 Mar 2019 20:04:43 +0200
 Subject: [PATCH] Add WhitelistToggleEvent

Spigot-API-Patches/0173-Annotation-Test-changes.patch

@@ -1,4 +1,4 @@
-From 7666930425ecce25ad85f2a146efbf0db678c9e6 Mon Sep 17 00:00:00 2001
+From 320ed49d6420508ef894ccf099fa98d8b1681e40 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 17 Mar 2019 23:04:30 +0000
 Subject: [PATCH] Annotation Test changes

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

@@ -1,11 +1,11 @@
-From 042b8359f3b5546618766bf2cb49b606c189964b Mon Sep 17 00:00:00 2001
+From c65245a02ee7ec018df04e2545eba8212237ee1a 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 a985cf0c..3791b728 100644
+index 23ab857e0..51cefc0a1 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,15 +1,14 @@
@@ -110,23 +110,15 @@ index a985cf0c..3791b728 100644
                              <Implementation-Vendor>${maven.build.timestamp}</Implementation-Vendor>
                              <Specification-Title>Bukkit</Specification-Title>
                              <Specification-Version>${api.version}</Specification-Version>
-@@ -183,20 +172,23 @@
+@@ -183,6 +172,7 @@
                              <goal>shade</goal>
                          </goals>
                          <configuration>
 +                            <dependencyReducedPomLocation>${project.build.directory}/dependency-reduced-pom.xml</dependencyReducedPomLocation> <!-- Paper -->
                              <createSourcesJar>${shadeSourcesJar}</createSourcesJar>
                              <relocations>
--                                <relocation>
--                                    <pattern>joptsimple</pattern>
--                                    <shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>
--                                </relocation>
-+                                <!-- Paper - Workaround for hardcoded path lookup in dependency, easier than forking it - GH-189 -->
-+                                <!--<relocation>-->
-+                                    <!--<pattern>joptsimple</pattern>-->
-+                                    <!--<shadedPattern>org.bukkit.craftbukkit.libs.joptsimple</shadedPattern>-->
-+                                <!--</relocation>-->
-                                 <relocation>
+                                 <!-- Cannot be relocated as it breaks translation property keys -->
+@@ -196,10 +186,11 @@
                                      <pattern>jline</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.libs.jline</shadedPattern>
                                  </relocation>
@@ -142,7 +134,7 @@ index a985cf0c..3791b728 100644
                                  <relocation>
                                      <pattern>org.bukkit.craftbukkit</pattern>
                                      <shadedPattern>org.bukkit.craftbukkit.v${minecraft_version}</shadedPattern>
-@@ -222,10 +214,6 @@
+@@ -225,10 +216,6 @@
                  <groupId>org.apache.maven.plugins</groupId>
                  <artifactId>maven-compiler-plugin</artifactId>
                  <version>3.8.0</version>
@@ -154,7 +146,7 @@ index a985cf0c..3791b728 100644
                      <!-- we need our custom version as it fixes some bugs on case sensitive file systems -->
                      <dependency>
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
-index 93046379..674096ca 100644
+index 93046379d..674096cab 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Versioning.java
 @@ -11,7 +11,7 @@ public final class Versioning {
@@ -167,5 +159,5 @@ index 93046379..674096ca 100644
  
          if (stream != null) {
 -- 
-2.20.1.windows.1
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From 16adea3781a6e944aed12e5110fcc19c2900a401 Mon Sep 17 00:00:00 2001
+From c4854e60305b3205de80651deb632f7a99dcd8ac 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
@@ -297,7 +297,7 @@ index c4c1877d5..1256a0d58 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index c09961be9..dbf1089ba 100644
+index e89ba3e41..1dc13fcc3 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -22,6 +22,15 @@ public class Block implements IMaterial {
@@ -538,7 +538,7 @@ index ad9c00bc8..4e9ef43b4 100644
              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 faf4d0c0d..e329c2f48 100644
+index 3b8d09953..3f13aaa52 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -27,7 +27,8 @@ import org.bukkit.command.CommandSender;
@@ -577,7 +577,7 @@ index faf4d0c0d..e329c2f48 100644
  
      protected float ab() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 745b652a5..ccacc6e4f 100644
+index 011c7af21..b092b0fa2 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -32,7 +32,7 @@ import org.bukkit.event.entity.EntityTeleportEvent;
@@ -929,7 +929,7 @@ index c24f4a8fe..e01222ad2 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a2ec56bc9..da0d0cc10 100644
+index d97cc4f72..1c90c9d7a 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;
@@ -956,7 +956,7 @@ index a2ec56bc9..da0d0cc10 100644
  
      }
  
-@@ -1617,7 +1616,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1601,7 +1600,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit end
  
      private void handleCommand(String s) {
@@ -965,7 +965,7 @@ index a2ec56bc9..da0d0cc10 100644
          // CraftBukkit start - whole method
          if ( org.spigotmc.SpigotConfig.logCommands ) // Spigot
          this.LOGGER.info(this.player.getName() + " issued server command: " + s);
-@@ -1628,7 +1627,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1612,7 +1611,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          this.server.getPluginManager().callEvent(event);
  
          if (event.isCancelled()) {
@@ -974,7 +974,7 @@ index a2ec56bc9..da0d0cc10 100644
              return;
          }
  
-@@ -1641,7 +1640,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1625,7 +1624,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              java.util.logging.Logger.getLogger(PlayerConnection.class.getName()).log(java.util.logging.Level.SEVERE, null, ex);
              return;
          } finally {
@@ -1106,7 +1106,7 @@ index c69209497..68ac014aa 100644
      private final TileEntityTypes<?> e; public TileEntityTypes getTileEntityType() { return e; } // Paper - OBFHELPER
      protected World world;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 9865f7f7a..a1c5375a5 100644
+index 9d5b3958b..ad792af2b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,5 +1,6 @@
@@ -1567,7 +1567,7 @@ index 413dd35f0..52a8c48fa 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 753704c87..ca3393ef8 100644
+index 6a9957325..5b89da26c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1695,6 +1695,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -1808,5 +1808,5 @@ index c1071c92e..a99c0cea0 100644
      }
  }
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch

@@ -1,4 +1,4 @@
-From 18827b7724628d83581906f398c7b311cd031417 Mon Sep 17 00:00:00 2001
+From 50c27b3dd87070cac07f40031b0178ab9a3d7b79 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -14,10 +14,10 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index d2970c086..00bd32e6c 100644
+index 1c90c9d7a..b57f48035 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1548,6 +1548,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1532,6 +1532,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          }
  
          if (!async && s.startsWith("/")) {
@@ -48,7 +48,7 @@ index d2970c086..00bd32e6c 100644
          } else if (this.player.getChatFlags() == EntityHuman.EnumChatVisibility.SYSTEM) {
              // Do nothing, this is coming from a plugin
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index a6d729180..b713bd2e9 100644
+index 76fb12630..4a53095a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -701,6 +701,29 @@ public final class CraftServer implements Server {
@@ -118,5 +118,5 @@ index f4e088c13..944151d14 100644
          {
              String[] split = restartScript.split( " " );
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,14 +1,14 @@
-From 9b28a61c8f4582b4f8b024e877b09194a42429de Mon Sep 17 00:00:00 2001
+From b2e44e33ca2732e58ad8b3a8e0d9e0d7e1608f74 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 f543532f89..91eb73b734 100644
+index b57f48035..f944eff87 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1317,7 +1317,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1301,7 +1301,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // CraftBukkit start
      public void a(PacketPlayInResourcePackStatus packetplayinresourcepackstatus) {
          PlayerConnectionUtils.ensureMainThread(packetplayinresourcepackstatus, this, this.player.getWorldServer());
@@ -22,7 +22,7 @@ index f543532f89..91eb73b734 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 8f8f03977c..43824f9633 100644
+index 94770aaf7..a3e521cb9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -126,6 +126,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -70,5 +70,5 @@ index 8f8f03977c..43824f9633 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0089-Do-not-load-chunks-for-Pathfinding.patch

@@ -1,4 +1,4 @@
-From 19ecf92a02579bb9c9518f7a192ca00d7d0c3afe Mon Sep 17 00:00:00 2001
+From e243b9109433eae11aa5d0ba4c3aecb1fccf3976 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 31 Mar 2016 19:17:58 -0400
 Subject: [PATCH] Do not load chunks for Pathfinding
@@ -82,7 +82,7 @@ index 36d7e1d96..d722c8513 100644
          this.c.c();
          this.d = MathHelper.d(entityinsentient.width + 1.0F);
 diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
-index d4eb7f862..3b5ace88d 100644
+index eec891647..e45bdb581 100644
 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
 @@ -327,7 +327,8 @@ public class PathfinderNormal extends PathfinderAbstract {
@@ -99,8 +99,8 @@ index d4eb7f862..3b5ace88d 100644
                  for (int l = -1; l <= 1; ++l) {
                      for (int i1 = -1; i1 <= 1; ++i1) {
                          if (l != 0 || i1 != 0) {
--                            Block block = iblockaccess.getType(blockposition_b.c(l + i, j, i1 + k)).getBlock();
-+                            Block block = world.getBlockIfLoaded(blockposition_b.c(l + i, j, i1 + k)); // Paper
+-                            Block block = iblockaccess.getType(blockposition_pooledblockposition.c(l + i, j, i1 + k)).getBlock();
++                            Block block = world.getBlockIfLoaded(blockposition_pooledblockposition.c(l + i, j, i1 + k)); // Paper
  
 -                            if (block == Blocks.CACTUS) {
 +                            if (block == null) pathtype = PathType.BLOCKED; // Paper
@@ -119,5 +119,5 @@ index d4eb7f862..3b5ace88d 100644
          Material material = iblockdata.getMaterial();
  
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0091-Add-PlayerUseUnknownEntityEvent.patch

@@ -1,11 +1,11 @@
-From 03c6a56ae1da43798b2e2bb1048672986c13e9da Mon Sep 17 00:00:00 2001
+From b90ee7c51e4b323e8c206bf7006f36484f8cfa9c Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
-index 77440ac81f..8711462e16 100644
+index 77440ac81..8711462e1 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 @@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@@ -18,10 +18,10 @@ index 77440ac81f..8711462e16 100644
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3493bf945f..43b08096d6 100644
+index f944eff87..72c06cdb8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1889,6 +1889,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1873,6 +1873,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                  }
              }
          }
@@ -39,5 +39,5 @@ index 3493bf945f..43b08096d6 100644
      }
  
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0098-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch

@@ -1,4 +1,4 @@
-From 302be0291f7c03f6d2c9749946213c3d9c9a2685 Mon Sep 17 00:00:00 2001
+From fc795917307bbed324521bca9996db6dcbfc7976 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names
@@ -26,10 +26,10 @@ index 276dd98fd..973ea8bca 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 44474a7d6..97e39050a 100644
+index 72c06cdb8..5516726e8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1626,7 +1626,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1610,7 +1610,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      return;
                  }
  
@@ -61,5 +61,5 @@ index 6e62ea90d..523694899 100644
          worldserver = server.getWorldServer(entityplayer.dimension);  // CraftBukkit - Update in case join event changed it
          playerconnection.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0108-Add-ability-to-configure-frosted_ice-properties.patch

@@ -1,4 +1,4 @@
-From c606b70b6aba86512d4fbeb55cf80b4041f448ca Mon Sep 17 00:00:00 2001
+From 8555700222db1b2ae1797468e723cecf28b80d3a Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties
@@ -24,7 +24,7 @@ index 973ea8bca..7c7d5595a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index 7cac7cc90..792a69ad5 100644
+index f99046b9b..2c881be1e 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -12,6 +12,7 @@ public class BlockIceFrost extends BlockIce {
@@ -33,14 +33,14 @@ index 7cac7cc90..792a69ad5 100644
      public void a(IBlockData iblockdata, World world, BlockPosition blockposition, Random random) {
 +        if (!world.paperConfig.frostedIceEnabled) return; // Paper - add ability to disable frosted ice
          if ((random.nextInt(3) == 0 || this.a(world, blockposition, 4)) && world.getLightLevel(blockposition) > 11 - (Integer) iblockdata.get(BlockIceFrost.a) - iblockdata.b(world, blockposition) && this.c(iblockdata, world, blockposition)) {
-             BlockPosition.b blockposition_b = BlockPosition.b.r();
+             BlockPosition.PooledBlockPosition blockposition_pooledblockposition = BlockPosition.PooledBlockPosition.r();
              Throwable throwable = null;
 @@ -27,7 +28,7 @@ public class BlockIceFrost extends BlockIce {
-                     IBlockData iblockdata1 = world.getType(blockposition_b);
+                     IBlockData iblockdata1 = world.getType(blockposition_pooledblockposition);
  
-                     if (iblockdata1.getBlock() == this && !this.c(iblockdata1, world, blockposition_b)) {
--                        world.getBlockTickList().a(blockposition_b, this, MathHelper.nextInt(random, 20, 40));
-+                        world.getBlockTickList().a(blockposition_b, this, MathHelper.nextInt(random, world.paperConfig.frostedIceDelayMin, world.paperConfig.frostedIceDelayMax)); // Paper - use configurable min/max delay
+                     if (iblockdata1.getBlock() == this && !this.c(iblockdata1, world, blockposition_pooledblockposition)) {
+-                        world.getBlockTickList().a(blockposition_pooledblockposition, this, MathHelper.nextInt(random, 20, 40));
++                        world.getBlockTickList().a(blockposition_pooledblockposition, this, MathHelper.nextInt(random, world.paperConfig.frostedIceDelayMin, world.paperConfig.frostedIceDelayMax)); // Paper - use configurable min/max delay
                      }
                  }
              } catch (Throwable throwable1) {
@@ -54,5 +54,5 @@ index 7cac7cc90..792a69ad5 100644
      }
  
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch

@@ -1,14 +1,14 @@
-From 14b5c09d5c2ec1c709daba6dc1e5abf715b195ba Mon Sep 17 00:00:00 2001
+From 3d5681205a2678f4417f1e02f12b4da9f96ff5c7 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ca026155d8..e967066dcf 100644
+index 8b515b722..041e4608e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2082,7 +2082,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2066,7 +2066,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
                      case CLONE:
                          if (packetplayinwindowclick.d() == 2) {
                              click = ClickType.MIDDLE;
@@ -18,5 +18,5 @@ index ca026155d8..e967066dcf 100644
                              } else {
                                  Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.c());
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0133-Configurable-packet-in-spam-threshold.patch

@@ -1,11 +1,11 @@
-From e5a3132bd825a7a3a89770dd9afb537e6fba7576 Mon Sep 17 00:00:00 2001
+From 02153bf4f222c0a94526c55cd3758ef401fd38ee Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2ae623e7d..f5bd2245a 100644
+index 894501c61..dfb931298 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -253,4 +253,13 @@ public class PaperConfig {
@@ -23,10 +23,10 @@ index 2ae623e7d..f5bd2245a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5715d7ba8..c31f84a84 100644
+index 041e4608e..f5624f3d6 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1193,13 +1193,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1177,13 +1177,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      // Spigot start - limit place/interactions
      private int limitedPackets;
      private long lastLimitedPacket = -1;
@@ -44,5 +44,5 @@ index 5715d7ba8..c31f84a84 100644
              limitedPackets = 0;
              return true;
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From 0969b16e0064457cc8c7abbf1791395950c057e4 Mon Sep 17 00:00:00 2001
+From a45c886770943c8e1893a1bc1163b4212f1988b9 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
@@ -19,10 +19,10 @@ index 6b9bbc77c..e4e1d999e 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 677d6466d..9157c3f0d 100644
+index d54f00037..eb232533c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2500,7 +2500,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -2484,7 +2484,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
      }
  
      public final boolean isDisconnected() {

Spigot-Server-Patches/0167-Fix-block-break-desync.patch

@@ -1,14 +1,14 @@
-From 82463a1bf386bbc6ae6d966a9388f464bb9347cb Mon Sep 17 00:00:00 2001
+From 7e47e348b20317ee5b66849ff43520037121d4c2 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 8 Jan 2017 18:50:35 +1100
 Subject: [PATCH] Fix block break desync
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dbdd08d17..46608118e 100644
+index eb232533c..74d880e03 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1152,6 +1152,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1136,6 +1136,8 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
              double d3 = d0 * d0 + d1 * d1 + d2 * d2;
  
              if (d3 > 36.0D) {
@@ -18,5 +18,5 @@ index dbdd08d17..46608118e 100644
              } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
                  return;
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From 241fe427ab94754bd7f745cf4b9acb07a5a91aa9 Mon Sep 17 00:00:00 2001
+From 20c2db8c795362826ee89ca434c7e81866d572b6 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
@@ -18,5 +18,5 @@ index 299776728..41926a361 100644
                  Iterator<Long> iterator = this.unloadQueue.iterator();
  
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0171-Shame-on-you-Mojang.patch

@@ -1,38 +0,0 @@
-From 777d98b4a8650fc1cbb0046b63c76cf2d81615d8 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 5 Feb 2017 19:17:28 -0500
-Subject: [PATCH] Shame on you Mojang
-
-Someone wrote some horrible code that throws a world accessing task
-onto the HTTP DOWNLOADER Thread Pool, for an activity that is not even
-heavy enough to warrant async operation.
-
-This then triggers async chunk loads!
-
-What in the hell were you thinking?
-
-diff --git a/src/main/java/net/minecraft/server/BlockBeacon.java b/src/main/java/net/minecraft/server/BlockBeacon.java
-index fb567f34c..e45ad95fb 100644
---- a/src/main/java/net/minecraft/server/BlockBeacon.java
-+++ b/src/main/java/net/minecraft/server/BlockBeacon.java
-@@ -49,7 +49,7 @@ public class BlockBeacon extends BlockTileEntity {
-     }
- 
-     public static void a(World world, BlockPosition blockposition) {
--        HttpUtilities.a.submit(() -> {
-+        //HttpUtilities.a.submit(() -> { // Paper
-             Chunk chunk = world.getChunkAtWorldCoords(blockposition);
- 
-             for (int i = blockposition.getY() - 1; i >= 0; --i) {
-@@ -73,7 +73,6 @@ public class BlockBeacon extends BlockTileEntity {
-                     });
-                 }
-             }
--
--        });
-+     //   }); // Paper
-     }
- }
--- 
-2.20.1
-

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

@@ -1,11 +1,11 @@
-From a1e7d68d0ae7f38e6b94e715c5a87a8af234c71d Mon Sep 17 00:00:00 2001
+From 96b6468f9d3118627a6097dbc92e3f1e18e1bfc2 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 5945e37a5..4ecf34a40 100644
+index b57088234..694df9e18 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -763,5 +763,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index 5945e37a5..4ecf34a40 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index be0a3f38e..a6457e870 100644
+index 34fbf8362..138a224e0 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -202,6 +202,7 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index be0a3f38e..a6457e870 100644
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.20.0
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From f9866f40c00cb70dd6987b0e82b4cb30b89dbc8c Mon Sep 17 00:00:00 2001
+From d7b4a418de5fffaf1e4667ae79065bba032605fe Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 12 May 2017 23:34:11 -0500
 Subject: [PATCH] Properly handle async calls to restart the server
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a5047084e..dd910b16d 100644
+index 6283c774d..db511c1fe 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -85,6 +85,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -294,5 +294,5 @@ index 944151d14..061cbe7fc 100644
      }
  }
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0174-Add-system-property-to-disable-book-size-limits.patch

@@ -1,4 +1,4 @@
-From 3105668521742bb253d9380fb45fcb8cce56e8cd Mon Sep 17 00:00:00 2001
+From e2b577bd48746070ebc879711993cb290b1dd3d8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 13 May 2017 20:11:21 -0500
 Subject: [PATCH] Add system property to disable book size limits
@@ -57,5 +57,5 @@ index a23ec1461..20cddd506 100644
              }
  
 -- 
-2.20.0
+2.21.0
 

Spigot-Server-Patches/0175-Add-option-to-make-parrots-stay-on-shoulders-despite.patch

@@ -1,4 +1,4 @@
-From fae17dd3704f78651bf125cf4229ea077c07f658 Mon Sep 17 00:00:00 2001
+From 7e0c048688797357331b9b96630f12e0325a264e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -26,7 +26,7 @@ index e49eb0caf..aefb0ce97 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index d356c1760..7f0501794 100644
+index 5e5a747e9..23e7cdfe8 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -465,7 +465,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,10 +39,10 @@ index d356c1760..7f0501794 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 7555fc3f7..ff5eb0b3d 100644
+index 74d880e03..b906615e3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -1751,6 +1751,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
+@@ -1735,6 +1735,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
          switch (packetplayinentityaction.c()) {
          case START_SNEAKING:
              this.player.setSneaking(true);
@@ -57,5 +57,5 @@ index 7555fc3f7..ff5eb0b3d 100644
          case STOP_SNEAKING:
              this.player.setSneaking(false);
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0176-Add-configuration-option-to-prevent-player-names-fro.patch

@@ -1,4 +1,4 @@
-From f6ca2a412171bf4de58549ea41ea774f6bb4d382 Mon Sep 17 00:00:00 2001
+From 3282d3a441567161f7a424959345ac7695ebff22 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:34 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index a4853e04be..0f38b1fb4a 100644
+index a4853e04b..0f38b1fb4 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -280,4 +280,9 @@ public class PaperConfig {
@@ -20,7 +20,7 @@ index a4853e04be..0f38b1fb4a 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 02d2b80b91..e238e760a7 100644
+index 02d2b80b9..e238e760a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2140,5 +2140,10 @@ public final class CraftServer implements Server {
@@ -35,5 +35,5 @@ index 02d2b80b91..e238e760a7 100644
      // Paper end
  }
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From 7cf14855f60627ca3c791907f9c73b3f76dde838 Mon Sep 17 00:00:00 2001
+From a6a3ba9f6b3a8dae529a6202f3db6beb8b7e2735 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 3791b72807..7d626a7d27 100644
+index 51cefc0a1..2b73ec28a 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -41,10 +41,27 @@
@@ -54,7 +54,7 @@ index 3791b72807..7d626a7d27 100644
          </dependency>
          <dependency>
              <groupId>org.ow2.asm</groupId>
-@@ -205,10 +222,18 @@
+@@ -207,10 +224,18 @@
                                  <transformer implementation="org.apache.maven.plugins.shade.resource.AppendingTransformer">
                                      <resource>META-INF/services/java.sql.Driver</resource>
                                  </transformer>
@@ -75,7 +75,7 @@ index 3791b72807..7d626a7d27 100644
                  <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 new file mode 100644
-index 0000000000..688b4715eb
+index 000000000..688b4715e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -0,0 +1,40 @@
@@ -121,7 +121,7 @@ index 0000000000..688b4715eb
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 new file mode 100644
-index 0000000000..685deaa0e5
+index 000000000..685deaa0e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 @@ -0,0 +1,17 @@
@@ -143,7 +143,7 @@ index 0000000000..685deaa0e5
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index 4e9ef43b45..5bb1ea880a 100644
+index 4e9ef43b4..5bb1ea880 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -79,6 +79,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -185,7 +185,7 @@ index 4e9ef43b45..5bb1ea880a 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 db511c1fe8..c6ecdf6e8e 100644
+index db511c1fe..c6ecdf6e8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -56,7 +56,6 @@ import org.apache.commons.lang3.Validate;
@@ -243,7 +243,7 @@ index db511c1fe8..c6ecdf6e8e 100644
  
      public KeyPair E() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 9d44dcb3b2..8bb3fef21e 100644
+index 9d44dcb3b..8bb3fef21 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -77,8 +77,7 @@ public abstract class PlayerList {
@@ -257,7 +257,7 @@ index 9d44dcb3b2..8bb3fef21e 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 e238e760a7..9cf2ee957b 100644
+index e238e760a..9cf2ee957 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -146,8 +146,8 @@ import java.nio.ByteBuffer;
@@ -285,7 +285,7 @@ index e238e760a7..9cf2ee957b 100644
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 5c62e990ab..b174a4efae 100644
+index 0c70f6700..04991c991 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -14,7 +14,7 @@ import java.util.logging.Logger;
@@ -327,7 +327,7 @@ index 5c62e990ab..b174a4efae 100644
                  if (Main.class.getPackage().getImplementationVendor() != null && System.getProperty("IReallyKnowWhatIAmDoingISwear") == null) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 deleted file mode 100644
-index 26a2fb8942..0000000000
+index 26a2fb894..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 +++ /dev/null
 @@ -1,74 +0,0 @@
@@ -406,7 +406,7 @@ index 26a2fb8942..0000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 33e8ea02c4..1e3aae3b8f 100644
+index 33e8ea02c..1e3aae3b8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -8,17 +8,27 @@ import java.util.logging.Level;
@@ -485,7 +485,7 @@ index 33e8ea02c4..1e3aae3b8f 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 984df4083d..bbb5a84f36 100644
+index 984df4083..bbb5a84f3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -20,7 +20,7 @@ public class ServerShutdownThread extends Thread {
@@ -499,7 +499,7 @@ index 984df4083d..bbb5a84f36 100644
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 deleted file mode 100644
-index b640971130..0000000000
+index b64097113..000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
 @@ -1,54 +0,0 @@
@@ -558,7 +558,7 @@ index b640971130..0000000000
 -    }
 -}
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 5cee8f00ef..08b6bb7f97 100644
+index 5cee8f00e..08b6bb7f9 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,12 +1,11 @@
@@ -588,5 +588,5 @@ index 5cee8f00ef..08b6bb7f97 100644
              <AppenderRef ref="TerminalConsole" level="info"/>
          </Root>
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0178-provide-a-configurable-option-to-disable-creeper-lin.patch

@@ -1,4 +1,4 @@
-From ae11acb86e16493b74f4758d53def860e6580ac8 Mon Sep 17 00:00:00 2001
+From 21f905a2536d1e3dbf5fe9f96a7f9bfebc4ef139 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@@ -34,5 +34,5 @@ index 81e602d1b..b6af42904 100644
  
              entityareaeffectcloud.setSource(this); // CraftBukkit
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,11 +1,11 @@
-From f5e92a52c3e06d819b2bbf304c9eee9ad6c6397c Mon Sep 17 00:00:00 2001
+From 796cef655af2544409704e96ea3c7751594268f3 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 7401bafa9..d670b6ba4 100644
+index c53082459..98e214cdd 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -530,6 +530,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -21,7 +21,7 @@ index 7401bafa9..d670b6ba4 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index cad1c1a17..e343b39b5 100644
+index 9b854d64f..39a804b7c 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -13,6 +13,7 @@ public class EntityItem extends Entity {
@@ -54,5 +54,5 @@ index 55d6bacf7..6036592f7 100644
      public String toString() {
          return "CraftItem";
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0180-PlayerPickupItemEvent-setFlyAtPlayer.patch

@@ -1,11 +1,11 @@
-From 8e87c447aeaf60619c17d4800980fedcb2fdfb52 Mon Sep 17 00:00:00 2001
+From d2dc3091b8657b318b2813a1e3ab7a1eed394ae8 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:09 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index ac0f38e12..c18654256 100644
+index 39a804b7c..643793d55 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -308,6 +308,7 @@ public class EntityItem extends Entity {
@@ -43,5 +43,5 @@ index ac0f38e12..c18654256 100644
                      this.die();
                      itemstack.setCount(i);
 -- 
-2.20.0
+2.21.0
 

Spigot-Server-Patches/0181-PlayerAttemptPickupItemEvent.patch

@@ -1,11 +1,11 @@
-From beb52bdc2048cc886d469c876fbac60eefbe1091 Mon Sep 17 00:00:00 2001
+From eb450153843e8b028207b2d7e854a092289ea7b6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:30 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index c18654256..0b4cab0af 100644
+index 643793d55..85f80741c 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -7,6 +7,7 @@ import javax.annotation.Nullable;
@@ -40,5 +40,5 @@ index c18654256..0b4cab0af 100644
                  itemstack.setCount(canHold);
                  // Call legacy event
 -- 
-2.20.0
+2.21.0
 

Spigot-Server-Patches/0182-Add-UnknownCommandEvent.patch

@@ -1,11 +1,11 @@
-From 7b5147f0f06ece4202a78ae8391ce5faef0ad8af Mon Sep 17 00:00:00 2001
+From 03c187679f3139c3228ee5d763f7c08474ced30b Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 89ff2fb53..f82ab97e6 100644
+index 9cf2ee957..6dad8fab2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -83,6 +83,7 @@ import org.bukkit.craftbukkit.util.Versioning;
@@ -32,5 +32,5 @@ index 89ff2fb53..f82ab97e6 100644
          // Spigot end
  
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From 73c73fe9767a2693a0718ed12093fb413ca905b7 Mon Sep 17 00:00:00 2001
+From 48590dd6c44d630eb5b4830660f2ae85784abab6 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 0000000000..b151a13c1b
+index 000000000..b151a13c1
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 @@ -0,0 +1,280 @@
@@ -293,7 +293,7 @@ index 0000000000..b151a13c1b
 +}
 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 0000000000..25836b975b
+index 000000000..25836b975
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 @@ -0,0 +1,30 @@
@@ -329,7 +329,7 @@ index 0000000000..25836b975b
 +}
 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 0000000000..3bcdb8f93f
+index 000000000..3bcdb8f93
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -0,0 +1,17 @@
@@ -352,7 +352,7 @@ index 0000000000..3bcdb8f93f
 +}
 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 0000000000..4b2a67423f
+index 000000000..4b2a67423
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -0,0 +1,29 @@
@@ -387,7 +387,7 @@ index 0000000000..4b2a67423f
 +}
 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 0000000000..3aceb0ea8a
+index 000000000..3aceb0ea8
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 @@ -0,0 +1,11 @@
@@ -403,7 +403,7 @@ index 0000000000..3aceb0ea8a
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index e1af5c4885..0ef5ad1165 100644
+index e1af5c488..0ef5ad116 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,7 +1,10 @@
@@ -429,7 +429,7 @@ index e1af5c4885..0ef5ad1165 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 c6ecdf6e8e..5517c5fe81 100644
+index c6ecdf6e8..5517c5fe8 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1186,7 +1186,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -450,7 +450,7 @@ index c6ecdf6e8e..5517c5fe81 100644
          return this.V;
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 9bf2521be6..0596658362 100644
+index 9bf2521be..059665836 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 9bf2521be6..0596658362 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 6dad8fab26..ec17eaf9d7 100644
+index 6dad8fab2..ec17eaf9d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -164,6 +164,10 @@ import org.bukkit.event.server.ServerLoadEvent;
@@ -523,5 +523,5 @@ index 6dad8fab26..ec17eaf9d7 100644
      // Paper end
  }
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From 0af2354c40db7b7aa736fbc1fa4e89279393efb7 Mon Sep 17 00:00:00 2001
+From 136778b9063d11c79042422caeed11e550c8004e 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

Spigot-Server-Patches/0185-Profile-Lookup-Events.patch

@@ -1,4 +1,4 @@
-From 55c3f1f54797809a5ac5ef73753d9c4ae16edb65 Mon Sep 17 00:00:00 2001
+From 0db7caa6c1fffb8a75ca04e449016be2d771c7b0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 17:00:32 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -81,5 +81,5 @@ index 3bcdb8f93..bb9894318 100644
      }
  }
 -- 
-2.20.0
+2.21.0
 

Spigot-Server-Patches/0186-Block-player-logins-during-server-shutdown.patch

@@ -1,4 +1,4 @@
-From 2a4dc5a6b1147aa81b3c974bd8f8712ed1dc6575 Mon Sep 17 00:00:00 2001
+From d234eb539c27dc62a73b839a01389fc6d2489169 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 2 Jul 2017 21:35:56 -0500
 Subject: [PATCH] Block player logins during server shutdown
@@ -22,5 +22,5 @@ index e901c066a..852dc7162 100644
              this.b();
          } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
 -- 
-2.20.1
+2.21.0
 

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

@@ -1,11 +1,11 @@
-From a15e970ed18cc79400d6dbbcdcf1d95d5ff86582 Mon Sep 17 00:00:00 2001
+From 3569f378c781dc08ac98caa7de3f38f3d199e003 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 4be9226c8e..e64d032b7f 100644
+index 2da7bbe81..c59f137f0 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -182,6 +182,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -37,7 +37,7 @@ index 4be9226c8e..e64d032b7f 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 ce43b4bc52..98065d6b02 100644
+index ce43b4bc5..98065d6b0 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -115,6 +115,7 @@ public abstract class MobSpawnerAbstract {
@@ -49,7 +49,7 @@ index ce43b4bc52..98065d6b02 100644
                          if ( entity.world.spigotConfig.nerfSpawnerMobs )
                          {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index a82717f5c1..67530ba0fc 100644
+index a82717f5c..67530ba0f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -839,5 +839,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -64,5 +64,5 @@ index a82717f5c1..67530ba0fc 100644
      // Paper end
  }
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0188-Fix-Anvil-Level-sync-to-client.patch

@@ -1,4 +1,4 @@
-From 37a62cfb23664f1077c3edf77bb3e2193c0b0b90 Mon Sep 17 00:00:00 2001
+From 3d24b5f762730dd26308701afe17ecc1166428dc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 11 Jul 2017 23:17:57 -0400
 Subject: [PATCH] Fix Anvil Level sync to client
@@ -10,7 +10,7 @@ Was done incorrectly and is now causing level desyncs to client.
 Always send current level to the client, and instead make setWindowProperty set the level.
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index a6ac516147..1560dd382a 100644
+index a6ac51614..1560dd382 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -375,9 +375,9 @@ public class ContainerAnvil extends Container {
@@ -26,7 +26,7 @@ index a6ac516147..1560dd382a 100644
  
          this.lastLevelCost = this.levelCost;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 35eb4279ec..b03c62bf2d 100644
+index 47e8ef2de..7a74ce26d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1400,6 +1400,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -42,5 +42,5 @@ index 35eb4279ec..b03c62bf2d 100644
          return true;
      }
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0189-Add-missing-coverages-for-getTileEntity-in-order-to-.patch

@@ -1,4 +1,4 @@
-From ac4056b8b9841f0fa81703e72634c60229c838f9 Mon Sep 17 00:00:00 2001
+From 3d463a5ec0887a8c0424ba171b16bd835c64fade Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 22 Jul 2017 15:22:59 +0100
 Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
@@ -6,7 +6,7 @@ Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 15736f7575..ee09f4c5a0 100644
+index 15736f757..ee09f4c5a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -217,6 +217,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -24,5 +24,5 @@ index 15736f7575..ee09f4c5a0 100644
          return result;
      }
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0190-Improve-the-Saddle-API-for-Horses.patch

@@ -1,4 +1,4 @@
-From 85ec0814325c3a54b11db44f173f4239975d47fb Mon Sep 17 00:00:00 2001
+From e44afb8723f21042ad1a3dfe0fcaee71a3df3540 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Dec 2016 16:24:06 -0500
 Subject: [PATCH] Improve the Saddle API for Horses
@@ -61,5 +61,5 @@ index 000000000..99cfbaf90
 +
 +}
 -- 
-2.20.0
+2.21.0
 

Spigot-Server-Patches/0191-Implement-ensureServerConversions-API.patch

@@ -1,4 +1,4 @@
-From 101bcf13b1aef3fa2e0e3b952e403005e9fb5edd Mon Sep 17 00:00:00 2001
+From 9cd2c4f8729a798dcc81ec4cc9cc37c44d3cd489 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 22:43:12 -0400
 Subject: [PATCH] Implement ensureServerConversions API
@@ -22,5 +22,5 @@ index 52041caed..f5fa58d6c 100644
 +    // Paper end
  }
 -- 
-2.20.0
+2.21.0
 

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

@@ -1,4 +1,4 @@
-From 726405ea60af24ba1dfaf572412e33a555147028 Mon Sep 17 00:00:00 2001
+From 8e20d707407fcd2fafad7ad1eda1dd7906fcb3ff 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
@@ -48,5 +48,5 @@ index f5fa58d6c..3a6e6f687 100644
      // Paper end
  }
 -- 
-2.20.1
+2.21.0
 

Spigot-Server-Patches/0193-GH-806-Respect-saving-disabled-before-unloading-all-.patch

@@ -1,4 +1,4 @@
-From 43787fb84844cd102edae334a8b12d0198373999 Mon Sep 17 00:00:00 2001
+From b7c4fc493b7bd6aaf28dacd893e41c2ea5dd0ad3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Jul 2017 00:06:43 -0400
 Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks
@@ -22,5 +22,5 @@ index ab4f3b722..e428d4485 100644
              }
              } // Paper timing
 -- 
-2.20.1
+2.21.0