Drop Ignore-Missing-Recipes-in-RecipeBook-to-avoid-data-e.patch

This patch appears to be no longer relevant, and is seemingly a leading
cause of datapack performance being horrific

Spigot-Server-Patches/0102-Avoid-blocking-on-Network-Manager-creation.patch

@@ -1,4 +1,4 @@
-From 55ced1105b5d5fe2f705ff0fdeeaa7f00fe95294 Mon Sep 17 00:00:00 2001
+From 3bf973d26328e2f06667c9ecd43998ac5a1fb446 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Avoid blocking on Network Manager creation
 Per Paper issue 294
 
 diff --git a/src/main/java/net/minecraft/server/ServerConnection.java b/src/main/java/net/minecraft/server/ServerConnection.java
-index e7e21685..404e7834 100644
+index e7e216850..37a22ba6f 100644
 --- a/src/main/java/net/minecraft/server/ServerConnection.java
 +++ b/src/main/java/net/minecraft/server/ServerConnection.java
 @@ -39,6 +39,15 @@ public class ServerConnection {
@@ -43,4 +43,5 @@ index e7e21685..404e7834 100644
              if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
              {
 -- 
-2.17.1
+2.25.1
+

Spigot-Server-Patches/0232-EntityShootBowEvent-consumeArrow-and-getArrowItem-AP.patch

@@ -1,4 +1,4 @@
-From 37e33369c3579bbdf56a449fbeb38e83e1433564 Mon Sep 17 00:00:00 2001
+From 403fc7f5a6970b4b9a8e61594897dc3fd34ef494 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 15 Jun 2013 19:51:17 -0400
 Subject: [PATCH] EntityShootBowEvent consumeArrow and getArrowItem API
@@ -104,5 +104,5 @@ index f9b0f39f7..caf277439 100644
  
          return event;
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,36 +0,0 @@
-From f515ce3d4d364afc397e823afbf29457bca7cf4a Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sat, 16 Jun 2018 16:23:38 -0400
-Subject: [PATCH] Ignore Missing Recipes in RecipeBook to avoid data errors
-
-This code was causing NPE's in saving player data, potentially related to reloads.
-
-diff --git a/src/main/java/net/minecraft/server/RecipeBookServer.java b/src/main/java/net/minecraft/server/RecipeBookServer.java
-index 0203e26ec..aa6e5681f 100644
---- a/src/main/java/net/minecraft/server/RecipeBookServer.java
-+++ b/src/main/java/net/minecraft/server/RecipeBookServer.java
-@@ -79,6 +79,10 @@ public class RecipeBookServer extends RecipeBook {
- 
-         while (iterator.hasNext()) {
-             MinecraftKey minecraftkey = (MinecraftKey) iterator.next();
-+            // Paper start - ignore missing recipes
-+            final Optional<? extends IRecipe<?>> recipe = this.l.a(minecraftkey);
-+            if (!recipe.isPresent()) continue;
-+            // Paper end
- 
-             nbttaglist.add(NBTTagString.a(minecraftkey.toString()));
-         }
-@@ -89,6 +93,10 @@ public class RecipeBookServer extends RecipeBook {
- 
-         while (iterator1.hasNext()) {
-             MinecraftKey minecraftkey1 = (MinecraftKey) iterator1.next();
-+            // Paper start - ignore missing recipes
-+            final Optional<? extends IRecipe<?>> recipe = this.l.a(minecraftkey1);
-+            if (!recipe.isPresent()) continue;
-+            // Paper end
- 
-             nbttaglist1.add(NBTTagString.a(minecraftkey1.toString()));
-         }
--- 
-2.25.0.windows.1
-

Spigot-Server-Patches/0233-PlayerReadyArrowEvent.patch

@@ -1,4 +1,4 @@
-From a357c5059ef997e144535886449cf34ea30c8ae4 Mon Sep 17 00:00:00 2001
+From 84996a89580e1171c42e4871b8e82043622cc595 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 01:12:53 -0400
 Subject: [PATCH] PlayerReadyArrowEvent
@@ -7,7 +7,7 @@ Called when a player is firing a bow and the server is choosing an arrow to use.
 Plugins can skip selection of certain arrows and control which is used.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 1d3c7ce488..4721c288ba 100644
+index 1d3c7ce48..4721c288b 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2157,6 +2157,17 @@ public abstract class EntityHuman extends EntityLiving {
@@ -38,5 +38,5 @@ index 1d3c7ce488..4721c288ba 100644
                      }
                  }
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0234-Fire-EntityShootBowEvent-for-Illusioner.patch

@@ -1,4 +1,4 @@
-From 8a9248e1324f866573fb7013ad89d0a7812affd5 Mon Sep 17 00:00:00 2001
+From 5cade1df1ba14c3675f0a17c9cfd62237313056f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 18 Jun 2018 22:19:36 -0400
 Subject: [PATCH] Fire EntityShootBowEvent for Illusioner
@@ -29,5 +29,5 @@ index 2ea0583a3..81b7cd06f 100644
  
      class a extends EntityIllagerWizard.c {
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0235-Implement-EntityKnockbackByEntityEvent.patch

@@ -1,4 +1,4 @@
-From ebd1410d870c38f3e1cacd5bc446639fa3f3226e Mon Sep 17 00:00:00 2001
+From 90dd27292788b75a84247749bc49342b85bc0f87 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Mon, 18 Jun 2018 15:46:23 +0200
 Subject: [PATCH] Implement EntityKnockbackByEntityEvent
@@ -27,5 +27,5 @@ index a738848ec..2196dbfce 100644
      }
  
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From 993655ee16a3acee6e738dda4c754537d2b1c680 Mon Sep 17 00:00:00 2001
+From 5652c286dae234aefa2136dd3db4575e7e7012f8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Jun 2018 23:17:24 -0400
 Subject: [PATCH] Expand Explosions API
@@ -6,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/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index aefa7bb18..a58337be3 100644
+index f5a3dd484..9552d409e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -871,6 +871,11 @@ public class CraftWorld implements World {
@@ -22,5 +22,5 @@ index aefa7bb18..a58337be3 100644
      @Override
      public boolean createExplosion(Location loc, float power) {
 -- 
-2.25.0
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From 62d366be402dc4ebd7d813e5e383d400202cfe46 Mon Sep 17 00:00:00 2001
+From d28986f2f3395d26ed21732afea59fb4d901903c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Jun 2018 00:21:28 -0400
 Subject: [PATCH] LivingEntity Hand Raised/Item Use API
@@ -6,7 +6,7 @@ Subject: [PATCH] LivingEntity Hand Raised/Item Use API
 How long an entity has raised hands to charge an attack or use an item
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2196dbfce9..fea821be1c 100644
+index 2196dbfce..fea821be1 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -112,7 +112,7 @@ public abstract class EntityLiving extends Entity {
@@ -32,7 +32,7 @@ index 2196dbfce9..fea821be1c 100644
          return this.isHandRaised() ? this.activeItem.k() - this.dE() : 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 7d89c0e8e5..02346f1c50 100644
+index 7d89c0e8e..02346f1c5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -654,5 +654,25 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -62,5 +62,5 @@ index 7d89c0e8e5..02346f1c50 100644
      // Paper end
  }
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0238-RangedEntity-API.patch

@@ -1,4 +1,4 @@
-From 4011816022ca926c37a6617b631eab9967362037 Mon Sep 17 00:00:00 2001
+From 0d672c41952443ff1d66b7b9d20bd7123cc547b4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 26 Jun 2018 22:00:49 -0400
 Subject: [PATCH] RangedEntity API
@@ -158,5 +158,5 @@ index 38b555cc7..03cf6136e 100644
      private BossBar bossBar;
  
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0239-Add-config-to-disable-ender-dragon-legacy-check.patch

@@ -1,4 +1,4 @@
-From feef818cc5cfdd932c98332379135eb104f4d78a Mon Sep 17 00:00:00 2001
+From c5fcf0e51be374de58eb2beac360264b84354a20 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 22 Jun 2018 10:38:31 -0500
 Subject: [PATCH] Add config to disable ender dragon legacy check
@@ -47,5 +47,5 @@ index 909d13c42..218c04245 100644
          if (nbttagcompound.hasKeyOfType("DragonKilled", 99)) {
              if (nbttagcompound.b("DragonUUID")) {
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,11 +1,11 @@
-From 35945816d00a9dff5cedd0f1d8c4b0cb946a0409 Mon Sep 17 00:00:00 2001
+From f44b556e643f7c249f90b209f3d588c52994eeb3 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:08:14 +0200
 Subject: [PATCH] Implement World.getEntity(UUID) API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a58337be3..f957d4272 100644
+index 9552d409e..05a6b2504 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1285,6 +1285,15 @@ public class CraftWorld implements World {
@@ -25,5 +25,5 @@ index a58337be3..f957d4272 100644
      public void save() {
          org.spigotmc.AsyncCatcher.catchOp("world save"); // Spigot
 -- 
-2.25.0
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From 395926f7e3d53453169ffd333e788356c979edf5 Mon Sep 17 00:00:00 2001
+From 03c282e818f80d14196d55326936fdd765c10911 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 3 Jul 2018 21:56:23 -0400
 Subject: [PATCH] InventoryCloseEvent Reason API
@@ -7,7 +7,7 @@ Allows you to determine why an inventory was closed, enabling plugin developers
 to "confirm" things based on if it was player triggered close or not.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 4721c288ba..36748ccb73 100644
+index 4721c288b..36748ccb7 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -164,7 +164,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -34,7 +34,7 @@ index 4721c288ba..36748ccb73 100644
          this.activeContainer = this.defaultContainer;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 625b684287..f849dba215 100644
+index 625b68428..f849dba21 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -368,7 +368,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -88,7 +88,7 @@ index 625b684287..f849dba215 100644
          this.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4a0a847944..8eb12e89ea 100644
+index 4a0a84794..8eb12e89e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2040,7 +2040,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -101,7 +101,7 @@ index 4a0a847944..8eb12e89ea 100644
          this.player.m();
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 002f7e844a..fd0f5c6f29 100644
+index 002f7e844..fd0f5c6f2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -403,7 +403,7 @@ public abstract class PlayerList {
@@ -114,7 +114,7 @@ index 002f7e844a..fd0f5c6f29 100644
          PlayerQuitEvent playerQuitEvent = new PlayerQuitEvent(cserver.getPlayer(entityplayer), "\u00A7e" + entityplayer.getName() + " left the game");
          cserver.getPluginManager().callEvent(playerQuitEvent);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c773314cff..bad4e6f7fc 100644
+index c773314cf..bad4e6f7f 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1047,7 +1047,7 @@ public class WorldServer extends World {
@@ -136,7 +136,7 @@ index c773314cff..bad4e6f7fc 100644
                      }
                  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index cd8ad27047..e169679c88 100644
+index cd8ad2704..e169679c8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -619,8 +619,13 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -155,7 +155,7 @@ index cd8ad27047..e169679c88 100644
      @Override
      public boolean isBlocking() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 52640237ae..d7d86a8b24 100644
+index 52640237a..d7d86a8b2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -786,7 +786,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -168,7 +168,7 @@ index 52640237ae..d7d86a8b24 100644
  
          // Check if the fromWorld and toWorld are the same.
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index caf277439a..f931fa48b4 100644
+index caf277439..f931fa48b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1293,8 +1293,19 @@ public class CraftEventFactory {
@@ -193,5 +193,5 @@ index caf277439a..f931fa48b4 100644
          human.activeContainer.transferTo(human.defaultContainer, human.getBukkitEntity());
      }
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0242-Configurable-Bed-Search-Radius.patch

@@ -1,4 +1,4 @@
-From 76f529f06c0254ff538046d8fd57220f3eefaeab Mon Sep 17 00:00:00 2001
+From e1e34ffc3abb34c17b19e507d3e1d4972de73c4c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:22:06 -0400
 Subject: [PATCH] Configurable Bed Search Radius
@@ -149,5 +149,5 @@ index 794756342..06a35629a 100644
          VoxelShape voxelshape = iworldreader.getType(blockposition).getCollisionShape(iworldreader, blockposition);
  
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0243-Vex-getSummoner-API.patch

@@ -1,4 +1,4 @@
-From 7b6494b56f7f05c5d7a55525082a90605161562b Mon Sep 17 00:00:00 2001
+From 8b0a68363ba2615983a36bef836a4984eb19b3e4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 15:30:22 -0400
 Subject: [PATCH] Vex#getSummoner API
@@ -47,5 +47,5 @@ index 737a37b6f..169c951ec 100644
      public String toString() {
          return "CraftVex";
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0244-Refresh-player-inventory-when-cancelling-PlayerInter.patch

@@ -1,4 +1,4 @@
-From 3326c5867df77d3d6ae7ee79d33b2ad7b3ebd72a Mon Sep 17 00:00:00 2001
+From 90ec807ac72876f1190ff8144bcb600453c15175 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 13 Jul 2018 14:54:43 +0200
 Subject: [PATCH] Refresh player inventory when cancelling
@@ -28,5 +28,5 @@ index 8eb12e89e..8648845ac 100644
                      }
                      // CraftBukkit end
 -- 
-2.25.0
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From 6485e9ecad897fa344735fc3ffb9f0b57ce46a81 Mon Sep 17 00:00:00 2001
+From 858907dcfa9ce67019472ceedb6dfb77919873ef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:05:00 -0400
 Subject: [PATCH] Don't change the Entity Random seed for squids
@@ -18,5 +18,5 @@ index 1c1ff2069..92efe4e7f 100644
      }
  
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From c028e6bde7f7c652ca0827017bfdea624603fbe5 Mon Sep 17 00:00:00 2001
+From 172128b3cbbab15cc5ddeddbec8f86ef2af5fada Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:08:05 -0400
 Subject: [PATCH] Re-add vanilla entity warnings for duplicates
@@ -8,7 +8,7 @@ These are a critical sign that somethin went wrong, and you've lost some data...
 We should kind of know about these things you know.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f0c912be43..d46a664bdb 100644
+index bad4e6f7f..c30630fa9 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1032,7 +1032,8 @@ public class WorldServer extends World {
@@ -22,5 +22,5 @@ index f0c912be43..d46a664bdb 100644
          }
      }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0247-Avoid-item-merge-if-stack-size-above-max-stack-size.patch

@@ -1,11 +1,11 @@
-From 5abcca34e2d2e1667c9940c92bbee26f4bbba795 Mon Sep 17 00:00:00 2001
+From 41308cf343500ec700daf71942ced419358d250c Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 16 Jul 2018 12:42:20 +0200
 Subject: [PATCH] Avoid item merge if stack size above max stack size
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index fcc1c0993..5f46c7f86 100644
+index 5efcc50ab..e5c9bac88 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -170,6 +170,10 @@ public class EntityItem extends Entity {
@@ -20,5 +20,5 @@ index fcc1c0993..5f46c7f86 100644
              double radius = world.spigotConfig.itemMerge;
              List<EntityItem> list = this.world.a(EntityItem.class, this.getBoundingBox().grow(radius, radius, radius), (entityitem) -> {
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0248-Use-asynchronous-Log4j-2-loggers.patch

@@ -1,11 +1,11 @@
-From 46899c78b914ac9c9befdc72fb414654ce6335f1 Mon Sep 17 00:00:00 2001
+From e7ee3e6490bc87b238ba0fcb8cd1839abbf4d6a3 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 17 Jul 2018 16:42:17 +0200
 Subject: [PATCH] Use asynchronous Log4j 2 loggers
 
 
 diff --git a/pom.xml b/pom.xml
-index 9e06edfe2..907807ee5 100644
+index 6f2fe9c26..55679af92 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -74,6 +74,13 @@
@@ -54,5 +54,5 @@ index 0694b2146..30efeb5fa 100644
 +log4j2.AsyncQueueFullPolicy="com.destroystokyo.paper.log.LogFullPolicy"
  log4j.skipJansi=true
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From 4f8d778101a5b5dc9ffe73b19f14d72796e5efdb Mon Sep 17 00:00:00 2001
+From 82dec6a475fc31b39a9a1934131e02c1dde08dfa Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 19 Jul 2018 01:13:28 -0400
 Subject: [PATCH] add more information to Entity.toString()
@@ -6,7 +6,7 @@ Subject: [PATCH] add more information to Entity.toString()
 UUID, ticks lived, valid, dead
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 64dc37c70c..ec59ffc2e7 100644
+index 64dc37c70..ec59ffc2e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2499,7 +2499,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,5 +19,5 @@ index 64dc37c70c..ec59ffc2e7 100644
  
      public boolean isInvulnerable(DamageSource damagesource) {
 -- 
-2.25.0
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From 3379865420c1dcc82edb153736223cb3fc735378 Mon Sep 17 00:00:00 2001
+From 8e5d2840e7a280737241deb39703c81b570f4ff0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 08:25:40 -0400
 Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
@@ -6,7 +6,7 @@ Subject: [PATCH] Add Debug Entities option to debug dupe uuid issues
 Add -Ddebug.entities=true to your JVM flags to gain more information
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ec59ffc2e7..2612d60e38 100644
+index ec59ffc2e..2612d60e3 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -76,6 +76,8 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,7 +19,7 @@ index ec59ffc2e7..2612d60e38 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index fcf229ad5d..f640d2ac76 100644
+index fcf229ad5..f640d2ac7 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -1061,6 +1061,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -40,7 +40,7 @@ index fcf229ad5d..f640d2ac76 100644
  
      protected void g() {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5a237fa1dd..1814be9817 100644
+index f349c7fe2..cab9ec5dd 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -63,6 +63,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
@@ -52,7 +52,7 @@ index 5a237fa1dd..1814be9817 100644
      public boolean captureBlockStates = false;
      public boolean captureTreeGeneration = false;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index c30630fa94..70e4b58a93 100644
+index c30630fa9..70e4b58a9 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -76,6 +76,9 @@ public class WorldServer extends World {
@@ -122,5 +122,5 @@ index c30630fa94..70e4b58a93 100644
              // CraftBukkit start - SPIGOT-5278
              if (entity instanceof EntityDrowned) {
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0251-EnderDragon-Events.patch

@@ -1,4 +1,4 @@
-From 1810be56bd2d574eff23ede93286de716da30eb9 Mon Sep 17 00:00:00 2001
+From 12f70d0e821fcf94e04d3ae07a5915f67c02734b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:51:27 -0500
 Subject: [PATCH] EnderDragon Events
@@ -58,5 +58,5 @@ index bc08b53fc..db43ac1cc 100644
              }
  
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0252-PlayerElytraBoostEvent.patch

@@ -1,4 +1,4 @@
-From d4d3cc6be23b114b37ebea6ea438beaafa55e597 Mon Sep 17 00:00:00 2001
+From 2e8a4e34c37924dbff4983f6b6aaeffe92253d17 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 21 Jul 2018 01:59:59 -0500
 Subject: [PATCH] PlayerElytraBoostEvent
@@ -30,5 +30,5 @@ index 92dac35ec..bd524a35b 100644
  
              return InteractionResultWrapper.success(entityhuman.b(enumhand));
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0253-Speedup-BlockPos-by-fixing-inlining.patch

@@ -1,4 +1,4 @@
-From 2f7135a6499499a1f67c56a25881f026a74ee1b2 Mon Sep 17 00:00:00 2001
+From 4256459777a7348525ce2230b1ec54a626df4830 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 71089442c1..c439a8d019 100644
+index 71089442c..c439a8d01 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -7,25 +7,22 @@ import javax.annotation.concurrent.Immutable;
@@ -110,7 +110,7 @@ index 71089442c1..c439a8d019 100644
          return (int) (f + f1 + f2);
      }
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 5dbd3e60fe..e9ea232a78 100644
+index 5dbd3e60f..e9ea232a7 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -342,11 +342,13 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -209,5 +209,5 @@ index 5dbd3e60fe..e9ea232a78 100644
  
          @Override
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0254-Optimize-RegistryID.c.patch

@@ -1,4 +1,4 @@
-From ae9bcdc84f1bc311b5e4bef15658721b17c392a5 Mon Sep 17 00:00:00 2001
+From 52a2b3dbfdcd9dc9d17559be0f1eacc3a03f8cfa Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 23 Jul 2018 13:08:19 -0400
 Subject: [PATCH] Optimize RegistryID.c()
@@ -64,5 +64,5 @@ index e15d28671..e8a48b9a4 100644
  
      public int b() {
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0255-Option-to-prevent-armor-stands-from-doing-entity-loo.patch

@@ -1,4 +1,4 @@
-From 7d627aabb5f289fc6cb4767f06f948cb00ea71f1 Mon Sep 17 00:00:00 2001
+From f693d754977454c76f680711e220d7565bbae95d Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
@@ -38,5 +38,5 @@ index cab9ec5dd..749915198 100644
          int i = MathHelper.floor(axisalignedbb.minX);
          int j = MathHelper.f(axisalignedbb.maxX);
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0256-Vanished-players-don-t-have-rights.patch

@@ -1,4 +1,4 @@
-From e56e57826ef9eb475aa4e63695ef7c21ee67006c Mon Sep 17 00:00:00 2001
+From b6b1a2d029d0bf249832256d1f7b0542e6ab2b39 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 14:22:26 +0200
 Subject: [PATCH] Vanished players don't have rights
@@ -146,5 +146,5 @@ index f931fa48b..317a5bf4e 100644
          return event;
      }
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0257-Mark-chunk-dirty-anytime-entities-change-to-guarante.patch

@@ -1,4 +1,4 @@
-From de9e6201b6df14fa0dfc31a4fcb3037d9a626da3 Mon Sep 17 00:00:00 2001
+From 08dec51859ba7c4f1206df43f6bd32dd53bf4cd1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 22:18:31 -0400
 Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
@@ -26,5 +26,5 @@ index 3af311c6e..68cde3356 100644
          this.entities.remove(entity); // Paper
      }
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0258-Add-some-Debug-to-Chunk-Entity-slices.patch

@@ -1,4 +1,4 @@
-From 45990e551bfbcb491cba48dac25b6b669428216c Mon Sep 17 00:00:00 2001
+From e2bb3541dbb9a1f29b90e194cbe05bcc834e1a7c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 22:44:23 -0400
 Subject: [PATCH] Add some Debug to Chunk Entity slices
@@ -57,7 +57,7 @@ index 68cde3356..1d47e4737 100644
              return;
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fcc47182c..09ec144eb 100644
+index d8f85eda0..ace74179c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -69,5 +69,5 @@ index fcc47182c..09ec144eb 100644
  
      public com.destroystokyo.paper.loottable.PaperLootableInventoryData lootableData; // Paper
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0259-EntityTransformedEvent.patch

@@ -1,4 +1,4 @@
-From 6c4c03f5b661a5a1c2c674fe6b4e613079504979 Mon Sep 17 00:00:00 2001
+From 2ffe51580f5c462b8028922ca61bc36f6bc1a0c6 Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:30:03 -0400
 Subject: [PATCH] EntityTransformedEvent
@@ -61,5 +61,5 @@ index 91cac5d53..8082fa617 100644
          worldserver.addEntity(entityvillager, org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason.CURED); // CraftBukkit - add SpawnReason
          // CraftBukkit end
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0260-SkeletonHorse-Additions.patch

@@ -1,4 +1,4 @@
-From 8bee08608cdd24f44c5b187c54c5bf11c4ca32c5 Mon Sep 17 00:00:00 2001
+From 0ef80e45124c0ed6bc20f23cbc6da5ed15bd1cd7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 27 Jul 2018 22:36:31 -0500
 Subject: [PATCH] SkeletonHorse Additions
@@ -74,5 +74,5 @@ index e822c2200..2a7d1d4ec 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0261-Prevent-Saving-Bad-entities-to-chunks.patch

@@ -1,4 +1,4 @@
-From 1bb924aba6e3b2a14806f3837f67e05731106ed6 Mon Sep 17 00:00:00 2001
+From 10efa52cd47217eb5757530232f015dcfa58b04e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 26 Jul 2018 00:11:12 -0400
 Subject: [PATCH] Prevent Saving Bad entities to chunks
@@ -61,5 +61,5 @@ index 4af5a230b..6371f2f5b 100644
              ProtoChunk protochunk = (ProtoChunk) ichunkaccess;
  
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0262-Don-t-call-getItemMeta-on-hasItemMeta.patch

@@ -1,4 +1,4 @@
-From d510614e516f981c111c5832c6488d5892b44ab4 Mon Sep 17 00:00:00 2001
+From c30ebcb7dec21a9ab0a374cdd3527d7230417b1e Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Thu, 26 Jul 2018 14:10:23 +0200
 Subject: [PATCH] Don't call getItemMeta on hasItemMeta
@@ -77,5 +77,5 @@ index 3a82bede7..d73141839 100644
      public void testConflictingStoredEnchantment() {
          EnchantmentStorageMeta itemMeta = (EnchantmentStorageMeta) Bukkit.getItemFactory().getItemMeta(Material.ENCHANTED_BOOK);
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From 1f36f26c18a57565356f9a8514cc467d7b0094d5 Mon Sep 17 00:00:00 2001
+From 100a6d3800f83f2af6d7200bebf89e5fc12c5262 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
 they shouldn't of been in the list in the first place.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index eecf27370b..d704fc79c0 100644
+index eecf27370..d704fc79c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -179,6 +179,7 @@ public class PaperCommand extends Command {
@@ -23,7 +23,7 @@ index eecf27370b..d704fc79c0 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 1d47e47370..c464d69623 100644
+index 1d47e4737..c464d6962 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -681,6 +681,7 @@ public class Chunk implements IChunkAccess {
@@ -51,7 +51,7 @@ index 1d47e47370..c464d69623 100644
                  if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
                      list.add(t0);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ace74179ce..5d9d32ea45 100644
+index ace74179c..5d9d32ea4 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -195,6 +195,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -63,7 +63,7 @@ index ace74179ce..5d9d32ea45 100644
      public float getBukkitYaw() {
          return this.yaw;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 70e4b58a93..54505e056e 100644
+index 70e4b58a9..54505e056 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -904,7 +904,7 @@ public class WorldServer extends World {
@@ -92,7 +92,7 @@ index 70e4b58a93..54505e056e 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f957d42723..a6a273c31b 100644
+index 05a6b2504..326c3564c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1021,6 +1021,7 @@ public class CraftWorld implements World {
@@ -128,5 +128,5 @@ index f957d42723..a6a273c31b 100644
  
                  if (bukkitEntity == null) {
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0264-MC-111480-Start-Entity-ID-s-at-1.patch

@@ -1,4 +1,4 @@
-From 00c25be7c84bad842cc900163723e1c5929f436d Mon Sep 17 00:00:00 2001
+From b629f1e020482b5c3c7b8354aab7f82b04d492ee Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 22:58:47 -0400
 Subject: [PATCH] MC-111480: Start Entity ID's at 1
@@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special,
 and can break things such as Elytra Fireworks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ca794328a..845993bb4 100644
+index 5d9d32ea4..02aa493f1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -93,7 +93,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -20,5 +20,5 @@ index ca794328a..845993bb4 100644
      private static final AxisAlignedBB d = new AxisAlignedBB(0.0D, 0.0D, 0.0D, 0.0D, 0.0D, 0.0D);
      private static double e = 1.0D;
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0265-Implement-Expanded-ArmorStand-API.patch

@@ -1,4 +1,4 @@
-From 4383b1ee134cc543befaf00f504b7a4016da0ce1 Mon Sep 17 00:00:00 2001
+From 135ee7ade8be2ba0e4e172bd20ead8a359a9dfcc Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Thu, 26 Jul 2018 02:25:46 -0400
 Subject: [PATCH] Implement Expanded ArmorStand API
@@ -126,5 +126,5 @@ index 124c3185b..d1d689e5d 100644
      // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0266-AnvilDamageEvent.patch

@@ -1,4 +1,4 @@
-From 6fb7424d3b3e0451b83a40e963588d4960d89c27 Mon Sep 17 00:00:00 2001
+From b7004155a4eece3f913e23e79f303e2e5c9a0f7c Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 20 Jul 2018 23:37:03 -0500
 Subject: [PATCH] AnvilDamageEvent
@@ -26,5 +26,5 @@ index 1d9ce5ef1..286b930dd 100644
                          if (iblockdata1 == null) {
                              world.a(blockposition, false);
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0267-Add-TNTPrimeEvent.patch

@@ -1,4 +1,4 @@
-From 30d0707a9432fb622ecf7d8ffaf2dc6bb2306690 Mon Sep 17 00:00:00 2001
+From 856dddfd5217457b7e3554c53d2b67f9618ffea3 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 16 Jul 2018 00:05:05 +0300
 Subject: [PATCH] Add TNTPrimeEvent
@@ -115,7 +115,7 @@ index 6cb82420b..592fcd538 100644
                  world.a(blockposition, false);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 07abcc1e2..3df8e30ec 100644
+index 138e2ea56..6a4ccaeb0 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock;
@@ -139,5 +139,5 @@ index 07abcc1e2..3df8e30ec 100644
  
                  this.world.a(blockposition, false);
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0268-Break-up-and-make-tab-spam-limits-configurable.patch

@@ -1,4 +1,4 @@
-From fa2b3cf4d7e1b4f935bf7bf8e7c092a082a96f69 Mon Sep 17 00:00:00 2001
+From 9c0c887a6afa42eabf0c85e15d32c8e3009bbd60 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 29 Jul 2018 05:02:15 +0100
 Subject: [PATCH] Break up and make tab spam limits configurable
@@ -45,7 +45,7 @@ index 26ab855dc..adef07d4d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 3a7e197e3..77c375f71 100644
+index 8648845ac..6627d8402 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -74,5 +74,5 @@ index 3a7e197e3..77c375f71 100644
              return;
          }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0269-Add-hand-to-bucket-events.patch

@@ -1,4 +1,4 @@
-From 9997320f8a64cd61f47e9c255eb5ec1d562095f3 Mon Sep 17 00:00:00 2001
+From af01ef90f1b7dad0af7a9da89c74fd3403a86807 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events
@@ -107,5 +107,5 @@ index 317a5bf4e..f006b441a 100644
          }
  
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0270-MC-135506-Experience-should-save-as-Integers.patch

@@ -1,4 +1,4 @@
-From d5fe8ff182d9cd4c7892c3fcbd9c97eaa3401b9c Mon Sep 17 00:00:00 2001
+From 64d59282e1f9063daca2a22e2fe2b4ae90155a8f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 3 Aug 2018 00:04:54 -0400
 Subject: [PATCH] MC-135506: Experience should save as Integers
@@ -27,5 +27,5 @@ index 87c6b77ce..53c6c3389 100644
      }
  
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0271-Fix-client-rendering-skulls-from-same-user.patch

@@ -1,4 +1,4 @@
-From 786e0d9fafbc25fb577d7f2ebfae70d2e0f3e5f1 Mon Sep 17 00:00:00 2001
+From 3b8f8252fd955b3f1d7a9f3315fee47c8e9693a7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Nov 2016 00:40:42 -0500
 Subject: [PATCH] Fix client rendering skulls from same user
@@ -12,7 +12,7 @@ This allows the client to render multiple skull textures from the same user,
 for when different skins were used when skull was made.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 1d2eb4a6e..962183491 100644
+index 641a52b96..0b0c3c681 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -54,7 +54,7 @@ public final class ItemStack {
@@ -117,5 +117,5 @@ index 177cceb77..0882d82ce 100644
      public NBTTagCompound b() {
          return this.save(new NBTTagCompound());
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From 70203148ed53ddb0b445550b8dbe08007e4ae1d9 Mon Sep 17 00:00:00 2001
+From 6f1b4d5dedcc6c6d5d557cf3d1672bcfbfdad4f8 Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Wed, 8 Aug 2018 15:30:52 -0400
 Subject: [PATCH] Add Early Warning Feature to WatchDog
@@ -183,5 +183,5 @@ index 121c7ff60..07936eeba 100644
              {
                  interrupt();
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0273-Make-EnderDragon-implement-Mob.patch

@@ -1,4 +1,4 @@
-From ed5c78d991cad1485545b89735ced47f95a922d8 Mon Sep 17 00:00:00 2001
+From b9c594fb6cd2169f52b7f07465aa29da29e59281 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 10 Aug 2018 22:11:49 -0400
 Subject: [PATCH] Make EnderDragon implement Mob
@@ -32,5 +32,5 @@ index cc115cc36..4947249da 100644
  
      @Override
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0274-Use-ConcurrentHashMap-in-JsonList.patch

@@ -1,4 +1,4 @@
-From b48ad0723e1228ae382cd3ea1185d7b0d982f120 Mon Sep 17 00:00:00 2001
+From d1c9e47e37c5d29417002931231e8d2659fee1c5 Mon Sep 17 00:00:00 2001
 From: egg82 <phantom_zero@ymail.com>
 Date: Tue, 7 Aug 2018 01:24:23 -0600
 Subject: [PATCH] Use ConcurrentHashMap in JsonList
@@ -99,5 +99,5 @@ index 734e7ecf6..8570e38f4 100644
          String s = this.b.toJson(collection);
          BufferedWriter bufferedwriter = null;
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0275-Use-a-Queue-for-Queueing-Commands.patch

@@ -1,4 +1,4 @@
-From 97036c2d66087267395e463dc61d8d31b69f4424 Mon Sep 17 00:00:00 2001
+From f843bf9620847c2e3752de8a863b48a16a707571 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 12 Aug 2018 02:33:39 -0400
 Subject: [PATCH] Use a Queue for Queueing Commands
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Queue for Queueing Commands
 Lists are bad as Queues mmmkay.
 
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index ec257ba31f..349a0ea213 100644
+index ec257ba31..349a0ea21 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -44,7 +44,7 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -32,5 +32,5 @@ index ec257ba31f..349a0ea213 100644
              // CraftBukkit start - ServerCommand for preprocessing
              ServerCommandEvent event = new ServerCommandEvent(console, servercommand.command);
 -- 
-2.25.0
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From c48d9f4c77534b6550412d97c24b44b6d366a188 Mon Sep 17 00:00:00 2001
+From aba7ad835af0314f275d0bfac6bc14f14d531a75 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:16:34 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots
@@ -35,5 +35,5 @@ index 299523799..91f2066b1 100644
  
          return entities;
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0277-Allow-disabling-armour-stand-ticking.patch

@@ -1,4 +1,4 @@
-From 0994b1f1e7de07d1654d56b9626f69cc15fb2959 Mon Sep 17 00:00:00 2001
+From 87b77cad98f830c2bafe7b8e16e2c98094796c06 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:09 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
@@ -277,5 +277,5 @@ index d1d689e5d..ac105270d 100644
      // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0278-Optimize-BlockPosition-helper-methods.patch

@@ -1,4 +1,4 @@
-From 68ffe4970dcf909ead368265bc723e5a8bb90c7f Mon Sep 17 00:00:00 2001
+From 6c4b570924752e5bab437614cf2b0755bed0a1ff Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Wed, 15 Aug 2018 12:05:12 -0700
 Subject: [PATCH] Optimize BlockPosition helper methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods
 Resolves #1338
 
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 5a505b753..142476395 100644
+index e9ea232a7..e76528f19 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -134,57 +134,74 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali
@@ -98,5 +98,5 @@ index 5a505b753..142476395 100644
  
      @Override
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From 1996f2fcdf1d7446e5a1c91a1dc61786449b116c Mon Sep 17 00:00:00 2001
+From 624df41d0c445d3bf05a430b44a9032d90a48376 Mon Sep 17 00:00:00 2001
 From: Mystiflow <mystiflow@gmail.com>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list
@@ -81,5 +81,5 @@ index 326c3564c..fe0912c06 100644
  
      private static Map<String, GameRules.GameRuleKey<?>> gamerules;
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0280-Restore-vanlla-default-mob-spawn-range.patch

@@ -1,11 +1,11 @@
-From 1c5d44fef7344af01c0aaa5b09911964da1ea76a Mon Sep 17 00:00:00 2001
+From a485890b51d7dd81b18da68b6039681d20e34dc2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Aug 2018 12:43:16 -0400
 Subject: [PATCH] Restore vanlla default mob-spawn-range
 
 
 diff --git a/src/main/java/org/spigotmc/SpigotWorldConfig.java b/src/main/java/org/spigotmc/SpigotWorldConfig.java
-index 5686a4f1a..c2906f20a 100644
+index 4965a48c3..58767972a 100644
 --- a/src/main/java/org/spigotmc/SpigotWorldConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotWorldConfig.java
 @@ -165,7 +165,7 @@ public class SpigotWorldConfig
@@ -18,5 +18,5 @@ index 5686a4f1a..c2906f20a 100644
      }
  
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0281-Optimize-CraftBlockData-Creation.patch

@@ -1,4 +1,4 @@
-From 7246646de47fcafd5219444ac7fbe44c68574aa5 Mon Sep 17 00:00:00 2001
+From ff43a33658c40c998527521c00d78e1f3908c7bd Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Thu, 23 Aug 2018 11:45:32 -0400
 Subject: [PATCH] Optimize CraftBlockData Creation
@@ -36,7 +36,7 @@ index 9ab57be85..c1ff62aa5 100644
          return this.getBlock().k(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
-index e371e7f6d..32e1e7e20 100644
+index 683b17a0c..a0746a169 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/data/CraftBlockData.java
 @@ -549,7 +549,17 @@ public class CraftBlockData implements BlockData {
@@ -58,5 +58,5 @@ index e371e7f6d..32e1e7e20 100644
      }
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0282-Fix-MC-124320.patch

@@ -1,4 +1,4 @@
-From d8977d2a7209f4b7f6523cb8c8ebc71ceeed68a7 Mon Sep 17 00:00:00 2001
+From 44b4978b2f2c21267dcc18515c9c986c711c9150 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 23 Aug 2018 09:25:30 -0500
 Subject: [PATCH] Fix MC-124320
@@ -17,7 +17,7 @@ index 5f261b9b9..b9b750c36 100644
          IBlockData iblockdata1 = iblockdata;
          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index ca8e43fdf..149de2c57 100644
+index b7c67f0cd..d86f76f30 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -354,8 +354,9 @@ public class EntityEnderman extends EntityMonster {
@@ -49,5 +49,5 @@ index ca8e43fdf..149de2c57 100644
              if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1, blockposition1)) {
                  // CraftBukkit start - Place event
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0283-Slime-Pathfinder-Events.patch

@@ -1,4 +1,4 @@
-From 6c0ae9f5105e2d7110301f84efda3a6dbe298197 Mon Sep 17 00:00:00 2001
+From 9d78806cb95ad358b096de75396d79a09e624e2d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 08:18:42 -0500
 Subject: [PATCH] Slime Pathfinder Events
@@ -166,5 +166,5 @@ index ce6ed6e89..6e9f1b66d 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0284-Configurable-speed-for-water-flowing-over-lava.patch

@@ -1,4 +1,4 @@
-From ed07543a84e9138f21e466ed7c05b8b2a6440b9c Mon Sep 17 00:00:00 2001
+From 56b1bf3608cef2c0324805e96628badabb82e420 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 8 Aug 2018 16:33:21 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
@@ -63,5 +63,5 @@ index f56e14e1e..6d351f097 100644
  
      }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0285-Optimize-RegistryMaterials.patch

@@ -1,4 +1,4 @@
-From 78858b4afe31d5113d447014455190134e115a14 Mon Sep 17 00:00:00 2001
+From fa26bac76e8d9a8d2e42958564faf5613d324084 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Aug 2018 20:49:50 -0400
 Subject: [PATCH] Optimize RegistryMaterials
@@ -31,5 +31,5 @@ index 2d6a7b3a4..8477febca 100644
      }
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0286-Add-PhantomPreSpawnEvent.patch

@@ -1,4 +1,4 @@
-From a23e2b70f800aa1c6beecc83497f32a23d53dc9d Mon Sep 17 00:00:00 2001
+From b545162dc8015f80b7e162de86d032856d029d2a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 25 Aug 2018 19:56:51 -0500
 Subject: [PATCH] Add PhantomPreSpawnEvent
@@ -86,5 +86,5 @@ index 9f9ee9239..2b9731369 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0287-Add-More-Creeper-API.patch

@@ -1,4 +1,4 @@
-From 938ec7bad64961812a276eeca50182aac6d82771 Mon Sep 17 00:00:00 2001
+From 5ac23948fb65632ebb4b47e95cd268d6552fb425 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 11:50:26 -0500
 Subject: [PATCH] Add More Creeper API
@@ -61,5 +61,5 @@ index 896405148..075a5e77e 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0288-Inventory-removeItemAnySlot.patch

@@ -1,4 +1,4 @@
-From 709122fd6dbbff605b357f26baf0f272095682a6 Mon Sep 17 00:00:00 2001
+From 1ac398b35579dd8be181195d6646a8dc4a3fb2b8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 28 Aug 2018 23:04:15 -0400
 Subject: [PATCH] Inventory#removeItemAnySlot
@@ -57,5 +57,5 @@ index 0d637e207..026a0c399 100644
                  // Drat! we don't have this type in the inventory
                  if (first == -1) {
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0289-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch

@@ -1,4 +1,4 @@
-From a8a52313ee7e3bdb0a7b6f512c7fd9ef8d4d7327 Mon Sep 17 00:00:00 2001
+From 34fad952972d6d653e377a4c48733dbabc6a5431 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 2 Sep 2018 19:34:33 -0700
 Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
@@ -6,7 +6,7 @@ Subject: [PATCH] Make CraftWorld#loadChunk(int, int, false) load unconverted
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2b82a9438..ce1ac730c 100644
+index fe0912c06..9940b9520 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -495,7 +495,7 @@ public class CraftWorld implements World {
@@ -19,5 +19,5 @@ index 2b82a9438..ce1ac730c 100644
          // If generate = false, but the chunk already exists, we will get this back.
          if (chunk instanceof ProtoChunkExtension) {
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0290-Add-ray-tracing-methods-to-LivingEntity.patch

@@ -1,11 +1,11 @@
-From cd7e912885165be1e5db3cc50802f5a8301a18be Mon Sep 17 00:00:00 2001
+From d7f1f91234c64c346a8370b929ec2b329eeaeb5b Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:20:03 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 0b84ead5f2..fa097e0551 100644
+index 0b84ead5f..fa097e055 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3254,6 +3254,23 @@ public abstract class EntityLiving extends Entity {
@@ -33,7 +33,7 @@ index 0b84ead5f2..fa097e0551 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 02346f1c50..d197094f54 100644
+index 02346f1c5..d197094f5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -196,6 +196,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -66,5 +66,5 @@ index 02346f1c50..d197094f54 100644
      public List<Block> getLastTwoTargetBlocks(Set<Material> transparent, int maxDistance) {
          return getLineOfSight(transparent, maxDistance, 2);
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0291-Expose-attack-cooldown-methods-for-Player.patch

@@ -1,11 +1,11 @@
-From a257773366babc48f6a1c3230cee3b7d68852384 Mon Sep 17 00:00:00 2001
+From 007fe854bd38c938febf2296f1a64997bec74314 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:02:00 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 36748ccb73..308ac18f7e 100644
+index 36748ccb7..308ac18f7 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2123,14 +2123,17 @@ public abstract class EntityHuman extends EntityLiving {
@@ -27,7 +27,7 @@ index 36748ccb73..308ac18f7e 100644
          this.aB = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d7d86a8b24..d584c76ecd 100644
+index d7d86a8b2..d584c76ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1940,6 +1940,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -52,5 +52,5 @@ index d7d86a8b24..d584c76ecd 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0292-Improve-death-events.patch

@@ -1,4 +1,4 @@
-From 08330b806b1c6fee692aedb3dabc2137b8295eef Mon Sep 17 00:00:00 2001
+From 0926eb667c99b565347b26b71f797d2b2eadeadc Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
-index 6daa400d27..38fe29f8a2 100644
+index 6daa400d2..38fe29f8a 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
 @@ -175,6 +175,7 @@ public class CombatTracker {
@@ -27,7 +27,7 @@ index 6daa400d27..38fe29f8a2 100644
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 02aa493f17..e8b70a5ca5 100644
+index 02aa493f1..e8b70a5ca 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1503,6 +1503,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -47,7 +47,7 @@ index 02aa493f17..e8b70a5ca5 100644
  
      protected void k(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 42b9a339e9..8ad131e4fc 100644
+index 42b9a339e..8ad131e4f 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -701,7 +701,8 @@ public class EntityArmorStand extends EntityLiving {
@@ -61,7 +61,7 @@ index 42b9a339e9..8ad131e4fc 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 2be6c7bde9..82a32d5dbf 100644
+index 2be6c7bde..82a32d5db 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -571,15 +571,25 @@ public class EntityFox extends EntityAnimal {
@@ -94,7 +94,7 @@ index 2be6c7bde9..82a32d5dbf 100644
  
      public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
 diff --git a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
-index 80717ad9ac..53aac5bccd 100644
+index 80717ad9a..53aac5bcc 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseChestedAbstract.java
 @@ -55,11 +55,19 @@ public abstract class EntityHorseChestedAbstract extends EntityHorseAbstract {
@@ -119,7 +119,7 @@ index 80717ad9ac..53aac5bccd 100644
      public void b(NBTTagCompound nbttagcompound) {
          super.b(nbttagcompound);
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index fa097e0551..eed3e7c58e 100644
+index fa097e055..eed3e7c58 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -89,7 +89,7 @@ public abstract class EntityLiving extends Entity {
@@ -279,7 +279,7 @@ index fa097e0551..eed3e7c58e 100644
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index f849dba215..4b40ffa978 100644
+index f849dba21..4b40ffa97 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -76,6 +76,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -330,7 +330,7 @@ index f849dba215..4b40ffa978 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 90fdf89c81..b761a41dcd 100644
+index 90fdf89c8..b761a41dc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 @@ -821,6 +821,22 @@ public enum CraftSound {
@@ -357,7 +357,7 @@ index 90fdf89c81..b761a41dcd 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d584c76ecd..878287cf0d 100644
+index d584c76ec..878287cf0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1733,7 +1733,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -378,7 +378,7 @@ index d584c76ecd..878287cf0d 100644
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index f006b441ad..39ce40bd58 100644
+index f006b441a..39ce40bd5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -749,9 +749,16 @@ public class CraftEventFactory {
@@ -447,5 +447,5 @@ index f006b441ad..39ce40bd58 100644
       * Server methods
       */
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0293-Allow-chests-to-be-placed-with-NBT-data.patch

@@ -1,11 +1,11 @@
-From 4ac284d3aa453ecbbc9a1b1386017807ec647926 Mon Sep 17 00:00:00 2001
+From 3e077f1bf8f2c01f9dea36dbfbdb39e81ed161c2 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Sep 2018 18:43:31 -0500
 Subject: [PATCH] Allow chests to be placed with NBT data
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 962183491..1be4cd163 100644
+index 0b0c3c681..d953cdef1 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -240,6 +240,7 @@ public final class ItemStack {
@@ -30,5 +30,5 @@ index c4766f729..b22bd06e2 100644
      // CraftBukkit end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0294-Mob-Pathfinding-API.patch

@@ -1,4 +1,4 @@
-From 8fd28572ae389bfe1c6e7251634faaafbcaedbae Mon Sep 17 00:00:00 2001
+From 34442249275444961016441d3496362c4c48cadd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 13:30:00 -0400
 Subject: [PATCH] Mob Pathfinding API
@@ -227,7 +227,7 @@ index b1db95daa..18cdd2a6f 100644
      public int d = -1;
      public float e;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 5bf1cd06f..53c2d154e 100644
+index 90e63fbf2..c89bc7024 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable;
@@ -243,5 +243,5 @@ index 5bf1cd06f..53c2d154e 100644
      public void setTarget(LivingEntity target) {
          EntityInsentient entity = getHandle();
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0295-Prevent-chunk-loading-from-Fluid-Flowing.patch

@@ -1,4 +1,4 @@
-From bc9f4ac177333ed1d663fefc34e681de57b715c9 Mon Sep 17 00:00:00 2001
+From 3c964129094fed21fa99aed9111584300e583f93 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:36:16 -0400
 Subject: [PATCH] Prevent chunk loading from Fluid Flowing
@@ -74,5 +74,5 @@ index 3099a5e65..376dca188 100644
              Fluid fluid = (Fluid) pair.getSecond();
              Fluid fluid1 = this.a(iworldreader, blockposition1, iblockdata1);
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0296-Implement-an-API-for-CanPlaceOn-and-CanDestroy-NBT-v.patch

@@ -1,11 +1,11 @@
-From 9471146c065d29d7d11f1538d6dcffdcf985d32b Mon Sep 17 00:00:00 2001
+From d2072c82ded4da97259e387eb5006d7390169ad0 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:55 +0300
 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
 
 
 diff --git a/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java
-index 005ebec266..97d85f8451 100644
+index 005ebec26..97d85f845 100644
 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java
 +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java
 @@ -43,7 +43,7 @@ public class ArgumentBlock {
@@ -32,7 +32,7 @@ index 005ebec266..97d85f8451 100644
          this.s = this::l;
          if (this.i.canRead() && this.i.peek() == '#') {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 3325111f8a..0606e69a61 100644
+index 0682c6e85..cdd262d86 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -87,6 +87,12 @@ import org.bukkit.persistence.PersistentDataContainer;
@@ -432,5 +432,5 @@ index 3325111f8a..0606e69a61 100644
 +    // Paper end
  }
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0297-Prevent-Mob-AI-Rules-from-Loading-Chunks.patch

@@ -1,4 +1,4 @@
-From ea6be7d9eec94c640a01e551254eb74777100b35 Mon Sep 17 00:00:00 2001
+From c78da171571b4c501b074da90f332bd2cfd04617 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 10 Sep 2018 23:56:36 -0400
 Subject: [PATCH] Prevent Mob AI Rules from Loading Chunks
@@ -74,5 +74,5 @@ index d4cd50918..d6a3b9933 100644
  
                          if (entitycreature.a(pathtype) == 0.0F) {
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0298-Prevent-mob-spawning-from-loading-generating-chunks.patch

@@ -1,4 +1,4 @@
-From 13f578fb8354a5ef83e3765c1ddb1513ac7b0ac5 Mon Sep 17 00:00:00 2001
+From c477f5ca9e218c211b69584171d6193f71e8062c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 12 Sep 2018 21:12:57 -0400
 Subject: [PATCH] Prevent mob spawning from loading/generating chunks
@@ -31,5 +31,5 @@ index 224443e03..fdac5bb3a 100644
  
                                          if (Objects.equals(chunkcoordintpair, chunk.getPos()) || worldserver.getChunkProvider().a(chunkcoordintpair)) {
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0299-Optimize-Biome-Mob-Lookups-for-Mob-Spawning.patch

@@ -1,4 +1,4 @@
-From 89395a6f037f018a26ae8cb2c1d3875f86e9fa3d Mon Sep 17 00:00:00 2001
+From 25c89be5d3c5ac036b8725db797a95b163b7275a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 12 Sep 2018 21:47:01 -0400
 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
@@ -67,5 +67,5 @@ index 253890e53..0102a170d 100644
  
          @Nullable
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From 7ee109973dbce56d13226f7108948a67f50b6477 Mon Sep 17 00:00:00 2001
+From 5e77ee0ecdf1572e88759c5122e315da8cf830f4 Mon Sep 17 00:00:00 2001
 From: Tassu <git@tassu.me>
 Date: Thu, 13 Sep 2018 08:45:21 +0300
 Subject: [PATCH] Implement furnace cook speed multiplier API
@@ -80,5 +80,5 @@ index 9cc67915c..1ce10ea04 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0301-Support-Overriding-World-Seeds.patch

@@ -1,4 +1,4 @@
-From e0300bd3374224689c4a9cd454254a19f8f1a1e0 Mon Sep 17 00:00:00 2001
+From 21398dff09048bae64ad0de46e3b26d3436291a2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:05:31 -0400
 Subject: [PATCH] Support Overriding World Seeds
@@ -98,5 +98,5 @@ index 4cf288790..f36b64246 100644
              if (parsedSettings.isJsonObject()) {
                  worldSettings.setGeneratorSettings(parsedSettings.getAsJsonObject());
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0302-Optimize-Server-World-Map.patch

@@ -1,4 +1,4 @@
-From 70cbd0e7773ec3e6c0cb8ca31e0a958749e12139 Mon Sep 17 00:00:00 2001
+From 4c3cbbfd6996fbf68abb243106da513d0a722c64 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:37:31 -0400
 Subject: [PATCH] Optimize Server World Map
@@ -247,5 +247,5 @@ index 52ec526fc..a3156d003 100644
              DimensionManager dimensionmanager = worldserver.worldProvider.getDimensionManager();
              ForcedChunk forcedchunk = (ForcedChunk) worldserver.getWorldPersistentData().b(ForcedChunk::new, "chunks");
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0303-PreSpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 70ef18b1711516ce14317f6cfe9f1c5723c8c1eb Mon Sep 17 00:00:00 2001
+From 8e2d2210569877d0568577da6e6e55daf987389e Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:53:23 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
@@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for
 spawners.
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index fe8bc7f75..90ca1ee14 100644
+index 43c491f71..cb7cb789b 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -111,11 +111,11 @@ public abstract class MobSpawnerAbstract {
@@ -28,5 +28,5 @@ index fe8bc7f75..90ca1ee14 100644
                              if (!event.callEvent()) {
                                  flag = true;
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0304-Catch-JsonParseException-in-Entity-and-TE-names.patch

@@ -1,4 +1,4 @@
-From 4be55289f11432ae8f1525e88839e5c5732836db Mon Sep 17 00:00:00 2001
+From ca5a86333945a2359dd570e33c5be15be84ece80 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 22 Sep 2018 15:56:59 -0400
 Subject: [PATCH] Catch JsonParseException in Entity and TE names
@@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly
 No more crashing though.
 
 diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
-index 7867122974..ef2a496eda 100644
+index 786712297..ef2a496ed 100644
 --- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 +++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 @@ -59,7 +59,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
@@ -26,7 +26,7 @@ index 7867122974..ef2a496eda 100644
  
          if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e8b70a5ca5..9a23380600 100644
+index e8b70a5ca..9a2338060 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1679,7 +1679,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index e8b70a5ca5..9a23380600 100644
  
                      this.setCustomNameVisible(nbttagcompound.getBoolean("CustomNameVisible"));
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 2a22bc6f3e..3a482466ec 100644
+index 2a22bc6f3..3a482466e 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -409,4 +409,19 @@ public final class MCUtil {
@@ -63,7 +63,7 @@ index 2a22bc6f3e..3a482466ec 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java
-index 93911a8251..d35604edb2 100644
+index 93911a825..d35604edb 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java
 @@ -60,7 +60,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity {
@@ -76,7 +76,7 @@ index 93911a8251..d35604edb2 100644
  
          if (this.hasWorld()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityContainer.java b/src/main/java/net/minecraft/server/TileEntityContainer.java
-index 473ec2cbde..ab6b86e4e9 100644
+index 473ec2cbd..ab6b86e4e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityContainer.java
 +++ b/src/main/java/net/minecraft/server/TileEntityContainer.java
 @@ -17,7 +17,7 @@ public abstract class TileEntityContainer extends TileEntity implements IInvento
@@ -89,5 +89,5 @@ index 473ec2cbde..ab6b86e4e9 100644
  
      }
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0305-Avoid-dimension-id-collisions.patch

@@ -1,4 +1,4 @@
-From e75865f7fcf2070416e62057ef5a6b8bc66eb190 Mon Sep 17 00:00:00 2001
+From bdd8538f1464d27e07f46d9c5e98c225b4eee934 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 25 Sep 2018 06:53:43 +0200
 Subject: [PATCH] Avoid dimension id collisions
@@ -21,5 +21,5 @@ index f36b64246..4289d029c 100644
                      dimension++;
                      break;
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0306-Honor-EntityAgeable.ageLock.patch

@@ -1,4 +1,4 @@
-From 75cfa2e57d0ff320616705d625bc3de1717c5c43 Mon Sep 17 00:00:00 2001
+From 3bb8ed8325e88e461ca22e78eb5f211948bdc4a6 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 23 Sep 2018 20:59:53 -0500
 Subject: [PATCH] Honor EntityAgeable.ageLock
@@ -17,5 +17,5 @@ index cec938436..3d27f0964 100644
          int k = j;
  
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0307-Configurable-connection-throttle-kick-message.patch

@@ -1,4 +1,4 @@
-From 398196f95888864e3806b5760956bd7cdb17b2bf Mon Sep 17 00:00:00 2001
+From 93f743c597f7213554bda4827159d3dab780f5fa Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 2 Oct 2018 09:57:50 +0100
 Subject: [PATCH] Configurable connection throttle kick message
@@ -34,5 +34,5 @@ index 8928d93e4..0532f975b 100644
                              this.b.close(chatmessage);
                              return;
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0308-Hook-into-CB-plugin-rewrites.patch

@@ -1,4 +1,4 @@
-From 210300e7972f42ccac44af3d20da7d2c5a376afb Mon Sep 17 00:00:00 2001
+From f17840fb1a9ed8fc2f6ce92405290068e258d44f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 3 Oct 2018 20:09:18 -0400
 Subject: [PATCH] Hook into CB plugin rewrites
@@ -8,7 +8,7 @@ our own relocation. Also lets us rewrite NMS calls for when we're
 debugging in an IDE pre-relocate.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
-index 467b2d938..61f102355 100644
+index 2d334a594..79c9489c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/Commodore.java
 @@ -6,7 +6,9 @@ import java.io.FileOutputStream;
@@ -187,5 +187,5 @@ index 467b2d938..61f102355 100644
                          {
                              if ( owner.equals( "org/bukkit/Material" ) )
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0309-Allow-setting-the-vex-s-summoner.patch

@@ -1,4 +1,4 @@
-From 4dc40c1775c78bde423d620db9bf4d4adc94a05b Mon Sep 17 00:00:00 2001
+From d5eb1130ffd33d83a7824f1d964323a5c64cd7ef Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 6 Oct 2018 21:47:44 -0500
 Subject: [PATCH] Allow setting the vex's summoner
@@ -32,5 +32,5 @@ index 169c951ec..2f7df3074 100644
  
      @Override
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0310-Add-sun-related-API.patch

@@ -1,11 +1,11 @@
-From acbf444d827b68afd4c0b3a95289fa3abc00523b Mon Sep 17 00:00:00 2001
+From 9b1e5a4f47ad58077b804230c5f7a2f5d8999824 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index b5816dc89e..bed15873b6 100644
+index b5816dc89..bed15873b 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1341,6 +1341,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -17,7 +17,7 @@ index b5816dc89e..bed15873b6 100644
          if (this.world.isDay() && !this.world.isClientSide) {
              float f = this.aI();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ce1ac730cb..323d78b22f 100644
+index 9940b9520..b41404652 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -852,6 +852,13 @@ public class CraftWorld implements World {
@@ -35,7 +35,7 @@ index ce1ac730cb..323d78b22f 100644
      public boolean createExplosion(double x, double y, double z, float power) {
          return createExplosion(x, y, z, power, false, true);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index c89bc7024b..eaad222fd3 100644
+index c89bc7024..eaad222fd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -78,4 +78,11 @@ public abstract class CraftMob extends CraftLivingEntity implements Mob {
@@ -51,5 +51,5 @@ index c89bc7024b..eaad222fd3 100644
 +    // Paper end
  }
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0311-Check-Drowned-for-Villager-Aggression-Config.patch

@@ -1,4 +1,4 @@
-From 83b0524a338f924e7ba399ecb218dc27210ea168 Mon Sep 17 00:00:00 2001
+From b36c012db5e35944fda342922b97e70304ae5371 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 10 Oct 2018 21:22:44 -0500
 Subject: [PATCH] Check Drowned for Villager Aggression Config
@@ -18,5 +18,5 @@ index 70c06ca77..77885f67f 100644
          this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bw));
      }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0312-Here-s-Johnny.patch

@@ -1,4 +1,4 @@
-From 1e7fdb5e3eeaf2540a4310d130543d633407bb6a Mon Sep 17 00:00:00 2001
+From 7d691218ef28e137e708cf79fb91e24e628da53d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 01:37:22 -0500
 Subject: [PATCH] Here's Johnny!
@@ -37,5 +37,5 @@ index 951d47929..5ff957ced 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0313-Turtle-API.patch

@@ -1,4 +1,4 @@
-From a4255ab47148cc0b59007704a6f4ac1ed48b373b Mon Sep 17 00:00:00 2001
+From e5fe16d5ec0b517fbc1143aa49cb4fdfc61fc5ae Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 29 Sep 2018 16:08:23 -0500
 Subject: [PATCH] Turtle API
@@ -153,5 +153,5 @@ index 123a2c75c..8edcf7af6 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

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

@@ -1,11 +1,11 @@
-From f4e1ede0e866a8f95fcf9a7adf08311a6509edb2 Mon Sep 17 00:00:00 2001
+From 6a6e3975077b008f8f327ca08643cd1eaa7a87f8 Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 487b0d5cd6..b8789c8ecc 100644
+index 487b0d5cd..b8789c8ec 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -242,6 +242,28 @@ public class PaperWorldConfig {
@@ -38,7 +38,7 @@ index 487b0d5cd6..b8789c8ecc 100644
      private void fixedInhabitedTime() {
          if (PaperConfig.version < 16) {
 diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
-index 7c518983a9..bdb534deb4 100644
+index 7c518983a..bdb534deb 100644
 --- a/src/main/java/net/minecraft/server/EntityLightning.java
 +++ b/src/main/java/net/minecraft/server/EntityLightning.java
 @@ -64,6 +64,17 @@ public class EntityLightning extends Entity {
@@ -69,7 +69,7 @@ index 7c518983a9..bdb534deb4 100644
  
          --this.lifeTicks;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f12cadc735..78a9b31891 100644
+index a411a23de..49b1939d1 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1271,7 +1271,7 @@ public class WorldServer extends World {
@@ -82,5 +82,5 @@ index f12cadc735..78a9b31891 100644
  
      @Override
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0315-MC-50319-Check-other-worlds-for-shooter-of-projectil.patch

@@ -1,4 +1,4 @@
-From 92c918d21661c0c057fea5381883b61b291fb1ea Mon Sep 17 00:00:00 2001
+From 7da42baba510552c0cb1df21a0c74db0977b0663 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 17 Oct 2018 19:17:27 -0400
 Subject: [PATCH] MC-50319: Check other worlds for shooter of projectiles
@@ -32,5 +32,5 @@ index 9eed1dce3..6c091b680 100644
              if (entity instanceof EntityLiving) {
                  this.shooter = (EntityLiving) entity;
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0316-Call-player-spectator-target-events.patch

@@ -1,11 +1,11 @@
-From ddf9098de1112465064b9e294429137b11f49e98 Mon Sep 17 00:00:00 2001
+From 53af1cd635d13b6d5e941ae56d6a8de11cb9d948 Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:32:19 -0500
 Subject: [PATCH] Call player spectator target events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 4b40ffa978..bf21fb69a5 100644
+index 4b40ffa97..bf21fb69a 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -61,7 +61,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -67,5 +67,5 @@ index 4b40ffa978..bf21fb69a5 100644
  
      @Override
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0317-Add-Velocity-IP-Forwarding-Support.patch

@@ -1,4 +1,4 @@
-From ed163d80c617edd6e48714cc403a3d8a5c3a2f9d Mon Sep 17 00:00:00 2001
+From 50e4286b71f66dfe05505d9856df25b120928111 Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 8 Oct 2018 14:36:14 -0400
 Subject: [PATCH] Add Velocity IP Forwarding Support
@@ -278,7 +278,7 @@ index ae74dc9e1..7eb230f1b 100644
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
          this.a = packetdataserializer.i();
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 625a00c3d..55fc1390a 100644
+index 4289d029c..fa35b8459 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -647,7 +647,7 @@ public final class CraftServer implements Server {
@@ -291,5 +291,5 @@ index 625a00c3d..55fc1390a 100644
          } else {
              return this.configuration.getInt("settings.connection-throttle");
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0318-Add-more-Witch-API.patch

@@ -1,4 +1,4 @@
-From 2d61118e91c6ad8897f59f32eb3d9f8311481884 Mon Sep 17 00:00:00 2001
+From 53dee72bcea86101b83cd9fc6d59c948be6cbe5f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 12 Oct 2018 14:10:46 -0500
 Subject: [PATCH] Add more Witch API
@@ -146,5 +146,5 @@ index bae107e76..b43a2bbd5 100644
 +    // Paper end
  }
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0319-Fix-MC-93764.patch

@@ -1,4 +1,4 @@
-From 8d74a1d31f57e2c6dc0c179601db6a18d6a1e821 Mon Sep 17 00:00:00 2001
+From f2429882921a9ca0d8f156105b09d086589164c7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Oct 2018 19:38:45 -0500
 Subject: [PATCH] Fix MC-93764
@@ -18,5 +18,5 @@ index 9d4fcf8bc..4b9760709 100644
  
      @Override
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0320-Add-option-to-prevent-players-from-moving-into-unloa.patch

@@ -1,4 +1,4 @@
-From ade44b08c750ffcf815f12a5e98071d3c52a62fe Mon Sep 17 00:00:00 2001
+From f871d28d4e2f369979bf91ffcabdb2f7d180a70a Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
@@ -20,7 +20,7 @@ index b8789c8ec..0862a1d62 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 77c375f71..ccad0a601 100644
+index 6627d8402..bde60377e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -351,6 +351,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -63,5 +63,5 @@ index 77c375f71..ccad0a601 100644
                              if (!this.player.H() && (!this.player.getWorldServer().getGameRules().getBoolean(GameRules.DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isGliding())) {
                                  float f2 = this.player.isGliding() ? 300.0F : 100.0F;
 -- 
-2.25.0.windows.1
+2.25.1
 

Spigot-Server-Patches/0321-Reset-players-airTicks-on-respawn.patch

@@ -1,11 +1,11 @@
-From 38a4719c10be78309b32b84152609dd9798b058a Mon Sep 17 00:00:00 2001
+From 7b22e6668240d850db0689d1e7f525260f776d80 Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9a23380600..ecd0387627 100644
+index 9a2338060..ecd038762 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2326,6 +2326,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,7 +17,7 @@ index 9a23380600..ecd0387627 100644
          return 300;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index bf21fb69a5..e91938b54c 100644
+index bf21fb69a..e91938b54 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1867,6 +1867,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -29,5 +29,5 @@ index bf21fb69a5..e91938b54c 100644
          this.fallDistance = 0;
          this.foodData = new FoodMetaData(this);
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0322-Don-t-sleep-after-profile-lookups-if-not-needed.patch

@@ -1,4 +1,4 @@
-From abdac842cad2aefea0af10435e422918867fbffc Mon Sep 17 00:00:00 2001
+From 1415b8bf619feafdff4bc2889802c28825e6c73c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 20:25:05 -0400
 Subject: [PATCH] Don't sleep after profile lookups if not needed
@@ -32,5 +32,5 @@ index 71e48e87b..23f1447cf 100644
                      try {
                          Thread.sleep(DELAY_BETWEEN_PAGES);
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0323-Use-more-reasonable-thread-count-default-for-bootstr.patch

@@ -1,4 +1,4 @@
-From 94ad20a66877884fc46b2f8348839fac269eb3cb Mon Sep 17 00:00:00 2001
+From 0adf0a54a9c7fecea654294f0b8a33dae051d6e2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 23 Oct 2018 23:14:38 -0400
 Subject: [PATCH] Use more reasonable thread count default for bootstrap
@@ -18,5 +18,5 @@ index 7e224ebef..dc6d03062 100644
  
          if (i <= 0) {
 -- 
-2.25.0
+2.25.1
 

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

@@ -1,4 +1,4 @@
-From 7b6875067185e9004af4496d92c394fad7ccccb2 Mon Sep 17 00:00:00 2001
+From 0951662a1b4fe1206ab3f5507d6aeb05d93ed73d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Nov 2018 23:11:51 -0400
 Subject: [PATCH] Optimize World Time Updates
@@ -41,5 +41,5 @@ index a3156d003..2a01e609c 100644
  
          while (iterator.hasNext()) {
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0325-Restore-custom-InventoryHolder-support.patch

@@ -1,4 +1,4 @@
-From 69055d2af5fb73621a58b66e9e65620504934a66 Mon Sep 17 00:00:00 2001
+From 420f1740a630febfb0083462b94d06cfe0b1f4b3 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Mon, 5 Nov 2018 04:23:51 +0000
 Subject: [PATCH] Restore custom InventoryHolder support
@@ -42,5 +42,5 @@ index 9957ed040..ae280dd40 100644
      }
  
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0326-Use-Vanilla-Minecart-Speeds.patch

@@ -1,4 +1,4 @@
-From d4a7cfb80c410ba7686baa9226f3d530d358bd17 Mon Sep 17 00:00:00 2001
+From 85ff7573d1b7480d8e511d2716db2cbedbe48acb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 8 Nov 2018 21:33:09 -0500
 Subject: [PATCH] Use Vanilla Minecart Speeds
@@ -23,5 +23,5 @@ index c2843d5d6..665bbe07f 100644
      // CraftBukkit end
  
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0327-Fix-SpongeAbsortEvent-handling.patch

@@ -1,4 +1,4 @@
-From 6d5624204ccf8343905c51628233fc07f6ded851 Mon Sep 17 00:00:00 2001
+From 3b67e7c6c62205dc6e979fe22afff3148d41a48d Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Nov 2018 05:15:21 +0000
 Subject: [PATCH] Fix SpongeAbsortEvent handling
@@ -37,5 +37,5 @@ index 685a30f3f..9edf937a6 100644
                  }
                  world.setTypeAndData(blockposition2, block.getHandle(), block.getFlag());
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0328-Don-t-allow-digging-into-unloaded-chunks.patch

@@ -1,4 +1,4 @@
-From 451cf4b95cae005f0afc654ebfa95bffadf834d1 Mon Sep 17 00:00:00 2001
+From 38e63e5a220ff15e394cb4f034129a9490317c8e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Nov 2018 21:01:09 +0000
 Subject: [PATCH] Don't allow digging into unloaded chunks
@@ -21,5 +21,5 @@ index bde60377e..b21fca9e5 100644
                  return;
              default:
 -- 
-2.25.0
+2.25.1
 

Spigot-Server-Patches/0329-Optimize-redstone-algorithm.patch

@@ -1,4 +1,4 @@
-From 688ca6cf90b4945b2162d9317215938b4633b9ab Mon Sep 17 00:00:00 2001
+From 37ce37c395071a338bf1c51f860a6d46891a723d Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@@ -1147,5 +1147,5 @@ index 1905aae87..f54743a91 100644
          int i = 0;
          EnumDirection[] aenumdirection = World.a;
 -- 
-2.25.0
+2.25.1