Revert "Optimize Pathfinding"

This patch appears to be causing some issues with 1.14.3 entity AI
2019-06-25 20:18:50 +01:00 · 2019-06-25 20:18:50 +01:00 · 6048122e23
Commit 6048122e23
--- a/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch
+++ b/Spigot-Server-Patches/0046-Expose-server-CommandMap.patch
@ -1,11 +1,11 @@
-From ca40b8f0e7782f5420e2b34e547198bc47ce6438 Mon Sep 17 00:00:00 2001
+From 7b1c27b9b534e8a68fb8a302f8bcb1488c990875 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6c595a4c84..28decd9e75 100644
+index 7f1620906c..5a745c76ad 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1582,6 +1582,7 @@ public final class CraftServer implements Server {
@ -17,5 +17,5 @@ index 6c595a4c84..28decd9e75 100644
         return commandMap;
     }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch
+++ b/Spigot-Server-Patches/0046-Optimize-Pathfinding.patch
@ -1,51 +0,0 @@
-From 2df54f8c27684d8dd223458fe8beb207489b9aa4 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Thu, 3 Mar 2016 02:02:07 -0600
-Subject: [PATCH] Optimize Pathfinding
-
-Prevents pathfinding from spamming failures for things such as
-arrow attacks.
-
-diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 49b27c4310..75e01c2420 100644
--- a/src/main/java/net/minecraft/server/NavigationAbstract.java
-+++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
-@@ -118,10 +118,26 @@ public abstract class NavigationAbstract {
-     }
- 
-     public boolean a(Entity entity, double d0) {
-+        // Paper start - Pathfinding optimizations
-+        if (this.pathfindFailures > 10 && this.c == null && MinecraftServer.currentTick < this.lastFailure + 40) {
-+            return false;
-+        }
-+
-         PathEntity pathentity = this.a(entity);
- 
-        return pathentity != null && this.a(pathentity, d0);
-+        if (pathentity != null && this.a(pathentity, d0)) {
-+            this.lastFailure = 0;
-+            this.pathfindFailures = 0;
-+            return true;
-+        } else {
-+            this.pathfindFailures++;
-+            this.lastFailure = MinecraftServer.currentTick;
-+            return false;
-+        }
-     }
-+    private int lastFailure = 0;
-+    private int pathfindFailures = 0;
-+    // Paper end
- 
-     public boolean a(@Nullable PathEntity pathentity, double d0) {
-         if (pathentity == null) {
-@@ -233,6 +249,7 @@ public abstract class NavigationAbstract {
-     }
- 
-     public void o() {
-+        this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations
-         this.c = null;
-     }
- 
-- 
-2.21.0
-
--- a/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch
+++ b/Spigot-Server-Patches/0047-Be-a-bit-more-informative-in-maxHealth-exception.patch
@ -1,4 +1,4 @@
-From 0584b5fc1984c1b5d3bde9f0de6ce437514138d3 Mon Sep 17 00:00:00 2001
+From f9531fb0b9e20cc195b415bf63ba04f5f7c29ed3 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
@ -21,5 +21,5 @@ index 2e007d4ffc..82b3c0a7de 100644
 
         getHandle().setHealth((float) health);
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch
+++ b/Spigot-Server-Patches/0048-Player-Tab-List-and-Title-APIs.patch
@ -1,4 +1,4 @@
-From d17dab532a462b6b3b0e9d27c213e61b4df54141 Mon Sep 17 00:00:00 2001
+From e3b7c7b79f0a486813a8d148e919771c456bb9f9 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
--- a/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch
+++ b/Spigot-Server-Patches/0049-Ensure-inv-drag-is-in-bounds.patch
@ -1,4 +1,4 @@
-From c639bec16cc54169797c3fd06597324b71792c9b Mon Sep 17 00:00:00 2001
+From 7faee6b12019d2729f6714e3c97c8e5baa2aef99 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
@ -18,5 +18,5 @@ index 5cebc7506f..b4fcab4f08 100644
                 itemstack1 = playerinventory.getCarried();
                 if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.i.size()) && this.b(slot)) {
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch
+++ b/Spigot-Server-Patches/0050-Change-implementation-of-tile-entity-removal-list.patch
@ -1,4 +1,4 @@
-From 55a8e5f7496f9d7819f01fbd2488b3c09ff32a15 Mon Sep 17 00:00:00 2001
+From 9b645dc69e99bc1f83333143abae570679e5b032 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
@ -6,7 +6,7 @@ Subject: [PATCH] Change implementation of (tile)entity removal list
 use sets for faster removal

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 8d72146760..c4d476eb61 100644
+index 59c4fdbd9d..17d1dc93bc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -40,7 +40,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@ -19,5 +19,5 @@ index 8d72146760..c4d476eb61 100644
     private final Thread serverThread;
     private int d;
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch
+++ b/Spigot-Server-Patches/0051-Add-configurable-portal-search-radius.patch
@ -1,4 +1,4 @@
-From b326377146ce4e61238d89e035cb52c8c7a5367e Mon Sep 17 00:00:00 2001
+From a09b0acbefadc0c24ef240451bee1984098a61f9 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
@ -37,5 +37,5 @@ index 6552f9e25e..2f0a8e4bb6 100644
                             blockposition2 = blockposition3.down();
                             if (this.world.getType(blockposition3).getBlock() == PortalTravelAgent.b) {
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0052-Add-velocity-warnings.patch
+++ b/Spigot-Server-Patches/0052-Add-velocity-warnings.patch
@ -1,11 +1,11 @@
-From 4bf0a00095183386eafb31351d2a8fa6329fb22c Mon Sep 17 00:00:00 2001
+From 619562839dbcb3131940757679dc4ad75150b99f Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 28decd9e75..6820c5a2c7 100644
+index 5a745c76ad..3b50a66bf6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -230,6 +230,7 @@ public final class CraftServer implements Server {
@ -88,5 +88,5 @@ index 70b187190f..56f5f54bd1 100644
                 log.log( Level.SEVERE, "Server thread dump (Look for plugins here before reporting to Paper!):" ); // Paper
                 dumpThread( ManagementFactory.getThreadMXBean().getThreadInfo( MinecraftServer.getServer().serverThread.getId(), Integer.MAX_VALUE ), log );
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch
+++ b/Spigot-Server-Patches/0053-Configurable-inter-world-teleportation-safety.patch
@ -1,4 +1,4 @@
-From 68f778350062b11e8bc9c8ed3d28dc510d10f129 Mon Sep 17 00:00:00 2001
+From 6980d0f2a62012045490bdcba0fbbdd9d5e2978b Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Configurable inter-world teleportation safety
--- a/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch
+++ b/Spigot-Server-Patches/0054-Add-exception-reporting-event.patch
@ -1,4 +1,4 @@
-From 3d3ad0b026a88bc8cb8403058596eeb4d9c482fe Mon Sep 17 00:00:00 2001
+From 2e9da15e3005f8d0b5628a9a60efd967505c0c03 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
--- a/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
+++ b/Spigot-Server-Patches/0055-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch
@ -1,4 +1,4 @@
-From 3f93b7182493efb3ed6519d3ddd76458a175ccf5 Mon Sep 17 00:00:00 2001
+From e85e153d9c12b2d68bc3b5005a015cc0c4392305 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text
@ -26,5 +26,5 @@ index fa4eab5b0b..0ab611564e 100644
             packetdataserializer.a(this.a);
         }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch
+++ b/Spigot-Server-Patches/0056-Disable-Scoreboards-for-non-players-by-default.patch
@ -1,4 +1,4 @@
-From dde42087398f92114c7ae967d6caf403e0e0649a Mon Sep 17 00:00:00 2001
+From bf39f6cb0640074c94979d20d689f918d54010d7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
--- a/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch
+++ b/Spigot-Server-Patches/0057-Add-methods-for-working-with-arrows-stuck-in-living-.patch
@ -1,4 +1,4 @@
-From bcffc3889aaa4ea4fdaa2cad209edec37900fdf0 Mon Sep 17 00:00:00 2001
+From e17fd478da771d89e0b77adb036d3152650f0827 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
@ -26,5 +26,5 @@ index 82b3c0a7de..aa50435bec 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch
+++ b/Spigot-Server-Patches/0058-Complete-resource-pack-API.patch
@ -1,4 +1,4 @@
-From 1d52cfde6af6ca1ad7481a70c38ef816cffedd8e Mon Sep 17 00:00:00 2001
+From 3429ac03afa9b65b7903b944b3bb4789abd980aa 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
--- a/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch
+++ b/Spigot-Server-Patches/0059-Chunk-Save-Reattempt.patch
@ -1,4 +1,4 @@
-From 1eeb11e8a032025ea4bf2cd1e9b2b977138cc33f Mon Sep 17 00:00:00 2001
+From 73bc13803b289003e2a94fdc929696f601d6bd33 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt
@ -51,5 +51,5 @@ index 84fe9ee3bf..1ea9e5bb43 100644
 
     public void close() throws IOException {
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch
+++ b/Spigot-Server-Patches/0060-Default-loading-permissions.yml-before-plugins.patch
@ -1,4 +1,4 @@
-From 74454c98522a757f1b147b78a0183d6a5d237262 Mon Sep 17 00:00:00 2001
+From da0f17fb2714ce06e8911f004def7869fcb9b729 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@ -30,7 +30,7 @@ index 0c65afccfd..6cc99ffe43 100644
 +    }
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 6820c5a2c7..b58c7c8e8f 100644
+index 3b50a66bf6..29a4b1da54 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -364,6 +364,7 @@ public final class CraftServer implements Server {
@ -51,5 +51,5 @@ index 6820c5a2c7..b58c7c8e8f 100644
             syncCommands();
         }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch
+++ b/Spigot-Server-Patches/0061-Allow-Reloading-of-Custom-Permissions.patch
@ -1,4 +1,4 @@
-From da88089bc0051a99ee9fac02d96b1c73a4c4c217 Mon Sep 17 00:00:00 2001
+From ac93c40a3941e664e02a4418a5de8f7e9f3cebfe Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 0bdee28ce..707313a29 100644
+index 29a4b1da54..12dd89df53 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2042,5 +2042,23 @@ public final class CraftServer implements Server {
--- a/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch
+++ b/Spigot-Server-Patches/0062-Remove-Metadata-on-reload.patch
@ -1,4 +1,4 @@
-From 287ac1f2fdcbcaa146decc4f3942fe2fddf43945 Mon Sep 17 00:00:00 2001
+From e112cf694da0e15b006292f4bef3d565ecb51ca8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 68a40c12a9..86aa2ad322 100644
+index 12dd89df53..2bd50c24b9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -795,8 +795,18 @@ public final class CraftServer implements Server {
@ -30,5 +30,5 @@ index 68a40c12a9..86aa2ad322 100644
         reloadData();
         org.spigotmc.SpigotConfig.registerCommands(); // Spigot
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0063-Undead-horse-leashing.patch
+++ b/Spigot-Server-Patches/0063-Undead-horse-leashing.patch
@ -1,4 +1,4 @@
-From fa9ee768fe0053f8efd4c56a0602257b9cb6e6b8 Mon Sep 17 00:00:00 2001
+From 1124538dbf20a006fbefe28d8b32c01c922f1f0c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
@ -20,7 +20,7 @@ index 30f0dcfd51..89556dc94a 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityHorseAbstract.java b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
-index e9f34c9307..8ce2fca806 100644
+index cb77d6bd21..b06bbc45cf 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseAbstract.java
@@ -107,7 +107,7 @@ public abstract class EntityHorseAbstract extends EntityAnimal implements IInven
@ -33,5 +33,5 @@ index e9f34c9307..8ce2fca806 100644
 
     @Override
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch
+++ b/Spigot-Server-Patches/0064-Handle-Item-Meta-Inconsistencies.patch
@ -1,4 +1,4 @@
-From aba2d029dbaec1d8e11c61da99edb1071ad5789b Mon Sep 17 00:00:00 2001
+From 540bb9cd246f495c0379159c356ac08a06d804eb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.

 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index aa6a58dd88..b643a41235 100644
+index 7bcc723998..5bc078d314 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
@ -78,7 +78,7 @@ index aa6a58dd88..b643a41235 100644
 
     public boolean hasEnchantments() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 5d71addb0c..00497350a3 100644
+index 4eb7438f25..f2f4c8d3c3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
@@ -178,28 +178,11 @@ public final class CraftItemStack extends ItemStack {
@ -330,5 +330,5 @@ index 7c8b515bc2..bf7b226a4f 100644
     private final Spigot spigot = new Spigot()
     {
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch
+++ b/Spigot-Server-Patches/0065-Configurable-Non-Player-Arrow-Despawn-Rate.patch
@ -1,4 +1,4 @@
-From 86ee99f8cce0c5291cc0508e3cba1a6bd873f574 Mon Sep 17 00:00:00 2001
+From a687e853d07ababb34e545ed49d5148d70209cbe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
@ -30,7 +30,7 @@ index 89556dc94a..98049567f4 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 5c516021e4..28fc512bab 100644
+index 2c0034cf76..44ea39e3d1 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -263,7 +263,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@ -43,5 +43,5 @@ index 5c516021e4..28fc512bab 100644
         }
 
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch
+++ b/Spigot-Server-Patches/0066-Add-World-Util-Methods.patch
@ -1,4 +1,4 @@
-From ecf07402a6cf461d882e54488f70b7c58546d395 Mon Sep 17 00:00:00 2001
+From 157c060e8b929f22ff86400308741af965a75ddc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 20:16:03 -0400
 Subject: [PATCH] Add World Util Methods
@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.

 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 9b65972569..fba176745f 100644
+index ec64391a4a..4aaf20dfcb 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -371,6 +371,7 @@ public class Chunk implements IChunkAccess {
@ -18,7 +18,7 @@ index 9b65972569..fba176745f 100644
         return this.a(blockposition, i, this.world.getWorldProvider().g());
     }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b4ed1e4435..f06b7047a0 100644
+index f3f10ca60e..769d59271a 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -46,7 +46,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@ -86,7 +86,7 @@ index b4ed1e4435..f06b7047a0 100644
         return this.getChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
     }
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 94d1c2be11..77b805f3ae 100644
+index 4cf31207e0..1388610a7b 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
@@ -19,6 +19,7 @@ public class WorldBorder {
@ -98,5 +98,5 @@ index 94d1c2be11..77b805f3ae 100644
         return (double) (blockposition.getX() + 1) > this.c() && (double) blockposition.getX() < this.e() && (double) (blockposition.getZ() + 1) > this.d() && (double) blockposition.getZ() < this.f();
     }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch
+++ b/Spigot-Server-Patches/0067-Custom-replacement-for-eaten-items.patch
@ -1,4 +1,4 @@
-From d5041d93476ed1f9f670c659ded86491a9527d7b Mon Sep 17 00:00:00 2001
+From 8f8be849cf05bfb4adbb69d9946489c33b770ffc Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
--- a/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch
+++ b/Spigot-Server-Patches/0068-handle-NaN-health-absorb-values-and-repair-bad-data.patch
@ -1,4 +1,4 @@
-From 981ffa42e50a7095946db729a10e3245920bc903 Mon Sep 17 00:00:00 2001
+From 37a4d63b60bde00f515935ca5b79e9fb60c4527f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
--- a/Spigot-Server-Patches/0069-Waving-banner-workaround.patch
+++ b/Spigot-Server-Patches/0069-Waving-banner-workaround.patch
@ -1,4 +1,4 @@
-From f63f2f065b74e3496736bb7744f98c9c4760e85d Mon Sep 17 00:00:00 2001
+From a66d2f0673a55577a9b59460106869d3de2409f3 Mon Sep 17 00:00:00 2001
 From: Gabscap <git@gabscap.de>
 Date: Sat, 19 Mar 2016 22:25:11 +0100
 Subject: [PATCH] Waving banner workaround
@ -34,5 +34,5 @@ index 88c3d7efaf..15af5927f3 100644
 
     @Override
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch
+++ b/Spigot-Server-Patches/0070-Use-a-Shared-Random-for-Entities.patch
@ -1,4 +1,4 @@
-From 5fecba3db5c27e2e84a44844d31925520b6c2e2e Mon Sep 17 00:00:00 2001
+From 5bb81d3a9a3dcc78fc00d4c1b487d6b827df3578 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.

 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3d739c4316..ec57b0ad8f 100644
+index 39ca7d5870..865dfa2b05 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -54,6 +54,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -40,5 +40,5 @@ index 3d739c4316..ec57b0ad8f 100644
         this.justCreated = true;
         this.uniqueID = MathHelper.a(this.random);
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch
+++ b/Spigot-Server-Patches/0071-Configurable-spawn-chances-for-skeleton-horses.patch
@ -1,4 +1,4 @@
-From 246374c9fd3be8f68807b6de904eb12e31ad53ee Mon Sep 17 00:00:00 2001
+From 317afc73fa8b1b25148f5a5743024957fb3ceb0f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses
@ -22,7 +22,7 @@ index 98049567f4..2a71381dae 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 2ed2cb8935..cefe8340d4 100644
+index 2895b50915..b5ff34443c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -388,7 +388,7 @@ public class WorldServer extends World {
--- a/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
+++ b/Spigot-Server-Patches/0072-Optimize-isValidLocation-getType-and-getBlockData-fo.patch
@ -1,4 +1,4 @@
-From 1e467dc2623f673dff4cf5fe4849bdef81bc2ac4 Mon Sep 17 00:00:00 2001
+From de45b3395d8c937c9c5a38717db7edda3f800c6a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@ -31,7 +31,7 @@ index 2852a17f23..7cb46d7a9c 100644
     public BaseBlockPosition(int i, int j, int k) {
         this.a = i;
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index b56a044b3a..edd60a3d7f 100644
+index 2613de6624..2eabaaeba2 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -339,6 +339,16 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@ -52,7 +52,7 @@ index b56a044b3a..edd60a3d7f 100644
         public MutableBlockPosition() {
             this(0, 0, 0);
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index fba176745f..d06e8dbc11 100644
+index 4aaf20dfcb..591c823b39 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -203,12 +203,24 @@ public class Chunk implements IChunkAccess {
@ -85,7 +85,7 @@ index fba176745f..d06e8dbc11 100644
             IBlockData iblockdata = null;
 
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 30701fd7f3..43f75fc837 100644
+index f4605e3937..c4c181c1d5 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
@@ -9,7 +9,7 @@ public class ChunkSection {
@ -98,7 +98,7 @@ index 30701fd7f3..43f75fc837 100644
     public ChunkSection(int i) {
         this(i, (short) 0, (short) 0, (short) 0);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f06b7047a0..4ec6a860d5 100644
+index 769d59271a..822db5d4c0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -197,11 +197,11 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@ -116,5 +116,5 @@ index f06b7047a0..4ec6a860d5 100644
 
     public static boolean b(int i) {
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch
+++ b/Spigot-Server-Patches/0073-Access-items-by-EquipmentSlot.patch
@ -1,4 +1,4 @@
-From 1b2a490f9d808c712e3e9d4f77e8e343a7272a85 Mon Sep 17 00:00:00 2001
+From 5074a41f7e90ce1a86a80067537d44d94eb76017 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
@ -64,5 +64,5 @@ index 5873b76236..ef4cd7a7b6 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
+++ b/Spigot-Server-Patches/0074-Only-process-BlockPhysicsEvent-if-a-plugin-has-a-lis.patch
@ -1,4 +1,4 @@
-From 70f9f02b2648c15e8a214e5ac8d0647bfd9afc25 Mon Sep 17 00:00:00 2001
+From 9c9058dddd0f28532ee7dd70b53b47f330ac8a6d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Only process BlockPhysicsEvent if a plugin has a listener
--- a/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch
+++ b/Spigot-Server-Patches/0075-Entity-AddTo-RemoveFrom-World-Events.patch
@ -1,4 +1,4 @@
-From 6d05403d0e84f2b76bc5a0824f0a7c05890d08be Mon Sep 17 00:00:00 2001
+From 0a45d9187c646b7b0fa332fcd3e9385cfe607950 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events
--- a/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch
+++ b/Spigot-Server-Patches/0076-Configurable-Chunk-Inhabited-Time.patch
@ -1,4 +1,4 @@
-From e0f769ea12c51efaaabab602dd595c0d16b922c0 Mon Sep 17 00:00:00 2001
+From 99d5651836848cb09b7cce734a3b374a8990faa6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Time
@ -35,7 +35,7 @@ index 2a71381dae..e43866991c 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index d06e8dbc11..f9b6970ae6 100644
+index 591c823b39..3d366ddeb2 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -839,7 +839,7 @@ public class Chunk implements IChunkAccess {
@ -48,5 +48,5 @@ index d06e8dbc11..f9b6970ae6 100644
 
     @Override
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0077-EntityPathfindEvent.patch
+++ b/Spigot-Server-Patches/0077-EntityPathfindEvent.patch
@ -1,4 +1,4 @@
-From 3f79320ddf65e87431feaf8e92b1bb636425c970 Mon Sep 17 00:00:00 2001
+From 59ebe95337d3e98711219afb2c04a22a213cd3f0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@ -19,7 +19,7 @@ index 04ccf141ce..e15728668e 100644
 
     private int t() {
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 81dd8e4e89..130367099b 100644
+index 4a03bd9800..a9f17b0318 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -4,7 +4,7 @@ import javax.annotation.Nullable;
--- a/Spigot-Server-Patches/0078-Reduce-IO-ops-opening-a-new-region-file.patch
+++ b/Spigot-Server-Patches/0078-Reduce-IO-ops-opening-a-new-region-file.patch
@ -1,4 +1,4 @@
-From acd3e26def5fdb90fad703740cd0c0a13ebe01cc Mon Sep 17 00:00:00 2001
+From 4ead0796d388d19e14fc45a702d0570797808c03 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 06:56:23 +0300
 Subject: [PATCH] Reduce IO ops opening a new region file.
@ -48,5 +48,5 @@ index b062a31c49..4e6288e8bb 100644
         }
 
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0079-Sanitise-RegionFileCache-and-make-configurable.patch
+++ b/Spigot-Server-Patches/0079-Sanitise-RegionFileCache-and-make-configurable.patch
@ -1,4 +1,4 @@
-From b32630a53238ec990917332b269e5e15d870be5a Mon Sep 17 00:00:00 2001
+From 2b336ee13e884d9e79c97336dc94df744ba71abe Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 08:22:55 +0300
 Subject: [PATCH] Sanitise RegionFileCache and make configurable.
@ -46,5 +46,5 @@ index 1ea9e5bb43..21b3b06f53 100644
             }
 
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0080-Use-Optimized-Collections.patch
+++ b/Spigot-Server-Patches/0080-Use-Optimized-Collections.patch
@ -1,4 +1,4 @@
-From fe0cfb0c3d84367a65cc2282c8ed790440752c85 Mon Sep 17 00:00:00 2001
+From 7d21779eafcbb18471dbd1ac5e8c16ca633be01c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 02:13:24 -0400
 Subject: [PATCH] Use Optimized Collections
@ -34,5 +34,5 @@ index 79a240cd1d..f224043d8e 100644
     private boolean f = true;
     private boolean g;
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0081-Do-not-load-chunks-for-Pathfinding.patch
+++ b/Spigot-Server-Patches/0081-Do-not-load-chunks-for-Pathfinding.patch
@ -1,4 +1,4 @@
-From 0561a9cc504b319165917e673bab35c082d38675 Mon Sep 17 00:00:00 2001
+From ccce787782826e77e8f33819ff36465866a59e67 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
@ -27,7 +27,7 @@ index ccbc1dde09..34e743716b 100644
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index d04eb1bbfe..ed69eaa176 100644
+index a9f17b0318..8b05b8acd8 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -22,7 +22,7 @@ public abstract class NavigationAbstract {
@ -53,7 +53,7 @@ index 359d9a11c0..262fa55850 100644
     public Pathfinder(PathfinderAbstract pathfinderabstract, int i) {
         this.e = pathfinderabstract;
 diff --git a/src/main/java/net/minecraft/server/PathfinderNormal.java b/src/main/java/net/minecraft/server/PathfinderNormal.java
-index d97166f8f0..0cea9db8f5 100644
+index 593f13af49..80fcb66e3e 100644
 --- a/src/main/java/net/minecraft/server/PathfinderNormal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderNormal.java
@@ -355,7 +355,8 @@ public class PathfinderNormal extends PathfinderAbstract {
@ -90,5 +90,5 @@ index d97166f8f0..0cea9db8f5 100644
         Material material = iblockdata.getMaterial();
 
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0082-Do-not-load-chunks-for-light-checks.patch
+++ b/Spigot-Server-Patches/0082-Do-not-load-chunks-for-light-checks.patch
@ -1,4 +1,4 @@
-From 5b1559f6ef3ec33496ce0dbed539a3b0e2ef39f2 Mon Sep 17 00:00:00 2001
+From 32de69162e7f552d0a6f307b2152ebe10cd7b1db 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 light checks
@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level
 (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c8a859d7ba..6f9c35cd18 100644
+index 93a061b6b2..2878370b02 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -592,6 +592,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@ -19,5 +19,5 @@ index c8a859d7ba..6f9c35cd18 100644
                 return this.getChunkAtWorldCoords(blockposition).a(blockposition, i);
             }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0083-Add-PlayerUseUnknownEntityEvent.patch
+++ b/Spigot-Server-Patches/0083-Add-PlayerUseUnknownEntityEvent.patch
@ -1,4 +1,4 @@
-From 20a7f6b9e421002521fdd59fbb2a9f7d6e989fa5 Mon Sep 17 00:00:00 2001
+From 4b155f15b82fed071c998c7a7f94cc626a48473f 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
@ -18,7 +18,7 @@ index 680adbdeb0..3f7697b39c 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 f8aa8b1405..545e18b8f3 100644
+index e4a273dbe2..41a6204022 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1926,6 +1926,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -39,5 +39,5 @@ index f8aa8b1405..545e18b8f3 100644
     }
 
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0084-Fix-reducedDebugInfo-not-initialized-on-client.patch
+++ b/Spigot-Server-Patches/0084-Fix-reducedDebugInfo-not-initialized-on-client.patch
@ -1,4 +1,4 @@
-From 95ca52c5dcfff825afa02b18d9216d0db8ff4837 Mon Sep 17 00:00:00 2001
+From 7b48935e8080f1a2ecc44b302019c446f1d386a0 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client
--- a/Spigot-Server-Patches/0085-Configurable-Grass-Spread-Tick-Rate.patch
+++ b/Spigot-Server-Patches/0085-Configurable-Grass-Spread-Tick-Rate.patch
@ -1,4 +1,4 @@
-From 167e5b20a7031271608150dbc2fa98f443b68828 Mon Sep 17 00:00:00 2001
+From eed0be3ec997ddf96892c2eaca81e22a47e21135 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate
@ -32,5 +32,5 @@ index ddca19b46b..377a57c89a 100644
             if (!b(iblockdata, (IWorldReader) world, blockposition)) {
                 // CraftBukkit start
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
+++ b/Spigot-Server-Patches/0086-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch
@ -1,11 +1,11 @@
-From 43528bb410958a6df8a745ee9478b533d7fd6b7f Mon Sep 17 00:00:00 2001
+From ba156592cd5a6108470ade8575dfa3197fd14969 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics


 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6f9c35cd18..40757fc7a2 100644
+index 2878370b02..cde463c5a5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -510,6 +510,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@ -17,5 +17,5 @@ index 6f9c35cd18..40757fc7a2 100644
         this.a(blockposition.east(), block, blockposition);
         this.a(blockposition.down(), block, blockposition);
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0087-Remove-Debug-checks-from-DataBits.patch
+++ b/Spigot-Server-Patches/0087-Remove-Debug-checks-from-DataBits.patch
@ -1,4 +1,4 @@
-From 65fb379ec37d63e7411e9bc0ec15a257ae1d940b Mon Sep 17 00:00:00 2001
+From db48c9962e15f3db9990a7c37086dd5329bc013e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 21:38:58 -0400
 Subject: [PATCH] Remove Debug checks from DataBits
@ -53,5 +53,5 @@ index 409dc837c6..4194acc8b9 100644
         int k = j >> 6;
         int l = (i + 1) * this.b - 1 >> 6;
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
+++ b/Spigot-Server-Patches/0088-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch
@ -1,4 +1,4 @@
-From e395de729b0e3ffe6f736f52ce0f2a342c0065c4 Mon Sep 17 00:00:00 2001
+From 8efc844d4ce68b3300fdc8f67a64e94f222fe277 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,7 +26,7 @@ index 59d11e68c9..1da7ffab5d 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 545e18b8f3..e88abe1d05 100644
+index 41a6204022..bbc5acd7fe 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1660,7 +1660,16 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -48,7 +48,7 @@ index 545e18b8f3..e88abe1d05 100644
                 if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                     for (Object recipient : minecraftServer.getPlayerList().players) {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 66f4691918..779117b5db 100644
+index cce5305fbe..d368b39751 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -177,7 +177,7 @@ public abstract class PlayerList {
@ -61,5 +61,5 @@ index 66f4691918..779117b5db 100644
         playerconnection.a(entityplayer.locX, entityplayer.locY, entityplayer.locZ, entityplayer.yaw, entityplayer.pitch);
         this.players.add(entityplayer);
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0089-Workaround-for-setting-passengers-on-players.patch
+++ b/Spigot-Server-Patches/0089-Workaround-for-setting-passengers-on-players.patch
@ -1,4 +1,4 @@
-From f21f5724ba148e88b8e363592282ac48d8bdf0a0 Mon Sep 17 00:00:00 2001
+From 9a32c010911a6ffe57cb6d8c3a2e9f5c0c05a855 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
--- a/Spigot-Server-Patches/0090-Remove-unused-World-Tile-Entity-List.patch
+++ b/Spigot-Server-Patches/0090-Remove-unused-World-Tile-Entity-List.patch
@ -1,4 +1,4 @@
-From 37f98342c94d77f35e3f46f6effe40755cd36c53 Mon Sep 17 00:00:00 2001
+From fed3d57aa296361eb8c18936c92dfaf460b47240 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List
@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
 Massive hit to performance and it is completely unnecessary.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 40757fc7a2..ce710c730d 100644
+index cde463c5a5..f6cb4d45eb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -40,7 +40,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@ -67,5 +67,5 @@ index 40757fc7a2..ce710c730d 100644
             }
 
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0091-Don-t-tick-Skulls-unused-code.patch
+++ b/Spigot-Server-Patches/0091-Don-t-tick-Skulls-unused-code.patch
@ -1,4 +1,4 @@
-From 401b647fb3a5dfb26cb51e184881fbefbcc68166 Mon Sep 17 00:00:00 2001
+From 0025a3bfd3735ff7afba0a6cad766d6cc7f63853 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
@ -27,5 +27,5 @@ index 99442bb130..177cceb77f 100644
         Block block = this.getBlock().getBlock();
 
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0092-Configurable-Player-Collision.patch
+++ b/Spigot-Server-Patches/0092-Configurable-Player-Collision.patch
@ -1,4 +1,4 @@
-From e74d304c76e68157f46252480a0f8fe71fbf2831 Mon Sep 17 00:00:00 2001
+From effe1e7b1ad8af4be3337ade2fcb8f16949a5463 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
@ -19,7 +19,7 @@ index 0cef1853f5..dc3438890b 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 4e1c03a78c..f88e42423d 100644
+index a87df2b6fb..ccfe1b4c3e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -436,6 +436,20 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
--- a/Spigot-Server-Patches/0093-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
+++ b/Spigot-Server-Patches/0093-Add-handshake-event-to-allow-plugins-to-handle-clien.patch
@ -1,4 +1,4 @@
-From be58a582bccbf57742bbaee96357cebe907f3ef1 Mon Sep 17 00:00:00 2001
+From 1bb24963838f96a264bc36978f8883fd89a93abf Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@ -45,5 +45,5 @@ index 756330a6ca..66dda900b6 100644
                         if ( split.length == 3 || split.length == 4 ) {
                             packethandshakinginsetprotocol.hostname = split[0];
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0094-Configurable-RCON-IP-address.patch
+++ b/Spigot-Server-Patches/0094-Configurable-RCON-IP-address.patch
@ -1,4 +1,4 @@
-From c6160c0127f6f9c500436f60fb870912b979635a Mon Sep 17 00:00:00 2001
+From dac290fc1064262ef182ff4588e2785ac711b11c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address
@ -58,5 +58,5 @@ index e48d6dcd74..2ce490be00 100644
             this.i = "0.0.0.0";
         }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0095-Prevent-Fire-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0095-Prevent-Fire-from-loading-chunks.patch
@ -1,4 +1,4 @@
-From b2ffa4ad258408e863f989014361e286f3679fcf Mon Sep 17 00:00:00 2001
+From 4780e1505f743eb1526bbcec50fe2335e97f03a9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 17 Apr 2016 17:27:09 -0400
 Subject: [PATCH] Prevent Fire from loading chunks
@ -7,7 +7,7 @@ This causes the nether to spam unload/reload chunks, plus overall
 bad behavior.

 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index 8645a0ebd0..f769df41a6 100644
+index 81e9717ae5..49e3d7284b 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
@@ -163,6 +163,7 @@ public class BlockFire extends Block {
@ -53,5 +53,5 @@ index 8645a0ebd0..f769df41a6 100644
             }
 
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0096-Implement-PlayerLocaleChangeEvent.patch
+++ b/Spigot-Server-Patches/0096-Implement-PlayerLocaleChangeEvent.patch
@ -1,4 +1,4 @@
-From f614a869a397b63bc5321e076ab70267ef518974 Mon Sep 17 00:00:00 2001
+From ce568e38db92b01e6d6d0ebbc36065948e7dd780 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
--- a/Spigot-Server-Patches/0097-EntityRegainHealthEvent-isFastRegen-API.patch
+++ b/Spigot-Server-Patches/0097-EntityRegainHealthEvent-isFastRegen-API.patch
@ -1,4 +1,4 @@
-From 9f684fa2b4e5cc51d181450346102dcf8ce452d7 Mon Sep 17 00:00:00 2001
+From e8835e988373b740a16bfb2a83ba9318a2f531b7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started

 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index d202d3d65f..5622c08f19 100644
+index 18e152b8fb..45c024ca24 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -969,10 +969,16 @@ public abstract class EntityLiving extends Entity {
@ -28,7 +28,7 @@ index d202d3d65f..5622c08f19 100644
             if (this.valid) {
                 this.world.getServer().getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/FoodMetaData.java b/src/main/java/net/minecraft/server/FoodMetaData.java
-index da07530d99..d184422fbe 100644
+index 739b8fd189..28b04f35e6 100644
 --- a/src/main/java/net/minecraft/server/FoodMetaData.java
 +++ b/src/main/java/net/minecraft/server/FoodMetaData.java
@@ -69,7 +69,7 @@ public class FoodMetaData {
@ -41,5 +41,5 @@ index da07530d99..d184422fbe 100644
                 this.foodTickTimer = 0;
             }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0098-Add-ability-to-configure-frosted_ice-properties.patch
+++ b/Spigot-Server-Patches/0098-Add-ability-to-configure-frosted_ice-properties.patch
@ -1,4 +1,4 @@
-From 123c88bf469c008338966df77f5a729e8b68d26c Mon Sep 17 00:00:00 2001
+From 8f972d58363549dd92afa7f5235a050ae00b65c1 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
@ -54,5 +54,5 @@ index 1a0c2eeaa4..39c3bbc9cf 100644
     }
 
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0099-remove-null-possibility-for-getServer-singleton.patch
+++ b/Spigot-Server-Patches/0099-remove-null-possibility-for-getServer-singleton.patch
@ -1,4 +1,4 @@
-From c075027493e979bc49c932fb993f717f573dc2d1 Mon Sep 17 00:00:00 2001
+From 961fbdba0788ff2d563f2cdc35159670061a1ab4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Apr 2016 00:57:27 -0400
 Subject: [PATCH] remove null possibility for getServer singleton
--- a/Spigot-Server-Patches/0100-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
+++ b/Spigot-Server-Patches/0100-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch
@ -1,4 +1,4 @@
-From 4f0a8caec86ab2d551f790fcaa79ffee9a428351 Mon Sep 17 00:00:00 2001
+From a0d1cba8b421d1536b09fb97f3e089d64aeb3c26 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes
--- a/Spigot-Server-Patches/0101-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0101-LootTable-API-Replenishable-Lootables-Feature.patch
@ -1,4 +1,4 @@
-From 1e45357006686819d5452e13ee351e671ef954bd Mon Sep 17 00:00:00 2001
+From 9530d1108b28a11ca02b7c70caa8963318cff90a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@ -520,7 +520,7 @@ index 0000000000..d50410532c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ec57b0ad8f..1cc7b9f60e 100644
+index 865dfa2b05..b91eaebc0e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -532,7 +532,7 @@ index ec57b0ad8f..1cc7b9f60e 100644
 
     public CraftEntity getBukkitEntity() {
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index 66826da450..b84a70edb4 100644
+index c223e18125..cf1c5d754c 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
@@ -15,10 +15,11 @@ public abstract class EntityMinecartContainer extends EntityMinecartAbstract imp
@ -591,7 +591,7 @@ index 66826da450..b84a70edb4 100644
 
             if (entityhuman != null) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java
-index 56c7f9b4e3..a12d49fc4d 100644
+index 39ebc7218c..a346eba52b 100644
 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java
 +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java
@@ -6,8 +6,9 @@ import javax.annotation.Nullable;
@ -756,5 +756,5 @@ index 334bd5bb3f..f5b31237fc 100644
 
     public CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0102-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
+++ b/Spigot-Server-Patches/0102-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch
@ -1,11 +1,11 @@
-From 45acb4c5daea64d899ce433dee3e349909d876ac Mon Sep 17 00:00:00 2001
+From 634403cc9477224cb29aec45f4851368c85cccb3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 69bfe62416..20b04e120f 100644
+index dc3438890b..cbfe12734d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -228,4 +228,9 @@ public class PaperConfig {
@ -31,5 +31,5 @@ index fab5962e2a..de7ac6c205 100644
 
             nbttagcompound.setString("Name", scoreboardteam.getName());
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0103-System-property-for-disabling-watchdoge.patch
+++ b/Spigot-Server-Patches/0103-System-property-for-disabling-watchdoge.patch
@ -1,4 +1,4 @@
-From 1162b3163b9e8214ec7ff82d6d5d1ec50e3f7b93 Mon Sep 17 00:00:00 2001
+From ec896ab8fe94d7c7070fe71aa32c8f42e28d91bb Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
@ -18,5 +18,5 @@ index 56f5f54bd1..9532aada82 100644
                 Logger log = Bukkit.getServer().getLogger();
                 log.log( Level.SEVERE, "------------------------------" );
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0104-Optimize-UserCache-Thread-Safe.patch
+++ b/Spigot-Server-Patches/0104-Optimize-UserCache-Thread-Safe.patch
@ -1,4 +1,4 @@
-From 2e5a1a3634a10dcdc74ea8769675d9103b2071f6 Mon Sep 17 00:00:00 2001
+From a9721e0704e80f7086fde3be20241a9f138bdb6b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 20:47:41 -0400
 Subject: [PATCH] Optimize UserCache / Thread Safe
--- a/Spigot-Server-Patches/0105-Avoid-blocking-on-Network-Manager-creation.patch
+++ b/Spigot-Server-Patches/0105-Avoid-blocking-on-Network-Manager-creation.patch
@ -1,4 +1,4 @@
-From 087a75360c608130b4ae7605212b1ea28c9d2a62 Mon Sep 17 00:00:00 2001
+From 270adc7982223bfce1adc8bfc952132e8473f6a8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 23:19:16 -0400
 Subject: [PATCH] Avoid blocking on Network Manager creation
@ -43,5 +43,5 @@ index 42c654a1da..e7ed6af9cb 100644
             if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
             {
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0106-Optional-TNT-doesn-t-move-in-water.patch
+++ b/Spigot-Server-Patches/0106-Optional-TNT-doesn-t-move-in-water.patch
@ -1,4 +1,4 @@
-From 9098716df661037fb74460e7b22722ef5443d970 Mon Sep 17 00:00:00 2001
+From ad12912df3204334e006aa4d5a73bcf41331fe08 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water
--- a/Spigot-Server-Patches/0107-Faster-redstone-torch-rapid-clock-removal.patch
+++ b/Spigot-Server-Patches/0107-Faster-redstone-torch-rapid-clock-removal.patch
@ -1,4 +1,4 @@
-From 6d4f20ebd127d136f26deea0a6cd2868bb67d488 Mon Sep 17 00:00:00 2001
+From 59e9d3e9052037b0cb8707da5818135844cd8c2c Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Mon, 23 May 2016 12:12:37 +0200
 Subject: [PATCH] Faster redstone torch rapid clock removal
@ -77,7 +77,7 @@ index a99f979eff..919ba8a14d 100644
         public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
             this.a = blockposition;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ce710c730d..c6048d3d4a 100644
+index f6cb4d45eb..ec69c25394 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -99,6 +99,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@ -89,5 +89,5 @@ index ce710c730d..c6048d3d4a 100644
     public CraftWorld getWorld() {
         return this.world;
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0108-Add-server-name-parameter.patch
+++ b/Spigot-Server-Patches/0108-Add-server-name-parameter.patch
@ -1,4 +1,4 @@
-From 46a4efe99372dd5565bf2c45b4acecae192f90b6 Mon Sep 17 00:00:00 2001
+From 4d858c9be7f60c1edfd18695e09e3b9bb1191046 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter
@ -24,5 +24,5 @@ index 7f5ea764d7..c5d5121fd9 100644
         };
 
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0109-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
+++ b/Spigot-Server-Patches/0109-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch
@ -1,4 +1,4 @@
-From 820774e628420387a7df04ac381e31bfbbe7fa7f Mon Sep 17 00:00:00 2001
+From bf98b78eaa30cea4b0790456ae8abcf32081d9d9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 May 2016 22:53:50 -0400
 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
@ -6,7 +6,7 @@ Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
 Also fix view distance lookup

 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 015918e3b3..6ac0546029 100644
+index 9ecbc8e3e6..0421052d21 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -563,8 +563,11 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@ -24,7 +24,7 @@ index 015918e3b3..6ac0546029 100644
                     double deltaZ = this.locZ - player.locZ;
                     double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 diff --git a/src/main/java/net/minecraft/server/EntityWither.java b/src/main/java/net/minecraft/server/EntityWither.java
-index de6c70e3e7..e3feb39ad0 100644
+index 92acd504ad..ee1b0a8846 100644
 --- a/src/main/java/net/minecraft/server/EntityWither.java
 +++ b/src/main/java/net/minecraft/server/EntityWither.java
@@ -207,8 +207,11 @@ public class EntityWither extends EntityMonster implements IRangedEntity {
@ -42,5 +42,5 @@ index de6c70e3e7..e3feb39ad0 100644
                     double deltaZ = this.locZ - player.locZ;
                     double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0110-Fix-Double-World-Add-issues.patch
+++ b/Spigot-Server-Patches/0110-Fix-Double-World-Add-issues.patch
@ -1,4 +1,4 @@
-From 3191991ea7c7d2a7e12b03cad3bee921b8f2c97f Mon Sep 17 00:00:00 2001
+From 417e09c01cdadc732b5c9ea0ba14c591af101d2b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues
--- a/Spigot-Server-Patches/0111-Fix-Old-Sign-Conversion.patch
+++ b/Spigot-Server-Patches/0111-Fix-Old-Sign-Conversion.patch
@ -1,4 +1,4 @@
-From f24a7c8a5f0f943f7e35d0090fb465d75eeb95b3 Mon Sep 17 00:00:00 2001
+From cd69e9e378344e8dc74dbc6c16193fb4bed87c7b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 17 Jun 2016 20:50:11 -0400
 Subject: [PATCH] Fix Old Sign Conversion
@ -9,7 +9,7 @@ Subject: [PATCH] Fix Old Sign Conversion
   This causes Igloos and such to render broken signs. We fix this by ignoring sign conversion for Defined Structures

 diff --git a/src/main/java/net/minecraft/server/DefinedStructure.java b/src/main/java/net/minecraft/server/DefinedStructure.java
-index dff181f1c2..9868677f67 100644
+index 7bcd9786a2..775ec63890 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructure.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructure.java
@@ -203,9 +203,11 @@ public class DefinedStructure {
@ -25,7 +25,7 @@ index dff181f1c2..9868677f67 100644
                             }
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 1307152997..35574a5ef3 100644
+index e79e256138..5e495a4b8c 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
@@ -20,6 +20,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
@ -58,5 +58,5 @@ index a8f0aae9ea..2c6ce5bae0 100644
                 if (this.world instanceof WorldServer) {
                     try {
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0112-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
+++ b/Spigot-Server-Patches/0112-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch
@ -1,4 +1,4 @@
-From 5436e83fb221bed58113f08c09a7d7d19cff748d Mon Sep 17 00:00:00 2001
+From 4ac81c1e86b4f273d6a420bee1d3f6d199c78c43 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 16 Jul 2016 19:11:17 -0500
 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
@ -18,5 +18,5 @@ index ea02567554..b0d883d493 100644
             GameProfile gameprofile = new GameProfile(uuid, s);
 
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0113-More-informative-vehicle-moved-wrongly-message.patch
+++ b/Spigot-Server-Patches/0113-More-informative-vehicle-moved-wrongly-message.patch
@ -1,11 +1,11 @@
-From a076039aba3c69b9a1ce81454e1f3da132e6a3ee Mon Sep 17 00:00:00 2001
+From ad2ef25c9755f2a4327d11762dc61d0bb21b247e Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Jul 2016 17:58:53 -0500
 Subject: [PATCH] More informative vehicle moved wrongly message


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index e88abe1d05..630059246f 100644
+index bbc5acd7fe..7c0d487d79 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -361,7 +361,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -18,5 +18,5 @@ index e88abe1d05..630059246f 100644
                 Location curPos = this.getPlayer().getLocation(); // Spigot
 
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0114-Re-track-players-that-dismount-from-other-players.patch
+++ b/Spigot-Server-Patches/0114-Re-track-players-that-dismount-from-other-players.patch
@ -1,4 +1,4 @@
-From 711bddf91f2f0f5faa884ddee9c23fc82c932cad Mon Sep 17 00:00:00 2001
+From 78742615c480b6d54afdd2fa44545208a1fcfd39 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
--- a/Spigot-Server-Patches/0115-Add-setting-for-proxy-online-mode-status.patch
+++ b/Spigot-Server-Patches/0115-Add-setting-for-proxy-online-mode-status.patch
@ -1,11 +1,11 @@
-From 52368ff2375c884b524f0412d1e3a9cc6b26f345 Mon Sep 17 00:00:00 2001
+From f9b2e14ab8d59acfe5808b30a40bd4615b0ab740 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 20b04e120f..3d9dba7696 100644
+index cbfe12734d..1daa2e4535 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -22,6 +22,7 @@ import org.bukkit.configuration.InvalidConfigurationException;
@ -45,7 +45,7 @@ index 21a8ed3231..0794aff5b7 100644
         } else {
             String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 86aa2ad322..d1c09b4513 100644
+index 2bd50c24b9..064969774b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -1352,7 +1352,8 @@ public final class CraftServer implements Server {
@ -59,5 +59,5 @@ index 86aa2ad322..d1c09b4513 100644
                 profile = console.getUserCache().getProfile( name );
             }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0116-Optimise-BlockState-s-hashCode-equals.patch
+++ b/Spigot-Server-Patches/0116-Optimise-BlockState-s-hashCode-equals.patch
@ -1,4 +1,4 @@
-From c8f85f355c26cefcb326e4f7f01dafaa3a24be26 Mon Sep 17 00:00:00 2001
+From 01c9e8a7af6982d935d845f14ccf21a561d72c14 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 19 Aug 2016 01:52:56 +0100
 Subject: [PATCH] Optimise BlockState's hashCode/equals
@ -83,5 +83,5 @@ index 6861c2b058..74ef699520 100644
             return true;
         } else if (object instanceof BlockStateInteger && super.equals(object)) {
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0117-Configurable-packet-in-spam-threshold.patch
+++ b/Spigot-Server-Patches/0117-Configurable-packet-in-spam-threshold.patch
@ -1,11 +1,11 @@
-From 5eed28327251de415c39d6379b6d50a67df81810 Mon Sep 17 00:00:00 2001
+From 138c139b0ac064487751809cf99976ea857e2a81 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 3d9dba7696..5c7f170907 100644
+index 1daa2e4535..5d0645c829 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -243,4 +243,13 @@ public class PaperConfig {
@ -23,7 +23,7 @@ index 3d9dba7696..5c7f170907 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 630059246f..fd990e703c 100644
+index 7c0d487d79..31b8524c40 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1220,13 +1220,14 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -44,5 +44,5 @@ index 630059246f..fd990e703c 100644
             limitedPackets = 0;
             return true;
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0118-Configurable-flying-kick-messages.patch
+++ b/Spigot-Server-Patches/0118-Configurable-flying-kick-messages.patch
@ -1,11 +1,11 @@
-From 93fd80f450c951685ef7121cea5c81b7e1df40bd Mon Sep 17 00:00:00 2001
+From 2d4dff0ea534d2b92e7c2699f8532d830219e053 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5c7f170907..503e137750 100644
+index 5d0645c829..b5a50afd24 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -252,4 +252,11 @@ public class PaperConfig {
@ -21,7 +21,7 @@ index 5c7f170907..503e137750 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index fd990e703c..d2c178429d 100644
+index 31b8524c40..49d2299eff 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -144,7 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@ -43,5 +43,5 @@ index fd990e703c..d2c178429d 100644
                 }
             } else {
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0119-Chunk-registration-fixes.patch
+++ b/Spigot-Server-Patches/0119-Chunk-registration-fixes.patch
@ -1,4 +1,4 @@
-From 781ea70b4f2e52de52366fe9341c3504e44eaf7f Mon Sep 17 00:00:00 2001
+From 13accd53a25699c460e044a5b1c5825016fd7e16 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes
@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent

 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f03804bfbb..ebd1ff1d50 100644
+index 8fd4478f2b..6bd60ce46c 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
@@ -624,7 +624,7 @@ public class WorldServer extends World {
@ -21,5 +21,5 @@ index f03804bfbb..ebd1ff1d50 100644
 
         if (!entity.inChunk || entity.chunkX != i || entity.chunkY != j || entity.chunkZ != k) {
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0120-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
+++ b/Spigot-Server-Patches/0120-Remove-FishingHook-reference-on-Craft-Entity-removal.patch
@ -1,4 +1,4 @@
-From b6a854c8e2853cf5329ae7a0e67a05e7cf6be01e Mon Sep 17 00:00:00 2001
+From 984cd1145835040e82bfcfe67a83a4976cb2ab4b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 16 Jun 2016 00:17:23 -0400
 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal
@ -25,5 +25,5 @@ index 1ed9a4e32e..9eb9801376 100644
 +    
 }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0121-Auto-fix-bad-Y-levels-on-player-login.patch
+++ b/Spigot-Server-Patches/0121-Auto-fix-bad-Y-levels-on-player-login.patch
@ -1,4 +1,4 @@
-From 806c5048a46d06f9448db8d45fe6be4eabe4f911 Mon Sep 17 00:00:00 2001
+From 170a97e6bab63ff70fa39bc14cd51375fdb6b74d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
--- a/Spigot-Server-Patches/0122-Option-to-remove-corrupt-tile-entities.patch
+++ b/Spigot-Server-Patches/0122-Option-to-remove-corrupt-tile-entities.patch
@ -1,4 +1,4 @@
-From a2dcc102be77a4a8396d4bfa981d8a98b0585868 Mon Sep 17 00:00:00 2001
+From 83b2f4fb5840f8237a3c42bf09ead19888c0d422 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
@ -19,7 +19,7 @@ index 92ab55182f..eed454bf40 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index f9b6970ae6..98c2de5507 100644
+index 3d366ddeb2..cacef3ac9f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -533,6 +533,12 @@ public class Chunk implements IChunkAccess {
@ -36,5 +36,5 @@ index f9b6970ae6..98c2de5507 100644
             // CraftBukkit end
         }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0123-Add-EntityZapEvent.patch
+++ b/Spigot-Server-Patches/0123-Add-EntityZapEvent.patch
@ -1,4 +1,4 @@
-From 488f3c7f82abf9110bec823d81b0d5848a1eb2f8 Mon Sep 17 00:00:00 2001
+From d3f655a1ce1d75488a5ab18caf0020b0743a86ae Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent
--- a/Spigot-Server-Patches/0124-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
+++ b/Spigot-Server-Patches/0124-Don-t-load-Chunks-from-Hoppers-and-other-things.patch
@ -1,4 +1,4 @@
-From 72962248955c09915aa74c5c5a0ab69ca8092c90 Mon Sep 17 00:00:00 2001
+From b69e373bb7de1abeaae748b3ae900241fddd39f1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things
@ -13,7 +13,7 @@ This of course is undesirable, so just return the loaded side as "primary"
 and treat it as a single chest if the other sides are unloaded

 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index 5fd6061f60..af18759ee4 100644
+index 65b616481e..8183a61c9d 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
@@ -227,7 +227,12 @@ public class BlockChest extends BlockTileEntity implements IBlockWaterlogged {
@ -31,5 +31,5 @@ index 5fd6061f60..af18759ee4 100644
                 if (iblockdata1.getBlock() == iblockdata.getBlock()) {
                     BlockPropertyChestType blockpropertychesttype1 = (BlockPropertyChestType) iblockdata1.get(BlockChest.b);
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0125-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
+++ b/Spigot-Server-Patches/0125-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch
@ -1,4 +1,4 @@
-From 534f1cf5c45d4d413c99733210dd85860caf7934 Mon Sep 17 00:00:00 2001
+From 245b1105e503637337735834ddea9ee8015defb3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
@ -30,7 +30,7 @@ index eed454bf40..4892113a15 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 23a1f8c77c..a86dd55292 100644
+index 9d86beda9e..44dd99ea21 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
@@ -232,6 +232,15 @@ public class EntityFallingBlock extends Entity {
--- a/Spigot-Server-Patches/0126-Cache-user-authenticator-threads.patch
+++ b/Spigot-Server-Patches/0126-Cache-user-authenticator-threads.patch
@ -1,4 +1,4 @@
-From 83603e56bc06c14e18250fa7bde1afb4182b2443 Mon Sep 17 00:00:00 2001
+From 6ee6eb5ba5a2da7dcc4fcbeb187d1a61d01d28e1 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads
@ -66,5 +66,5 @@ index b85b048ace..22d5c7d20a 100644
     }
 
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0127-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0127-Optimise-removeQueue.patch
@ -1,4 +1,4 @@
-From 552c591c8c4d8848e81c63e8dc4e25433f43098f Mon Sep 17 00:00:00 2001
+From ed828ddc907f52c204ea2f7118569aa7093b0c58 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue
--- a/Spigot-Server-Patches/0128-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0128-Allow-Reloading-of-Command-Aliases.patch
@ -1,4 +1,4 @@
-From 7a062ff681cbc396ec082939c1b38acc783f9515 Mon Sep 17 00:00:00 2001
+From ac9880ce3b57a21a033a6e6f6a50a02ba352718a Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 337aea2dc..a63a3798c 100644
+index 064969774b..5712560058 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
@@ -2071,5 +2071,24 @@ public final class CraftServer implements Server {
--- a/Spigot-Server-Patches/0129-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0129-Add-source-to-PlayerExpChangeEvent.patch
@ -1,11 +1,11 @@
-From 8ddeb2009ad01fc6ee3ff8a2ee3ba8d2a907d092 Mon Sep 17 00:00:00 2001
+From b145b409818c3a79f83f36cd1b6e7edef34969ad Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent


 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index b20813be64..bfba08fb24 100644
+index 26a3a1d03a..a4cd502bca 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -190,7 +190,7 @@ public class EntityExperienceOrb extends Entity {
@ -18,7 +18,7 @@ index b20813be64..bfba08fb24 100644
 
                 this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a26ecc86f6..e597f37903 100644
+index cf1abd1875..445f2aef95 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -106,6 +106,7 @@ import org.bukkit.entity.ThrownPotion;
@ -48,5 +48,5 @@ index a26ecc86f6..e597f37903 100644
         return handleBlockGrowEvent(world, pos, block, 3);
     }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0130-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0130-Optimize-World.isLoaded-BlockPosition-Z.patch
@ -1,4 +1,4 @@
-From d32d0431d4d152f44d3e35c9318481c6b44e934c Mon Sep 17 00:00:00 2001
+From faa1b636f4ab2334b575232edef0fb8e30468b61 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c6048d3d4a..a8cfdd0eee 100644
+index ec69c25394..9142edd4f8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -209,6 +209,10 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose
@ -21,5 +21,5 @@ index c6048d3d4a..a8cfdd0eee 100644
     public boolean isLoadedAndInBounds(BlockPosition blockposition) {
         return getWorldBorder().isInBounds(blockposition) && getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null;
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0131-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0131-Don-t-let-fishinghooks-use-portals.patch
@ -1,11 +1,11 @@
-From 85be9c35dfdec0ea13c3bacba04bcc608d39d9d4 Mon Sep 17 00:00:00 2001
+From 60eab5063789e0ce5d62881948cad28c890e40d7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4ef333ef12..c5576e0325 100644
+index 44709d5d46..58f7bb658f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -156,7 +156,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -18,7 +18,7 @@ index 4ef333ef12..c5576e0325 100644
     public DimensionManager dimension;
     protected BlockPosition al;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 19a6233c3f..390f1a24d0 100644
+index 84e6d660d3..74b726937e 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -163,6 +163,12 @@ public class EntityFishingHook extends Entity {
@ -35,5 +35,5 @@ index 19a6233c3f..390f1a24d0 100644
     }
 
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0132-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0132-Add-ProjectileCollideEvent.patch
@ -1,11 +1,11 @@
-From 303e19d604d675467fcfdc323aa5e5512833511b Mon Sep 17 00:00:00 2001
+From 9e59579b000cb3ac3240be5bdb9c9725d22892a1 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent


 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 28fc512bab..5ee0802e04 100644
+index 44ea39e3d1..fa46dedb83 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
@@ -184,6 +184,16 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@ -26,7 +26,7 @@ index 28fc512bab..5ee0802e04 100644
                     this.a((MovingObjectPosition) object);
                     this.impulse = true;
 diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
-index faf0647574..fe4e993d5c 100644
+index 1a9fee8da1..14c4394933 100644
 --- a/src/main/java/net/minecraft/server/EntityFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireball.java
@@ -67,7 +67,16 @@ public abstract class EntityFireball extends Entity {
@ -48,7 +48,7 @@ index faf0647574..fe4e993d5c 100644
 
                 // CraftBukkit start - Fire ProjectileHitEvent
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 390f1a24d0..758559d35d 100644
+index 74b726937e..05fa5cd6af 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -217,7 +217,16 @@ public class EntityFishingHook extends Entity {
--- a/Spigot-Server-Patches/0133-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0133-Prevent-Pathfinding-out-of-World-Border.patch
@ -1,4 +1,4 @@
-From 6bd0cb7d5c929286f4fde9332bd37fff86afa1b2 Mon Sep 17 00:00:00 2001
+From 562c5614110ce24da2f2e220cfa45786010c56b7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border
@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border
 This prevents Entities from trying to run outside of the World Border

 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index ed69eaa176..a473c03b9d 100644
+index 8b05b8acd8..65b38d75b4 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -95,6 +95,7 @@ public abstract class NavigationAbstract {
@ -18,5 +18,5 @@ index ed69eaa176..a473c03b9d 100644
             return null;
         } else if (!this.a()) {
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0134-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0134-Bound-Treasure-Maps-to-World-Border.patch
@ -1,4 +1,4 @@
-From c805f6549209e45d27672bb6edcf7e5e03241f86 Mon Sep 17 00:00:00 2001
+From a9da592db6a1b23e9f7cbc6702363dcce57ea9e3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border
@ -23,7 +23,7 @@ index 464e1e101a..7b2eace75c 100644
 
                                 if (structurestart != null && structurestart.e()) {
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 77b805f3ae..1e622a0434 100644
+index 1388610a7b..8902581376 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
@@ -24,6 +24,18 @@ public class WorldBorder {
@ -46,5 +46,5 @@ index 77b805f3ae..1e622a0434 100644
         return (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e() && (double) chunkcoordintpair.g() > this.d() && (double) chunkcoordintpair.e() < this.f();
     }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0135-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0135-Configurable-Cartographer-Treasure-Maps.patch
@ -1,4 +1,4 @@
-From 208c79c5f233446a430809e437d2f300299ae608 Mon Sep 17 00:00:00 2001
+From 7ed82a5f1625536217b8d9d482843c3b44fc24dc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@ -40,5 +40,5 @@ index 2a4e4f7859..0b66323698 100644
 
             if (blockposition != null) {
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0136-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0136-Optimize-ItemStack.isEmpty.patch
@ -1,4 +1,4 @@
-From 0d1aa8b0f00b719abe1a5aa9d3b188caec784a56 Mon Sep 17 00:00:00 2001
+From ca5d889e447186ee476dd04b849c5ba3a319be9b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary

 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index b643a41235..b7d327211c 100644
+index 5bc078d314..09d0de48e8 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -145,7 +145,7 @@ public final class ItemStack {
@ -19,5 +19,5 @@ index b643a41235..b7d327211c 100644
 
     public ItemStack cloneAndSubtract(int i) {
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0137-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0137-Add-API-methods-to-control-if-armour-stands-can-move.patch
@ -1,11 +1,11 @@
-From e9365a29ab4cec0deea0498aa8db4a1a2497b4ef Mon Sep 17 00:00:00 2001
+From 92409889b996769785a3bda1db6c605081dec4a4 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move


 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index bee5444989..1ae3ffa666 100644
+index 2ba9cc9fec..ccdd0d27e3 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -43,6 +43,7 @@ public class EntityArmorStand extends EntityLiving {
@ -52,5 +52,5 @@ index 2b66a08ade..124c3185bc 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0138-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0138-Properly-fix-item-duplication-bug.patch
@ -1,4 +1,4 @@
-From 25310ce37d460f67350b589d4c816932835d3bc8 Mon Sep 17 00:00:00 2001
+From cfcdc41816f6c2f0160bcf7c24b2637d4f9001b6 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
--- a/Spigot-Server-Patches/0139-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0139-String-based-Action-Bar-API.patch
@ -1,4 +1,4 @@
-From f1d16cb1aee6052f8cce8e79053ce2ff6ef0e923 Mon Sep 17 00:00:00 2001
+From 78844c50d111bbf2057a4e8d314f9a5950440823 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
--- a/Spigot-Server-Patches/0140-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0140-Firework-API-s.patch
@ -1,11 +1,11 @@
-From e28ce87f55dc8e8275e90c00ef83d989b86fb299 Mon Sep 17 00:00:00 2001
+From 87cebc52b802b5c19db5d61c746477912f5c360f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's


 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 959ad19dec..b3f39d5a2f 100644
+index 25851b70ca..ffd379c970 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
@@ -3,6 +3,8 @@ package net.minecraft.server;
@ -134,5 +134,5 @@ index 6b69be7421..37374ae5b3 100644
 +    // Paper end
 }
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0141-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0141-PlayerTeleportEndGatewayEvent.patch
@ -1,4 +1,4 @@
-From 1ec750a1e9fffe5959c08da9927f1e8e8e09753b Mon Sep 17 00:00:00 2001
+From af4af9976fb10b41c436513723fa9f58c7bc3baf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@ -19,5 +19,5 @@ index 2f44cf89f9..1783f59140 100644
                     if (teleEvent.isCancelled()) {
                         return;
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0142-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0142-Provide-E-TE-Chunk-count-stat-methods.patch
@ -1,4 +1,4 @@
-From c4c9bd77113a059d54e10603eb602a8454310e36 Mon Sep 17 00:00:00 2001
+From 8630f7f8db241e12a753cafae1d81092a54c3fc1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
--- a/Spigot-Server-Patches/0143-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0143-Enforce-Sync-Player-Saves.patch
@ -1,4 +1,4 @@
-From a8a8f44e6b5ff879b3df33496bb1529836997fc6 Mon Sep 17 00:00:00 2001
+From 3680d942009e273966790b51f05ee712053bb431 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.

 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ca6863adc4..99aedfe8d5 100644
+index ee5297dc38..ccf8b7c707 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -930,11 +930,13 @@ public abstract class PlayerList {
@ -25,5 +25,5 @@ index ca6863adc4..99aedfe8d5 100644
 
     public WhiteList getWhitelist() {
 -- 
-2.21.0
+2.22.0

--- a/Spigot-Server-Patches/0144-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0144-Don-t-allow-entities-to-ride-themselves-572.patch
@ -1,4 +1,4 @@
-From f75ca265343834ec3ad756ba51d8c526b5b532e4 Mon Sep 17 00:00:00 2001
+From 9b3f4c490e738a0d2f35ebf3b8faa6d5d454b9b2 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
--- a/Mehr anzeigen
+++ b/Mehr anzeigen