Restore 0129-Optimize-World.isLoaded-BlockPosition-Z.patch

Spigot-Server-Patches/0129-Optimize-World.isLoaded-BlockPosition-Z.patch

@@ -1,4 +1,4 @@
-From afe90ec5ec5202911c92ff2b497d734b76057256 Mon Sep 17 00:00:00 2001
+From 6f3694fc16bfe1aa83e509272a6e5061f0cac424 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,20 +6,21 @@ 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 4ce18f85b..cfdb6b57f 100644
+index 3a52958a16..50808b1a9f 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
-         return i < 0 || i >= 256;
+@@ -237,6 +237,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+         return chunk == null ? null : chunk.getFluid(blockposition);
      }
  
 +    public boolean isLoaded(BlockPosition blockposition) {
 +        return getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null; // Paper
 +    }
 +
-     // Paper start
++
      public boolean isLoadedAndInBounds(BlockPosition blockposition) {
-         return getWorldBorder().isInBounds(blockposition) && getChunkIfLoaded(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null;
+         return getWorldBorder().isInBounds(blockposition) && getChunkIfLoadedImmediately(blockposition.getX() >> 4, blockposition.getZ() >> 4) != null;
+     }
 -- 
-2.22.0
+2.24.1
 

Spigot-Server-Patches/0130-Bound-Treasure-Maps-to-World-Border.patch

@@ -1,4 +1,4 @@
-From b6ea5bc92d6f07a2a5aa0cc9fe7f19a8b9f180ee Mon Sep 17 00:00:00 2001
+From 4bc309b797100c0fa004b93a0c8aa59be67ebf9e 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
@@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.
 
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 0f248b6de..e8ce2ecf2 100644
+index 0f248b6de3..e8ce2ecf23 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -108,6 +108,7 @@ public abstract class StructureGenerator<C extends WorldGenFeatureConfiguration>
@@ -23,7 +23,7 @@ index 0f248b6de..e8ce2ecf2 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 4ee13ac45..5f10c4338 100644
+index 4ee13ac454..5f10c4338e 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 4ee13ac45..5f10c4338 100644
          return (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e() && (double) chunkcoordintpair.g() > this.d() && (double) chunkcoordintpair.e() < this.f();
      }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0131-Configurable-Cartographer-Treasure-Maps.patch

@@ -1,4 +1,4 @@
-From 6a2c7cb959467d46b721e83a2f25eef3a9a12cf5 Mon Sep 17 00:00:00 2001
+From 40a5fa15dcb0bc09af143775aa33c0728975b72f 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
@@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ba8edcf7e..bf11448bc 100644
+index ba8edcf7ef..bf11448bcd 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -310,4 +310,14 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index ba8edcf7e..bf11448bc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/VillagerTrades.java b/src/main/java/net/minecraft/server/VillagerTrades.java
-index 3bcf0b385..4764ffef7 100644
+index 3bcf0b385d..4764ffef77 100644
 --- a/src/main/java/net/minecraft/server/VillagerTrades.java
 +++ b/src/main/java/net/minecraft/server/VillagerTrades.java
 @@ -92,7 +92,8 @@ public class VillagerTrades {
@@ -42,5 +42,5 @@ index 3bcf0b385..4764ffef7 100644
                  if (blockposition != null) {
                      ItemStack itemstack = ItemWorldMap.createFilledMapView(worldserver, blockposition.getX(), blockposition.getZ(), (byte) 2, true, true);
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0132-Optimize-ItemStack.isEmpty.patch

@@ -1,4 +1,4 @@
-From bf58400df5a723d81164dc713ed54293b8ff6dc4 Mon Sep 17 00:00:00 2001
+From 1b09bcf4e69cb92dc412a07237446afbd101ecf6 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 0a1596ff0..2d0a8c58f 100644
+index 0a1596ff06..2d0a8c58fb 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -150,7 +150,7 @@ public final class ItemStack {
@@ -19,5 +19,5 @@ index 0a1596ff0..2d0a8c58f 100644
  
      public ItemStack cloneAndSubtract(int i) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0133-Add-API-methods-to-control-if-armour-stands-can-move.patch

@@ -1,11 +1,11 @@
-From 5503284388857eb1a7a16fb5d85d84f5c66edf6d Mon Sep 17 00:00:00 2001
+From 2dee4cbf0de58c1b0bb4d85de55cb30e5d167baa 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 9d0b85d1c..37ce4d48b 100644
+index 9d0b85d1c1..37ce4d48bc 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 {
@@ -31,7 +31,7 @@ index 9d0b85d1c..37ce4d48b 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08ad..124c3185b 100644
+index 2b66a08ade..124c3185bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -211,4 +211,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -52,5 +52,5 @@ index 2b66a08ad..124c3185b 100644
 +    // Paper end
  }
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From d79301aeed703c330dcfac1c59d54135974ab30f Mon Sep 17 00:00:00 2001
+From 3ba999f1582d8a1669193f86691db5856546b48d Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index caca40a0c..6443e68f4 100644
+index 1c0bf4dacb..774289a0f0 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1766,7 +1766,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,7 +19,7 @@ index caca40a0c..6443e68f4 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 16b70221e..cc6a2aaeb 100644
+index 16b70221ea..cc6a2aaeb3 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2525,7 +2525,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -32,5 +32,5 @@ index 16b70221e..cc6a2aaeb 100644
      // CraftBukkit end
  
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,11 +1,11 @@
-From 2711c437c0a4ce474e4579a6a11b84393ec9907b Mon Sep 17 00:00:00 2001
+From df57c6fea7e013d6a3f910b96026baf86c7b5b76 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
 
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index c96f3ed17..1f6a12632 100644
+index 628b73a12d..2f10dab36c 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -42,7 +42,7 @@ index c96f3ed17..1f6a12632 100644
      public static boolean isMainThread() {
          return MinecraftServer.getServer().isMainThread();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 534e2756d..1c5007015 100644
+index 6cf85f0703..1c41f00551 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -216,6 +216,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -65,5 +65,5 @@ index 534e2756d..1c5007015 100644
      public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
           if (header != null) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0136-Firework-API-s.patch

@@ -1,11 +1,11 @@
-From 83eee358ab42e7130b5dad53a4c0a98f202610c4 Mon Sep 17 00:00:00 2001
+From 421a62ed00b0fb4660535dbf0e65a9eee5ac7b93 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 07:18:33 +0100
 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 4f51b9b65..278ef79d8 100644
+index 4f51b9b654..278ef79d89 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;
@@ -53,7 +53,7 @@ index 4f51b9b65..278ef79d8 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/ItemCrossbow.java b/src/main/java/net/minecraft/server/ItemCrossbow.java
-index 6f2f6b9f5..608be9e70 100644
+index 6f2f6b9f5d..608be9e70a 100644
 --- a/src/main/java/net/minecraft/server/ItemCrossbow.java
 +++ b/src/main/java/net/minecraft/server/ItemCrossbow.java
 @@ -199,6 +199,7 @@ public class ItemCrossbow extends ItemProjectileWeapon {
@@ -65,7 +65,7 @@ index 6f2f6b9f5..608be9e70 100644
                  object = a(world, entityliving, itemstack, itemstack1);
                  if (flag || f3 != 0.0F) {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 914297bad..76b253a50 100644
+index 914297bad6..76b253a50d 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -18,6 +18,7 @@ public class ItemFireworks extends Item {
@@ -90,7 +90,7 @@ index 914297bad..76b253a50 100644
                      itemstack.subtract(1);
                  }
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 75604dbc6..98deaba12 100644
+index 75604dbc69..98deaba12c 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -136,7 +136,7 @@ public class NBTTagCompound implements NBTBase {
@@ -103,7 +103,7 @@ index 75604dbc6..98deaba12 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 475b7b004..de74e7214 100644
+index 475b7b004b..de74e7214a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -2,6 +2,7 @@ package org.bukkit.craftbukkit.entity;
@@ -145,5 +145,5 @@ index 475b7b004..de74e7214 100644
 +    // Paper end
  }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0137-PlayerTeleportEndGatewayEvent.patch

@@ -1,4 +1,4 @@
-From b399ea16b2848230ce345357ac855fc4e9b19a21 Mon Sep 17 00:00:00 2001
+From 814c2c20ab537baeb9d6e960d5224ce189271876 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index b907a3c4d..78fba7937 100644
+index b907a3c4d8..78fba79378 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -133,7 +133,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@@ -19,5 +19,5 @@ index b907a3c4d..78fba7937 100644
                      if (teleEvent.isCancelled()) {
                          return;
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 94daa691d441e249ceeffd0b9d6849bfd8417f4b Mon Sep 17 00:00:00 2001
+From f7deaf13648aaedfe20b2f5b6dcebb9d93ff870e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 31213dd20..ebe30cc21 100644
+index f600d7f7c3..2abebd465a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -275,6 +275,48 @@ public class CraftWorld implements World {
@@ -60,5 +60,5 @@ index 31213dd20..ebe30cc21 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0139-Enforce-Sync-Player-Saves.patch

@@ -1,4 +1,4 @@
-From df4a5a4b9a37740c2ad02f8e9f51f4167f1257d6 Mon Sep 17 00:00:00 2001
+From 70b62dec73d594de95c2a87b103aa4c191f95c99 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 b7012b5b6..ce5bd2229 100644
+index b7012b5b64..ce5bd2229e 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -931,11 +931,13 @@ public abstract class PlayerList {
@@ -25,5 +25,5 @@ index b7012b5b6..ce5bd2229 100644
  
      public WhiteList getWhitelist() {
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,11 +1,11 @@
-From d9e303b768837901e71e950b680879ca1ec734f4 Mon Sep 17 00:00:00 2001
+From 265ea866a833bd7b24bd2c9291f5f59c98be3c19 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 63d44401a..1619d9f41 100644
+index 63d44401ab..1619d9f415 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2025,6 +2025,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -17,5 +17,5 @@ index 63d44401a..1619d9f41 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 7803162d6eb5310a29f4ac2a5869eec6b0700432 Mon Sep 17 00:00:00 2001
+From f6485f8e7bacc338b5d415867da10c8ea455809f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 16:31:46 -0500
 Subject: [PATCH] ExperienceOrbs API for Reason/Source/Triggering player
@@ -8,7 +8,7 @@ Adds lots of information about why this orb exists.
 Replaces isFromBottle() with logic that persists entity reloads too.
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index e485d4a82..3e4fc4ee5 100644
+index e485d4a82c..3e4fc4ee5e 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -511,13 +511,13 @@ public class Block implements IMaterial {
@@ -28,7 +28,7 @@ index e485d4a82..3e4fc4ee5 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/ContainerGrindstone.java b/src/main/java/net/minecraft/server/ContainerGrindstone.java
-index 2d2cd09ad..ed88e208d 100644
+index 2d2cd09ad1..ed88e208d0 100644
 --- a/src/main/java/net/minecraft/server/ContainerGrindstone.java
 +++ b/src/main/java/net/minecraft/server/ContainerGrindstone.java
 @@ -81,7 +81,7 @@ public class ContainerGrindstone extends Container {
@@ -41,7 +41,7 @@ index 2d2cd09ad..ed88e208d 100644
  
                      world.triggerEffect(1042, blockposition, 0);
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index e0d240a89..07abcc1e2 100644
+index e0d240a89a..07abcc1e24 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -616,7 +616,7 @@ public class EntityEnderDragon extends EntityInsentient implements IMonster {
@@ -54,7 +54,7 @@ index e0d240a89..07abcc1e2 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 0447800d9..d4275e733 100644
+index 0447800d9d..d4275e733d 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -16,9 +16,59 @@ public class EntityExperienceOrb extends Entity {
@@ -134,7 +134,7 @@ index 0447800d9..d4275e733 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 8ad0d0db1..8d48154e5 100644
+index 8ad0d0db18..8d48154e5b 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -401,7 +401,7 @@ public class EntityFishingHook extends Entity {
@@ -147,7 +147,7 @@ index 8ad0d0db1..8d48154e5 100644
                      // CraftBukkit end
                      if (itemstack1.getItem().a(TagsItem.FISHES)) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 191e7dfaf..be85a76ac 100644
+index 191e7dfaf6..be85a76acd 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1377,7 +1377,8 @@ public abstract class EntityLiving extends Entity {
@@ -161,7 +161,7 @@ index 191e7dfaf..be85a76ac 100644
              this.expToDrop = 0;
          }
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index 0bfc0a773..ba2f90cc6 100644
+index 0bfc0a773d..ba2f90cc6a 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -43,7 +43,7 @@ public class EntityThrownExpBottle extends EntityProjectileThrowable {
@@ -174,7 +174,7 @@ index 0bfc0a773..ba2f90cc6 100644
  
              this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index c73cc9ae4..76296119a 100644
+index c73cc9ae4b..76296119a1 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -510,7 +510,7 @@ public class EntityTurtle extends EntityAnimal {
@@ -187,7 +187,7 @@ index c73cc9ae4..76296119a 100644
  
          }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 00300c6aa..4aa947e24 100644
+index fddc28cd13..3b4a3a4fd2 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -506,7 +506,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -200,7 +200,7 @@ index 00300c6aa..4aa947e24 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/EntityVillagerTrader.java b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
-index fa814814f..14ccf33c0 100644
+index fa814814fc..14ccf33c09 100644
 --- a/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 +++ b/src/main/java/net/minecraft/server/EntityVillagerTrader.java
 @@ -147,7 +147,7 @@ public class EntityVillagerTrader extends EntityVillagerAbstract {
@@ -213,7 +213,7 @@ index fa814814f..14ccf33c0 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
-index 1ab2668e9..2b708761d 100644
+index 1ab2668e91..2b708761d0 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalBreed.java
 @@ -117,7 +117,7 @@ public class PathfinderGoalBreed extends PathfinderGoal {
@@ -226,7 +226,7 @@ index 1ab2668e9..2b708761d 100644
                  // CraftBukkit end
              }
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 46154b281..56f249c43 100644
+index 46154b2810..56f249c431 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -374,7 +374,7 @@ public class PlayerInteractManager {
@@ -239,7 +239,7 @@ index 46154b281..56f249c43 100644
  
                  return true;
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index d2698e847..edc4a5c34 100644
+index d2698e847c..edc4a5c34e 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 @@ -2,7 +2,7 @@ package net.minecraft.server;
@@ -252,7 +252,7 @@ index d2698e847..edc4a5c34 100644
  
      public SlotFurnaceResult(EntityHuman entityhuman, IInventory iinventory, int i, int j, int k) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index 2a51a241e..0419aea92 100644
+index 2a51a241ee..0419aea923 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -554,7 +554,7 @@ public abstract class TileEntityFurnace extends TileEntityContainer implements I
@@ -265,7 +265,7 @@ index 2a51a241e..0419aea92 100644
  
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2abebd465..1e59f3f14 100644
+index 2abebd465a..1e59f3f147 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1773,7 +1773,7 @@ public class CraftWorld implements World {
@@ -278,7 +278,7 @@ index 2abebd465..1e59f3f14 100644
              entity = new EntityLightning(world, x, y, z, false);
          } else if (Firework.class.isAssignableFrom(clazz)) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 1b512cc45..fbad04567 100644
+index 1b512cc45c..fbad045675 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 @@ -20,6 +20,18 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {

Spigot-Server-Patches/0142-Cap-Entity-Collisions.patch

@@ -1,4 +1,4 @@
-From c667019226f7a78de46e1e18cdc92176f0b1044c Mon Sep 17 00:00:00 2001
+From b4c4fa54f5a94e4d29234238e452812550993522 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bf11448bc..e00e1e8f6 100644
+index bf11448bcd..e00e1e8f6a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -320,4 +320,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index bf11448bc..e00e1e8f6 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1619d9f41..fcfe8f550 100644
+index 1619d9f415..fcfe8f550d 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -189,6 +189,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index 1619d9f41..fcfe8f550 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index be85a76ac..6379b361a 100644
+index be85a76acd..6379b361a9 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2621,8 +2621,11 @@ public abstract class EntityLiving extends Entity {
@@ -56,5 +56,5 @@ index be85a76ac..6379b361a 100644
                  this.C(entity);
              }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0143-Remove-CraftScheduler-Async-Task-Debugger.patch

@@ -1,4 +1,4 @@
-From 37411084342435f6aad5b3250a8c95300c63489c Mon Sep 17 00:00:00 2001
+From 1819a4fd44fc92d50e4861e5e6698c97ec1bf515 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 00:04:04 -0500
 Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index 552daf437..e102be583 100644
+index 552daf4376..e102be583c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -414,7 +414,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -47,5 +47,5 @@ index 552daf437..e102be583 100644
  
      @Deprecated
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,11 +1,11 @@
-From ea0c748587a2f8db9942b79451971ba63d98d112 Mon Sep 17 00:00:00 2001
+From ef5f87f2ce646100c67be2d67abf14c1e210539f Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 1d4eddd93..492d1538f 100644
+index 1d4eddd931..492d1538fa 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -110,7 +110,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -37,5 +37,5 @@ index 1d4eddd93..492d1538f 100644
          }
  
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,11 +1,11 @@
-From fb88fcc7b5baa69684dd4771823d7a4a8aa14ed2 Mon Sep 17 00:00:00 2001
+From 5e59ad29bd851e66e208d654a3ef888007f43c0b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 37ce4d48b..80bf58b05 100644
+index 37ce4d48bc..80bf58b052 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -826,5 +826,10 @@ public class EntityArmorStand extends EntityLiving {
@@ -20,7 +20,7 @@ index 37ce4d48b..80bf58b05 100644
      // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 6379b361a..f6cb18639 100644
+index 6379b361a9..f6cb18639c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -227,6 +227,7 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index 6379b361a..f6cb18639 100644
                      if (this.getAirTicks() == -20) {
                          this.setAirTicks(0);
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 6be55762cf5ee4507a7f72325554765c96dc7d2c Mon Sep 17 00:00:00 2001
+From 06e0b57232e7d6e1f4307a3f348ba347fcf5bd60 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 12 May 2017 23:34:11 -0500
 Subject: [PATCH] Properly handle async calls to restart the server
@@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 38bf3ea44..a180ba6b0 100644
+index 38bf3ea449..a180ba6b0c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -88,6 +88,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -73,7 +73,7 @@ index 38bf3ea44..a180ba6b0 100644
      // Spigot Start
      private static double calcTps(double avg, double exp, double tps)
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ce5bd2229..1eb53f67e 100644
+index ce5bd2229e..1eb53f67ef 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1042,10 +1042,15 @@ public abstract class PlayerList {
@@ -102,7 +102,7 @@ index ce5bd2229..1eb53f67e 100644
      // CraftBukkit start
      public void sendMessage(IChatBaseComponent[] iChatBaseComponents) {
 diff --git a/src/main/java/org/spigotmc/RestartCommand.java b/src/main/java/org/spigotmc/RestartCommand.java
-index ccea803f5..aefea3a9a 100644
+index ccea803f58..aefea3a9a8 100644
 --- a/src/main/java/org/spigotmc/RestartCommand.java
 +++ b/src/main/java/org/spigotmc/RestartCommand.java
 @@ -46,86 +46,134 @@ public class RestartCommand extends Command
@@ -307,5 +307,5 @@ index ccea803f5..aefea3a9a 100644
 +
  }
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 2d1817280a0d11836091e26148edcc8ba09a689a Mon Sep 17 00:00:00 2001
+From f71ea06b0827a788f11a9108fb099317c506ccbf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 13 May 2017 20:11:21 -0500
 Subject: [PATCH] Add system property to disable book size limits
@@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without
 limiting incoming data from packets in some other way.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 0e89025a0..1bf74bdae 100644
+index 0e89025a06..1bf74bdaea 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 @@ -36,6 +36,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@@ -57,5 +57,5 @@ index 0e89025a0..1bf74bdae 100644
              }
  
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 2efa7347f652e1e7343139018169984a046c3812 Mon Sep 17 00:00:00 2001
+From ec99b16f0ef9b97e6d5464724b1a76dd91451399 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@@ -11,7 +11,7 @@ I suspect Mojang may switch to this behavior before full release.
 To be converted into a Paper-API event at some point in the future?
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e00e1e8f6..f151e43c3 100644
+index e00e1e8f6a..f151e43c38 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -326,4 +326,10 @@ public class PaperWorldConfig {
@@ -26,7 +26,7 @@ index e00e1e8f6..f151e43c3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 242d0df1c..673e2b79d 100644
+index 242d0df1c0..673e2b79d5 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -463,7 +463,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -39,7 +39,7 @@ index 242d0df1c..673e2b79d 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index cc6a2aaeb..01ab2e151 100644
+index cc6a2aaeb3..01ab2e1516 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1772,6 +1772,13 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -57,5 +57,5 @@ index cc6a2aaeb..01ab2e151 100644
              case RELEASE_SHIFT_KEY:
                  this.player.setSneaking(false);
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 0c7cb8c62714ae93958efc38d6b7a613fccc339c Mon Sep 17 00:00:00 2001
+From afcc911a162ba846da9493a6642a834db37a8a2c Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:34 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@@ -6,7 +6,7 @@ Subject: [PATCH] Add configuration option to prevent player names from being
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5a83fc21c..295b8390c 100644
+index 5a83fc21cb..295b8390cb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -259,4 +259,9 @@ public class PaperConfig {
@@ -20,7 +20,7 @@ index 5a83fc21c..295b8390c 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 811c33b90..77bb68605 100644
+index 811c33b900..77bb686052 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2099,5 +2099,10 @@ public final class CraftServer implements Server {
@@ -35,5 +35,5 @@ index 811c33b90..77bb68605 100644
      // Paper end
  }
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 9c98c9243d9cc8b495dce4ef15ed0df94c8d0df5 Mon Sep 17 00:00:00 2001
+From 66c89823b46d9e650360ebebe95bb84b06856cec Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@@ -19,7 +19,7 @@ Other changes:
     configuration
 
 diff --git a/pom.xml b/pom.xml
-index ae1de6d01..f716e9870 100644
+index ae1de6d010..f716e98702 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -41,10 +41,27 @@
@@ -75,7 +75,7 @@ index ae1de6d01..f716e9870 100644
                  <groupId>org.apache.maven.plugins</groupId>
 diff --git a/src/main/java/com/destroystokyo/paper/console/PaperConsole.java b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 new file mode 100644
-index 000000000..cd6e25923
+index 0000000000..cd6e259239
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/PaperConsole.java
 @@ -0,0 +1,40 @@
@@ -121,7 +121,7 @@ index 000000000..cd6e25923
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 new file mode 100644
-index 000000000..685deaa0e
+index 0000000000..685deaa0e5
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/console/TerminalConsoleCommandSender.java
 @@ -0,0 +1,17 @@
@@ -143,7 +143,7 @@ index 000000000..685deaa0e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index a5a8bad4f..dfe806291 100644
+index a5a8bad4f8..dfe8062919 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -85,6 +85,9 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -185,7 +185,7 @@ index a5a8bad4f..dfe806291 100644
          System.setOut(new PrintStream(new LoggerOutputStream(logger, Level.INFO), true));
          System.setErr(new PrintStream(new LoggerOutputStream(logger, Level.WARN), true));
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index a180ba6b0..7df3ae0ec 100644
+index a180ba6b0c..7df3ae0ec5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -57,7 +57,7 @@ import org.apache.commons.lang3.Validate;
@@ -244,7 +244,7 @@ index a180ba6b0..7df3ae0ec 100644
  
      public KeyPair getKeyPair() {
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 1eb53f67e..308bc3baf 100644
+index 1eb53f67ef..308bc3baf2 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -76,8 +76,7 @@ public abstract class PlayerList {
@@ -258,7 +258,7 @@ index 1eb53f67e..308bc3baf 100644
  
          this.k = new GameProfileBanList(PlayerList.b);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 77bb68605..cd58906ad 100644
+index 77bb686052..cd58906ad4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -41,7 +41,6 @@ import java.util.function.Consumer;
@@ -284,7 +284,7 @@ index 77bb68605..cd58906ad 100644
      @Override
      public PluginCommand getPluginCommand(String name) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 4a4e56e76..b562e95dc 100644
+index 4a4e56e764..b562e95dcd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -13,7 +13,7 @@ import java.util.logging.Logger;
@@ -335,7 +335,7 @@ index 4a4e56e76..b562e95dc 100644
              } catch (Throwable t) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java b/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 deleted file mode 100644
-index fdf2f075e..000000000
+index fdf2f075e2..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/command/ColouredConsoleSender.java
 +++ /dev/null
 @@ -1,72 +0,0 @@
@@ -412,7 +412,7 @@ index fdf2f075e..000000000
 -    }
 -}
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index befcc19f9..5510266fb 100644
+index befcc19f9b..5510266fb1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -4,20 +4,31 @@ import java.util.Collections;
@@ -495,7 +495,7 @@ index befcc19f9..5510266fb 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
-index 70f8d4299..449e99d1b 100644
+index 70f8d42992..449e99d1b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/ServerShutdownThread.java
 @@ -17,7 +17,7 @@ public class ServerShutdownThread extends Thread {
@@ -509,7 +509,7 @@ index 70f8d4299..449e99d1b 100644
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java b/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 deleted file mode 100644
-index f267f99f9..000000000
+index f267f99f96..0000000000
 --- a/src/main/java/org/bukkit/craftbukkit/util/TerminalConsoleWriterThread.java
 +++ /dev/null
 @@ -1,57 +0,0 @@
@@ -572,13 +572,13 @@ index f267f99f9..000000000
 -}
 diff --git a/src/main/resources/log4j2.component.properties b/src/main/resources/log4j2.component.properties
 new file mode 100644
-index 000000000..0694b2146
+index 0000000000..0694b21465
 --- /dev/null
 +++ b/src/main/resources/log4j2.component.properties
 @@ -0,0 +1 @@
 +log4j.skipJansi=true
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 490a9acc7..08b6bb7f9 100644
+index 490a9acc70..08b6bb7f97 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -1,12 +1,11 @@
@@ -608,5 +608,5 @@ index 490a9acc7..08b6bb7f9 100644
              <AppenderRef ref="TerminalConsole" level="info"/>
          </Root>
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 221b72d1ca538a47727288b31db4e4069ec289e7 Mon Sep 17 00:00:00 2001
+From 87f4257f24379f12edcb7b596bc3f0f41550735e Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@@ -6,7 +6,7 @@ Subject: [PATCH] provide a configurable option to disable creeper lingering
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f151e43c3..c145e27cc 100644
+index f151e43c38..c145e27ccb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -332,4 +332,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index f151e43c3..c145e27cc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index 859b52845..dabe40c5f 100644
+index 859b528456..dabe40c5f9 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -228,7 +228,7 @@ public class EntityCreeper extends EntityMonster {
@@ -34,5 +34,5 @@ index 859b52845..dabe40c5f 100644
  
              entityareaeffectcloud.setSource(this); // CraftBukkit
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,11 +1,11 @@
-From d5f7773be6ecef58bcea504533c3bb613ee1ceb5 Mon Sep 17 00:00:00 2001
+From 37702d06c80affdbcdff440d82ad3357e660fe1d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:17 -0500
 Subject: [PATCH] Item#canEntityPickup
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index dac3540c6..eadac07f6 100644
+index dac3540c6b..eadac07f69 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -513,6 +513,11 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -21,7 +21,7 @@ index dac3540c6..eadac07f6 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index f657607a1..9973fc0b1 100644
+index f657607a15..9973fc0b12 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -20,6 +20,7 @@ public class EntityItem extends Entity {
@@ -33,7 +33,7 @@ index f657607a1..9973fc0b1 100644
      public EntityItem(EntityTypes<? extends EntityItem> entitytypes, World world) {
          super(entitytypes, world);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index cc593fbc9..3f552b590 100644
+index cc593fbc99..3f552b5905 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -48,6 +48,16 @@ public class CraftItem extends CraftEntity implements Item {
@@ -54,5 +54,5 @@ index cc593fbc9..3f552b590 100644
      public String toString() {
          return "CraftItem";
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,11 +1,11 @@
-From d564e48afbfbcf86f14ef7d91940a5fc82b7b9ee Mon Sep 17 00:00:00 2001
+From 22e480619883ebfb9c513063ee24f30ed745b7a0 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:09 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 9973fc0b1..4b2e19f30 100644
+index 9973fc0b12..4b2e19f308 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -322,6 +322,7 @@ public class EntityItem extends Entity {
@@ -45,5 +45,5 @@ index 9973fc0b1..4b2e19f30 100644
                      this.die();
                      itemstack.setCount(i);
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0154-PlayerAttemptPickupItemEvent.patch

@@ -1,11 +1,11 @@
-From 48df7a39fc7f335f7b3b6e7404156087612219af Mon Sep 17 00:00:00 2001
+From d23ead16ce3d5eb25d6e66d733194b07cc598101 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:30 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 4b2e19f30..fcc1c0993 100644
+index 4b2e19f308..fcc1c0993d 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -9,6 +9,7 @@ import javax.annotation.Nullable;
@@ -40,5 +40,5 @@ index 4b2e19f30..fcc1c0993 100644
                  itemstack.setCount(canHold);
                  // Call legacy event
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,11 +1,11 @@
-From 0da274f7c094ef3191d0881e7739d9109eb19975 Mon Sep 17 00:00:00 2001
+From 87dbe871dc3acb33ff070e684f6743048f96d41f Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index cd58906ad..202f6ad68 100644
+index cd58906ad4..202f6ad68b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -77,6 +77,7 @@ import net.minecraft.server.WorldServer;
@@ -40,5 +40,5 @@ index cd58906ad..202f6ad68 100644
          // Spigot end
  
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From eceb81a7db137272593422ec5de6c890ba92f9d4 Mon Sep 17 00:00:00 2001
+From 701befb83fdaa729136843a5b102226c44de41de Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 15 Jan 2018 22:11:48 -0500
 Subject: [PATCH] Basic PlayerProfile API
@@ -7,7 +7,7 @@ Establishes base extension of profile systems for future edits too
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 new file mode 100644
-index 000000000..b151a13c1
+index 0000000000..b151a13c1b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/CraftPlayerProfile.java
 @@ -0,0 +1,280 @@
@@ -293,7 +293,7 @@ index 000000000..b151a13c1
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 new file mode 100644
-index 000000000..25836b975
+index 0000000000..25836b975b
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperAuthenticationService.java
 @@ -0,0 +1,30 @@
@@ -329,7 +329,7 @@ index 000000000..25836b975
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 new file mode 100644
-index 000000000..3bcdb8f93
+index 0000000000..3bcdb8f93f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -0,0 +1,17 @@
@@ -352,7 +352,7 @@ index 000000000..3bcdb8f93
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 new file mode 100644
-index 000000000..4b2a67423
+index 0000000000..4b2a67423f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -0,0 +1,29 @@
@@ -387,7 +387,7 @@ index 000000000..4b2a67423
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 new file mode 100644
-index 000000000..3aceb0ea8
+index 0000000000..3aceb0ea8a
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperUserAuthentication.java
 @@ -0,0 +1,11 @@
@@ -403,7 +403,7 @@ index 000000000..3aceb0ea8
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 2f10dab36..670f8313a 100644
+index 2f10dab36c..670f8313ae 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,7 +1,10 @@
@@ -429,7 +429,7 @@ index 2f10dab36..670f8313a 100644
       * Calculates distance between 2 entities
       * @param e1
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 7df3ae0ec..1ddb10741 100644
+index 7df3ae0ec5..1ddb10741b 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1289,7 +1289,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -450,7 +450,7 @@ index 7df3ae0ec..1ddb10741 100644
          return this.minecraftSessionService;
      }
 diff --git a/src/main/java/net/minecraft/server/UserCache.java b/src/main/java/net/minecraft/server/UserCache.java
-index 581199e6d..a072222bc 100644
+index 581199e6dc..a072222bc5 100644
 --- a/src/main/java/net/minecraft/server/UserCache.java
 +++ b/src/main/java/net/minecraft/server/UserCache.java
 @@ -43,7 +43,7 @@ public class UserCache {
@@ -486,7 +486,7 @@ index 581199e6d..a072222bc 100644
  
          private UserCacheEntry(GameProfile gameprofile, Date date) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 202f6ad68..2f7769c00 100644
+index 202f6ad68b..2f7769c00e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -197,6 +197,9 @@ import org.yaml.snakeyaml.error.MarkedYAMLException;
@@ -525,5 +525,5 @@ index 202f6ad68..2f7769c00 100644
      // Paper end
  }
 -- 
-2.24.0
+2.24.1
 

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

@@ -1,11 +1,11 @@
-From d07f3a2beb5500decddbeece416426183bde9c91 Mon Sep 17 00:00:00 2001
+From db651db982d33c97c1e9672009e7aca3bb032af5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 673e2b79d..2d982ce1e 100644
+index 673e2b79d5..2d982ce1e0 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1893,20 +1893,44 @@ public abstract class EntityHuman extends EntityLiving {
@@ -58,7 +58,7 @@ index 673e2b79d..2d982ce1e 100644
      @Override
      public abstract boolean isSpectator();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 66cd2db1e..a1397d142 100644
+index 66cd2db1ea..a1397d1427 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -665,6 +665,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -95,5 +95,5 @@ index 66cd2db1e..a1397d142 100644
      public boolean discoverRecipe(NamespacedKey recipe) {
          return discoverRecipes(Arrays.asList(recipe)) != 0;
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 231e2f402814cd547155b82ee47531f0a81dfb97 Mon Sep 17 00:00:00 2001
+From 16e3b587fce6bea6237f111906fb01d94eb0b0db Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 17:00:32 -0400
 Subject: [PATCH] Profile Lookup Events
@@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
 profiles that had to be looked up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
-index 3bcdb8f93..bb9894318 100644
+index 3bcdb8f93f..bb9894318e 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperGameProfileRepository.java
 @@ -1,17 +1,68 @@
@@ -81,5 +81,5 @@ index 3bcdb8f93..bb9894318 100644
      }
  }
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,11 +1,11 @@
-From 94a516b0a57ec3612f96098903af158bff7ce867 Mon Sep 17 00:00:00 2001
+From af3ffc6a7e90eb89f8a73291717e6cd3eb038500 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 2 Jul 2017 21:35:56 -0500
 Subject: [PATCH] Block player logins during server shutdown
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 3683fa298..6f7c71579 100644
+index 3683fa2984..6f7c715794 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -49,6 +49,12 @@ public class LoginListener implements PacketLoginInListener {
@@ -22,5 +22,5 @@ index 3683fa298..6f7c71579 100644
              this.c();
          } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,11 +1,11 @@
-From 56e14834b23acaeffb94083b1e35cc7a40b98c33 Mon Sep 17 00:00:00 2001
+From 320aa57d604f28bc1f678be85099222483c4dba7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index fcfe8f550..7c4ab7fe7 100644
+index fcfe8f550d..7c4ab7fe72 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -189,6 +189,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -37,7 +37,7 @@ index fcfe8f550..7c4ab7fe7 100644
  
          } catch (Throwable throwable) {
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index deb32db2b..8384a2cbf 100644
+index deb32db2b2..8384a2cbf8 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -134,6 +134,7 @@ public abstract class MobSpawnerAbstract {
@@ -49,7 +49,7 @@ index deb32db2b..8384a2cbf 100644
                          if ( entity.world.spigotConfig.nerfSpawnerMobs )
                          {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index bb07dec3c..495a7c464 100644
+index bb07dec3c8..495a7c464f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -1045,5 +1045,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -64,5 +64,5 @@ index bb07dec3c..495a7c464 100644
      // Paper end
  }
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From dca9dc7dc24627c6e09515251c1235d96365f14f Mon Sep 17 00:00:00 2001
+From 62cabe177f1205d2a6dc64aea56a228b0d2e20ae Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Dec 2016 16:24:06 -0500
 Subject: [PATCH] Improve the Saddle API for Horses
@@ -7,7 +7,7 @@ Not all horses with Saddles have armor. This lets us break up the horses with sa
 and access their saddle state separately from an interface shared with Armor.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 09016e354..9952db3eb 100644
+index 09016e3547..9952db3eb5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -6,6 +6,7 @@ import net.minecraft.server.EntityHorseAbstract;
@@ -27,7 +27,7 @@ index 09016e354..9952db3eb 100644
      }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
-index 63991bf4b..9a47a1adc 100644
+index 63991bf4be..9a47a1adc1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryHorse.java
 @@ -4,7 +4,7 @@ import net.minecraft.server.IInventory;
@@ -41,7 +41,7 @@ index 63991bf4b..9a47a1adc 100644
          super(inventory);
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 new file mode 100644
-index 000000000..99cfbaf90
+index 0000000000..99cfbaf90b
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftSaddledInventory.java
 @@ -0,0 +1,15 @@
@@ -61,5 +61,5 @@ index 000000000..99cfbaf90
 +
 +}
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 8265eef5c89938c66997f160170ef15c83912669 Mon Sep 17 00:00:00 2001
+From a1209416ec3aa88eaa43a52746caff71f1044a61 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 22:43:12 -0400
 Subject: [PATCH] Implement ensureServerConversions API
@@ -7,7 +7,7 @@ This will take a Bukkit ItemStack and run it through any conversions a server pr
 to ensure it meets latest minecraft expectations.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 01ab19434..8b219b5fa 100644
+index 01ab19434a..8b219b5fa2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -335,4 +335,10 @@ public final class CraftItemFactory implements ItemFactory {

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

@@ -1,4 +1,4 @@
-From 4b0055c1746ebc722b062767f34c9e75eb6ff3d2 Mon Sep 17 00:00:00 2001
+From c10308e739e8fb37c042b6933967e4fa1f91d80d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:59:38 -0400
 Subject: [PATCH] Implement getI18NDisplayName
@@ -8,7 +8,7 @@ Currently the server only supports the English language. To override this,
 You must replace the language file embedded in the server jar.
 
 diff --git a/src/main/java/net/minecraft/server/LocaleLanguage.java b/src/main/java/net/minecraft/server/LocaleLanguage.java
-index c0c13798f..601273933 100644
+index c0c13798f8..6012739331 100644
 --- a/src/main/java/net/minecraft/server/LocaleLanguage.java
 +++ b/src/main/java/net/minecraft/server/LocaleLanguage.java
 @@ -65,10 +65,12 @@ public class LocaleLanguage {
@@ -25,7 +25,7 @@ index c0c13798f..601273933 100644
          return this.c(s);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
-index 8b219b5fa..23d775645 100644
+index 8b219b5fa2..23d7756456 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemFactory.java
 @@ -340,5 +340,18 @@ public final class CraftItemFactory implements ItemFactory {

Spigot-Server-Patches/0164-ProfileWhitelistVerifyEvent.patch

@@ -1,11 +1,11 @@
-From 5823c5485f3d20cd2cd53ff1229f0243e79a774b Mon Sep 17 00:00:00 2001
+From ea49daa5f717ed9027cd001e027289b0ca562101 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 308bc3baf..002f7e844 100644
+index 308bc3baf2..002f7e844a 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -522,9 +522,9 @@ public abstract class PlayerList {
@@ -48,5 +48,5 @@ index 308bc3baf..002f7e844 100644
      public boolean isOp(GameProfile gameprofile) {
          return this.operators.d(gameprofile) || this.server.a(gameprofile) && this.server.getWorldServer(DimensionManager.OVERWORLD).getWorldData().t() || this.u;
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0165-Fix-this-stupid-bullshit.patch

@@ -1,4 +1,4 @@
-From 1afac47b97ebd139492651cc002123164c99f701 Mon Sep 17 00:00:00 2001
+From 84d7b66fbc057f0b35ed90ed0a5fd6f1d1e2f478 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sun, 6 Aug 2017 17:17:53 -0500
 Subject: [PATCH] Fix this stupid bullshit
@@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
 and to provide some level of hint without being disruptive.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index b562e95dc..140b82275 100644
+index b562e95dcd..140b82275c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -217,10 +217,12 @@ public class Main {
@@ -29,5 +29,5 @@ index b562e95dc..140b82275 100644
                  }
  
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,11 +1,11 @@
-From 94586121247edbc9777d6629a0d18c3b8c386f53 Mon Sep 17 00:00:00 2001
+From c6cb9206eb7d1a561e945c54df100e21c1c3ed33 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:54:40 -0500
 Subject: [PATCH] Ocelot despawns should honor nametags and leash
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index 062411455..d9a7b8ac1 100644
+index 0624114553..d9a7b8ac1e 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -81,7 +81,7 @@ public class EntityOcelot extends EntityAnimal {
@@ -18,5 +18,5 @@ index 062411455..d9a7b8ac1 100644
  
      @Override
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0167-Reset-spawner-timer-when-spawner-event-is-cancelled.patch

@@ -1,11 +1,11 @@
-From fc0c24008c1783f514a071176e2e159cfd820172 Mon Sep 17 00:00:00 2001
+From b316d460813fc1076648fe0772afc1b6c381d18e Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:45:19 -0500
 Subject: [PATCH] Reset spawner timer when spawner event is cancelled
 
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 8384a2cbf..258e96ba5 100644
+index 8384a2cbf8..258e96ba5c 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -140,6 +140,9 @@ public abstract class MobSpawnerAbstract {
@@ -28,5 +28,5 @@ index 8384a2cbf..258e96ba5 100644
                  }
  
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0168-Fix-MC-117075-TE-Unload-Lag-Spike.patch

@@ -1,14 +1,14 @@
-From 5a4f65aa640f16cfe63ad3d4a6fad3d5a01e583e Mon Sep 17 00:00:00 2001
+From 35728314aaf56249d3997a4e6c5200041d319ea1 Mon Sep 17 00:00:00 2001
 From: mezz <tehgeek@gmail.com>
 Date: Wed, 9 Aug 2017 17:51:22 -0500
 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ef5cec964..3cab54e77 100644
+index 50808b1a9f..948c025c1f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -666,7 +666,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -671,7 +671,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          gameprofilerfiller.enter("blockEntities");
          timings.tileEntityTick.startTiming(); // Spigot
          if (!this.tileEntityListUnload.isEmpty()) {
@@ -22,5 +22,5 @@ index ef5cec964..3cab54e77 100644
              this.tileEntityListUnload.clear();
          }
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0169-Allow-specifying-a-custom-authentication-servers-dow.patch

@@ -1,4 +1,4 @@
-From af7e3f0496ac4b7f4dd6f8b9b60329b68aa759cb Mon Sep 17 00:00:00 2001
+From 218046707327f37b5b49ef297b19cd62d665d54d Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 17 Aug 2017 16:08:20 -0700
 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 295b8390c..5884b04f7 100644
+index 295b8390cb..5884b04f7e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -1,5 +1,6 @@
@@ -27,7 +27,7 @@ index 295b8390c..5884b04f7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 6f7c71579..a1be28390 100644
+index 6f7c715794..a1be28390d 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -247,6 +247,10 @@ public class LoginListener implements PacketLoginInListener {
@@ -42,5 +42,5 @@ index 6f7c71579..a1be28390 100644
                              LoginListener.LOGGER.error("Couldn't verify username because servers are unavailable");
                          }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0170-LivingEntity-setKiller.patch

@@ -1,11 +1,11 @@
-From 0404dd95e23bd99fcf65b823dcf94cc16545caa5 Mon Sep 17 00:00:00 2001
+From c0ee1c5b592500d2be274cdb15cfefee63489237 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:48 -0500
 Subject: [PATCH] LivingEntity#setKiller
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index f6cb18639..bf049bfc4 100644
+index f6cb18639c..bf049bfc44 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -80,7 +80,7 @@ public abstract class EntityLiving extends Entity {
@@ -18,7 +18,7 @@ index f6cb18639..bf049bfc4 100644
      protected int ticksFarFromPlayer;
      protected float aR;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 7e9aff668..b8482c632 100644
+index 7e9aff6684..b8482c6328 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -317,6 +317,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -39,5 +39,5 @@ index 7e9aff668..b8482c632 100644
      public boolean addPotionEffect(PotionEffect effect) {
          return addPotionEffect(effect, false);
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 51f074f0e0f071356d81aace1d38ceaf4fe2a3e8 Mon Sep 17 00:00:00 2001
+From 3915b039ecab5ac03a22ce6cd519578b9ddec572 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Mon, 18 Sep 2017 12:00:03 +0200
 Subject: [PATCH] Use Log4j IOStreams to redirect System.out/err to logger
@@ -12,7 +12,7 @@ results in a separate line, even though it should not result in
 a line break. Log4j's implementation handles it correctly.
 
 diff --git a/pom.xml b/pom.xml
-index f716e9870..e6395c773 100644
+index f716e98702..e6395c7734 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,11 @@
@@ -28,7 +28,7 @@ index f716e9870..e6395c773 100644
              <groupId>org.ow2.asm</groupId>
              <artifactId>asm</artifactId>
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index dfe806291..6e95a0452 100644
+index dfe8062919..6e95a0452e 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -147,8 +147,10 @@ public class DedicatedServer extends MinecraftServer implements IMinecraftServer
@@ -45,5 +45,5 @@ index dfe806291..6e95a0452 100644
  
          thread.setDaemon(true);
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0172-Handle-plugin-prefixes-using-Log4J-configuration.patch

@@ -1,4 +1,4 @@
-From 8124c833fa4861c85f5451ca8e3e5033b0d83bde Mon Sep 17 00:00:00 2001
+From c10820f45b843ebe4597c7431f9d32f0f2213131 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:14:55 +0200
 Subject: [PATCH] Handle plugin prefixes using Log4J configuration
@@ -15,7 +15,7 @@ This may cause additional prefixes to be disabled for plugins bypassing
 the plugin logger.
 
 diff --git a/pom.xml b/pom.xml
-index e6395c773..026dcfdab 100644
+index e6395c7734..026dcfdab5 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -61,7 +61,7 @@
@@ -28,7 +28,7 @@ index e6395c773..026dcfdab 100644
          <dependency>
              <groupId>org.apache.logging.log4j</groupId>
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index d873256c0..783aa6db1 100644
+index fdca34346a..6d77bbc5aa 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -286,7 +286,7 @@ public class SpigotConfig
@@ -41,7 +41,7 @@ index d873256c0..783aa6db1 100644
  
      public static int playerShuffle;
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 08b6bb7f9..9f8334376 100644
+index 08b6bb7f97..9f8334376f 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -2,10 +2,22 @@
@@ -70,5 +70,5 @@ index 08b6bb7f9..9f8334376 100644
                  <TimeBasedTriggeringPolicy />
                  <OnStartupTriggeringPolicy />
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0173-Include-Log4J2-SLF4J-implementation.patch

@@ -1,11 +1,11 @@
-From 81c4efd41672172bdc421347dfc9429c64348208 Mon Sep 17 00:00:00 2001
+From 3c2712cd3fc1aa4f3437344970425c423a0d584e Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Thu, 21 Sep 2017 16:33:35 +0200
 Subject: [PATCH] Include Log4J2 SLF4J implementation
 
 
 diff --git a/pom.xml b/pom.xml
-index 026dcfdab..dbc425524 100644
+index 026dcfdab5..dbc425524c 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -63,6 +63,12 @@
@@ -22,5 +22,5 @@ index 026dcfdab..dbc425524 100644
              <groupId>org.apache.logging.log4j</groupId>
              <artifactId>log4j-iostreams</artifactId>
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0174-Disable-logger-prefix-for-various-plugins-bypassing-.patch

@@ -1,4 +1,4 @@
-From 60dfcd4e3f304e962558e5263c9e03c13b40058e Mon Sep 17 00:00:00 2001
+From 5451a743dbe25a42d5da3889ac1ef95c0f749c12 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Sat, 23 Sep 2017 21:07:20 +0200
 Subject: [PATCH] Disable logger prefix for various plugins bypassing the
@@ -11,7 +11,7 @@ log. Disable the logger prefix for these plugins so the messages
 show up correctly.
 
 diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml
-index 9f8334376..6711e6dff 100644
+index 9f8334376f..6711e6dff9 100644
 --- a/src/main/resources/log4j2.xml
 +++ b/src/main/resources/log4j2.xml
 @@ -5,7 +5,8 @@
@@ -35,5 +35,5 @@ index 9f8334376..6711e6dff 100644
                  </LoggerNamePatternSelector>
              </PatternLayout>
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0175-Add-PlayerJumpEvent.patch

@@ -1,11 +1,11 @@
-From 066208622cb57436c6e832f8b57820d4b9be3c8c Mon Sep 17 00:00:00 2001
+From 44f20e09eafe43f04041c71d71da4ff084354300 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Sep 2017 17:21:44 -0400
 Subject: [PATCH] Add PlayerJumpEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 01ab2e151..399724d6a 100644
+index 01ab2e1516..399724d6ac 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,8 @@ import org.bukkit.inventory.CraftingInventory;
@@ -54,5 +54,5 @@ index 01ab2e151..399724d6a 100644
  
                              this.player.move(EnumMoveType.PLAYER, new Vec3D(d7, d8, d9));
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0176-handle-PacketPlayInKeepAlive-async.patch

@@ -1,4 +1,4 @@
-From 531d21dac3ed12422173380c48104e9c09248412 Mon Sep 17 00:00:00 2001
+From 2f09acaa257b5cae146cf981ffa42577d506011b Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 5 Oct 2017 01:54:07 +0100
 Subject: [PATCH] handle PacketPlayInKeepAlive async
@@ -15,7 +15,7 @@ also adding some additional logging in order to help work out what is causing
 random disconnections for clients.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 399724d6a..a4660f2b8 100644
+index 399724d6ac..a4660f2b87 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2486,14 +2486,18 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -40,5 +40,5 @@ index 399724d6a..a4660f2b8 100644
  
      }
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 710d05e1055a1d076ee3615b9a82256baba38b5e Mon Sep 17 00:00:00 2001
+From 7f1fa0582f4ece4ddf2d2721dfe17014279fba58 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Tue, 10 Oct 2017 18:45:20 +0200
 Subject: [PATCH] Expose client protocol version and virtual host
@@ -6,7 +6,7 @@ Subject: [PATCH] Expose client protocol version and virtual host
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 new file mode 100644
-index 000000000..5caca6439
+index 0000000000..5caca6439d
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperNetworkClient.java
 @@ -0,0 +1,50 @@
@@ -61,7 +61,7 @@ index 000000000..5caca6439
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index d0b9c6e3d..8928d93e4 100644
+index d0b9c6e3dc..8928d93e49 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -15,6 +15,7 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -84,7 +84,7 @@ index d0b9c6e3d..8928d93e4 100644
  
      @Override
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 3ccf16636..e2d8ed88f 100644
+index 3ccf166366..e2d8ed88f0 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -60,6 +60,10 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -99,7 +99,7 @@ index 3ccf16636..e2d8ed88f 100644
      public NetworkManager(EnumProtocolDirection enumprotocoldirection) {
          this.h = enumprotocoldirection;
 diff --git a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
-index 4f008e472..8545146fb 100644
+index 4f008e4723..8545146fb1 100644
 --- a/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 +++ b/src/main/java/net/minecraft/server/PacketHandshakingInSetProtocol.java
 @@ -35,6 +35,7 @@ public class PacketHandshakingInSetProtocol implements Packet<PacketHandshakingI
@@ -111,7 +111,7 @@ index 4f008e472..8545146fb 100644
          return this.a;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 1c5007015..cade504af 100644
+index 1c41f00551..d47b982e7a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -183,6 +183,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -136,5 +136,5 @@ index 1c5007015..cade504af 100644
      public double getEyeHeight(boolean ignorePose) {
          if (ignorePose) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0178-revert-serverside-behavior-of-keepalives.patch

@@ -1,4 +1,4 @@
-From a04915c0d944cae377ef56a079b1da1b840766fa Mon Sep 17 00:00:00 2001
+From 4c399ba80cf163df1dd379e0dc0770840a9b2993 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 15 Oct 2017 00:29:07 +0100
 Subject: [PATCH] revert serverside behavior of keepalives
@@ -17,7 +17,7 @@ from networking or during connections flood of chunk packets on slower clients,
  at the cost of dead connections being kept open for longer.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a4660f2b8..9af8e947e 100644
+index a4660f2b87..9af8e947ef 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -70,7 +70,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -74,5 +74,5 @@ index a4660f2b8..9af8e947e 100644
          this.minecraftServer.getMethodProfiler().exit();
          // CraftBukkit start
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 1d4f71098b09cba6d0e85447da13cd260f250be8 Mon Sep 17 00:00:00 2001
+From 2bc49a24a1222a95085870214fd1db6c6376e94f Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 31 Oct 2017 03:26:18 +0100
 Subject: [PATCH] Send attack SoundEffects only to players who can see the
@@ -6,7 +6,7 @@ Subject: [PATCH] Send attack SoundEffects only to players who can see the
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 2d982ce1e..fd7de143e 100644
+index 2d982ce1e0..fd7de143e3 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1023,6 +1023,15 @@ public abstract class EntityHuman extends EntityLiving {
@@ -72,10 +72,10 @@ index 2d982ce1e..fd7de143e 100644
                              entity.extinguish();
                          }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3cab54e77..989d4d8ca 100644
+index 948c025c1f..c065a5f6e1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -603,6 +603,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -608,6 +608,11 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
          this.playSound(entityhuman, (double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D, soundeffect, soundcategory, f, f1);
      }
  
@@ -88,5 +88,5 @@ index 3cab54e77..989d4d8ca 100644
  
      public abstract void playSound(@Nullable EntityHuman entityhuman, Entity entity, SoundEffect soundeffect, SoundCategory soundcategory, float f, float f1);
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0180-Option-for-maximum-exp-value-when-merging-orbs.patch

@@ -1,11 +1,11 @@
-From 2fceac6687db42c0f6c5fa45ee062a4d55722d6f Mon Sep 17 00:00:00 2001
+From efa15ce75601ea4142787336aa79021d9a66e302 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 10 Nov 2017 23:03:12 -0500
 Subject: [PATCH] Option for maximum exp value when merging orbs
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c145e27cc..671587631 100644
+index c145e27ccb..671587631e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -338,4 +338,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index c145e27cc..671587631 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 2bf53db88..e310f2afe 100644
+index 2bf53db885..e310f2afe1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -537,16 +537,32 @@ public class CraftEventFactory {
@@ -60,5 +60,5 @@ index 2bf53db88..e310f2afe 100644
          // Spigot end
          } else if (!(entity instanceof EntityPlayer)) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0181-Add-PlayerArmorChangeEvent.patch

@@ -1,11 +1,11 @@
-From 353818a8456ac6461323ddb7ac6d1815cef712db Mon Sep 17 00:00:00 2001
+From 26c247a323e2e822648af09f81bb1131b8e61203 Mon Sep 17 00:00:00 2001
 From: pkt77 <parkerkt77@gmail.com>
 Date: Fri, 10 Nov 2017 23:46:34 -0500
 Subject: [PATCH] Add PlayerArmorChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index bf049bfc4..c03fcd2d3 100644
+index bf049bfc44..c03fcd2d38 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1,5 +1,6 @@
@@ -30,7 +30,7 @@ index bf049bfc4..c03fcd2d3 100644
                      if (!itemstack.isEmpty()) {
                          this.getAttributeMap().a(itemstack.a(enumitemslot));
 diff --git a/src/main/java/net/minecraft/server/EnumItemSlot.java b/src/main/java/net/minecraft/server/EnumItemSlot.java
-index 02a7ae678..60b235f16 100644
+index 02a7ae6785..60b235f16f 100644
 --- a/src/main/java/net/minecraft/server/EnumItemSlot.java
 +++ b/src/main/java/net/minecraft/server/EnumItemSlot.java
 @@ -16,6 +16,7 @@ public enum EnumItemSlot {
@@ -42,5 +42,5 @@ index 02a7ae678..60b235f16 100644
          return this.g;
      }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0182-Prevent-logins-from-being-processed-when-the-player-.patch

@@ -1,4 +1,4 @@
-From 02a7530a63a6e92cd283b0416021f7b128296ae5 Mon Sep 17 00:00:00 2001
+From 90ceaaaef9632c727719ec42a402016d217e863e Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Sun, 12 Nov 2017 19:40:01 +0100
 Subject: [PATCH] Prevent logins from being processed when the player has
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent logins from being processed when the player has
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index a1be28390..828b64e41 100644
+index a1be28390d..828b64e419 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -56,7 +56,11 @@ public class LoginListener implements PacketLoginInListener {
@@ -23,5 +23,5 @@ index a1be28390..828b64e41 100644
              EntityPlayer entityplayer = this.server.getPlayerList().a(this.i.getId());
  
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0183-use-CB-BlockState-implementations-for-captured-block.patch

@@ -1,4 +1,4 @@
-From 8577b822d9e3d4150092229e8e65bdbe83ef91ff Mon Sep 17 00:00:00 2001
+From d9b7412b5f93b09eb3685a630972fa96a13e7665 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 16 Nov 2017 12:12:41 +0000
 Subject: [PATCH] use CB BlockState implementations for captured blocks
@@ -18,10 +18,10 @@ the blockstate that will be valid for restoration, as opposed to dropping
 information on restoration when the event is cancelled.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 989d4d8ca..e7b8a6920 100644
+index c065a5f6e1..8b2ee61b3b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
-@@ -294,7 +294,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
+@@ -299,7 +299,7 @@ public abstract class World implements GeneratorAccess, AutoCloseable {
              // CraftBukkit start - capture blockstates
              CraftBlockState blockstate = null;
              if (this.captureBlockStates) {
@@ -31,5 +31,5 @@ index 989d4d8ca..e7b8a6920 100644
              }
              // CraftBukkit end
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0184-API-to-get-a-BlockState-without-a-snapshot.patch

@@ -1,4 +1,4 @@
-From 282a855337c9b21d88e3a025014d290aea141cf8 Mon Sep 17 00:00:00 2001
+From ae21a2ecfd6ab6db948e04a340c54fde01e7162d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 6 Nov 2017 21:08:22 -0500
 Subject: [PATCH] API to get a BlockState without a snapshot
@@ -13,7 +13,7 @@ also Avoid NPE during CraftBlockEntityState load if could not get TE
 If Tile Entity was null, correct Sign to return empty lines instead of null
 
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 630b27915..958279249 100644
+index 630b279158..958279249f 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -231,7 +231,12 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -39,7 +39,7 @@ index 630b27915..958279249 100644
          return null;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
-index 3d632543b..887ade5e8 100644
+index c0f557568d..fa840c3d38 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlock.java
 @@ -309,6 +309,20 @@ public class CraftBlock implements Block {
@@ -64,7 +64,7 @@ index 3d632543b..887ade5e8 100644
  
          switch (material) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 17d80b5c6..f6401e2cd 100644
+index 17d80b5c6e..f6401e2cde 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -26,20 +26,40 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -114,7 +114,7 @@ index 17d80b5c6..f6401e2cd 100644
  
      private T createSnapshot(T tileEntity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
-index 15022ada0..af15656cc 100644
+index 15022ada0c..af15656cc4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSign.java
 @@ -17,10 +17,12 @@ public class CraftSign extends CraftBlockEntityState<TileEntitySign> implements
@@ -131,5 +131,5 @@ index 15022ada0..af15656cc 100644
  
      @Override
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0185-AsyncTabCompleteEvent.patch

@@ -1,4 +1,4 @@
-From 78dda52d682ec67a2f8154d53b92ee578ae623e7 Mon Sep 17 00:00:00 2001
+From 8f3096e85007f17edeb22fc8f12dced89ed94ebb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:19:58 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -14,7 +14,7 @@ completion, such as offline players.
 Also adds isCommand and getLocation to the sync TabCompleteEvent
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9af8e947e..ad2a36627 100644
+index 9af8e947ef..ad2a366275 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -524,10 +524,10 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -72,7 +72,7 @@ index 9af8e947e..ad2a36627 100644
  
      @Override
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 2f7769c00..9fe19fb59 100644
+index 2f7769c00e..9fe19fb595 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1671,7 +1671,7 @@ public final class CraftServer implements Server {
@@ -85,7 +85,7 @@ index 2f7769c00..9fe19fb59 100644
  
          return tabEvent.isCancelled() ? Collections.EMPTY_LIST : tabEvent.getCompletions();
 diff --git a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
-index 5510266fb..a51202ed5 100644
+index 5510266fb1..a51202ed53 100644
 --- a/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 +++ b/src/main/java/org/bukkit/craftbukkit/command/ConsoleCommandCompleter.java
 @@ -28,6 +28,39 @@ public class ConsoleCommandCompleter implements Completer {
@@ -129,5 +129,5 @@ index 5510266fb..a51202ed5 100644
          Waitable<List<String>> waitable = new Waitable<List<String>>() {
              @Override
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0186-Avoid-NPE-in-PathfinderGoalTempt.patch

@@ -1,11 +1,11 @@
-From c72f85b26faae29bc8da82ed7ba569f479c5f427 Mon Sep 17 00:00:00 2001
+From 231de19cfd14c831c6755f5e674f2e5f0c796af8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Nov 2017 22:18:54 -0500
 Subject: [PATCH] Avoid NPE in PathfinderGoalTempt
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
-index eafdcb916..d37a2fa0a 100644
+index eafdcb916a..d37a2fa0ab 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalTempt.java
 @@ -55,7 +55,7 @@ public class PathfinderGoalTempt extends PathfinderGoal {
@@ -18,5 +18,5 @@ index eafdcb916..d37a2fa0a 100644
          }
      }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0187-PlayerPickupExperienceEvent.patch

@@ -1,4 +1,4 @@
-From d658459a32f49fc117a6dd2af0355f472518ca05 Mon Sep 17 00:00:00 2001
+From 447f68c2177cc27b6aa2e64539bda549240c01ef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:02:53 -0500
 Subject: [PATCH] PlayerPickupExperienceEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerPickupExperienceEvent
 Allows plugins to cancel a player picking up an experience orb
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index d4275e733..b3edb69a9 100644
+index d4275e733d..b3edb69a96 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -222,7 +222,7 @@ public class EntityExperienceOrb extends Entity {
@@ -19,5 +19,5 @@ index d4275e733..b3edb69a9 100644
                  entityhuman.receive(this, 1);
                  Entry<EnumItemSlot, ItemStack> entry = EnchantmentManager.b(Enchantments.MENDING, (EntityLiving) entityhuman);
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0188-ExperienceOrbMergeEvent.patch

@@ -1,4 +1,4 @@
-From f779071caff42d2a59ef762a8d39da9f3e0227e6 Mon Sep 17 00:00:00 2001
+From 7a7a77f3a1ff391f37d670a7846a038d6fbf86a5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Dec 2017 22:57:26 -0500
 Subject: [PATCH] ExperienceOrbMergeEvent
@@ -8,7 +8,7 @@ Plugins can cancel this if they want to ensure experience orbs do not lose impor
 metadata such as spawn reason, or conditionally move data from source to target.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index e310f2afe..9b314eacc 100644
+index e310f2afe1..9b314eacc3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -547,7 +547,7 @@ public class CraftEventFactory {
@@ -21,5 +21,5 @@ index e310f2afe..9b314eacc 100644
                              if ((int) newTotal < 0) continue; // Overflow
                              if (maxValue > 0 && newTotal > (long)maxValue) {
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From c9388d6d8ed70955b2c0765e9dae6ffa6a9650fc Mon Sep 17 00:00:00 2001
+From bd8432442535ad09345d53cd9f2ac82fd4156a8c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Dec 2017 17:36:49 -0500
 Subject: [PATCH] Ability to apply mending to XP API
@@ -10,7 +10,7 @@ of giving the player experience points.
 Both an API To standalone mend, and apply mending logic to .giveExp has been added.
 
 diff --git a/src/main/java/net/minecraft/server/EnchantmentManager.java b/src/main/java/net/minecraft/server/EnchantmentManager.java
-index 1822178e8..fabc7a8dd 100644
+index 1822178e8d..fabc7a8dd7 100644
 --- a/src/main/java/net/minecraft/server/EnchantmentManager.java
 +++ b/src/main/java/net/minecraft/server/EnchantmentManager.java
 @@ -246,6 +246,11 @@ public class EnchantmentManager {
@@ -26,7 +26,7 @@ index 1822178e8..fabc7a8dd 100644
      public static Entry<EnumItemSlot, ItemStack> b(Enchantment enchantment, EntityLiving entityliving) {
          Map<EnumItemSlot, ItemStack> map = enchantment.a(entityliving);
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index b3edb69a9..87c6b77ce 100644
+index b3edb69a96..87c6b77ce3 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -254,10 +254,12 @@ public class EntityExperienceOrb extends Entity {
@@ -43,7 +43,7 @@ index b3edb69a9..87c6b77ce 100644
          return i * 2;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index d47b982e7..6bdee24f8 100644
+index d47b982e7a..6bdee24f84 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1047,8 +1047,37 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -86,5 +86,5 @@ index d47b982e7..6bdee24f8 100644
      }
  
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From eaaf3357e4e96bf181c4f311f7e20ad9e798830c Mon Sep 17 00:00:00 2001
+From feee9c593efa057e9f1d53320031ed830164d05a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 11 Jan 2018 16:47:28 -0600
 Subject: [PATCH] Make max squid spawn height configurable
@@ -7,7 +7,7 @@ I don't know why upstream made only the minimum height configurable but
 whatever
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 671587631..e315a00cc 100644
+index 671587631e..e315a00cc3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -344,4 +344,9 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index 671587631..e315a00cc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySquid.java b/src/main/java/net/minecraft/server/EntitySquid.java
-index 8c4f3b2c2..1c1ff2069 100644
+index 8c4f3b2c2e..1c1ff2069d 100644
 --- a/src/main/java/net/minecraft/server/EntitySquid.java
 +++ b/src/main/java/net/minecraft/server/EntitySquid.java
 @@ -171,7 +171,8 @@ public class EntitySquid extends EntityWaterAnimal {
@@ -35,5 +35,5 @@ index 8c4f3b2c2..1c1ff2069 100644
  
      public void a(float f, float f1, float f2) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0191-PreCreatureSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 092a93451181da9283c1131567c817f0177ed7ec Mon Sep 17 00:00:00 2001
+From 3d34d1826afa4a881b19c30a277d6794e50d4728 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:01:31 -0500
 Subject: [PATCH] PreCreatureSpawnEvent
@@ -15,7 +15,7 @@ instead and save a lot of server resources.
 See: https://github.com/PaperMC/Paper/issues/917
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index 258e96ba5..fe8bc7f75 100644
+index 258e96ba5c..fe8bc7f75d 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -105,6 +105,27 @@ public abstract class MobSpawnerAbstract {
@@ -47,7 +47,7 @@ index 258e96ba5..fe8bc7f75 100644
                              entity1.setPositionRotation(d3, d4, d5, entity1.yaw, entity1.pitch);
                              return entity1;
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index 02157d051..224443e03 100644
+index 02157d051f..224443e03c 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -38,7 +38,7 @@ public final class SpawnerCreature {
@@ -86,5 +86,5 @@ index 02157d051..224443e03 100644
                                                              Entity entity = entitytypes.a((World) worldserver);
  
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0192-PlayerNaturallySpawnCreaturesEvent.patch

@@ -1,4 +1,4 @@
-From 880e221e575862228c507b8f5dcb67ca4d78f2b0 Mon Sep 17 00:00:00 2001
+From 36a38d68e42ce672b6fd3e116f292b911b2458bc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 14 Jan 2018 17:36:02 -0500
 Subject: [PATCH] PlayerNaturallySpawnCreaturesEvent
@@ -9,7 +9,7 @@ from triggering monster spawns on a server.
 Also a highly more effecient way to blanket block spawns in a world
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 492d1538f..df24bac3b 100644
+index 492d1538fa..df24bac3bb 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -843,12 +843,24 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
@@ -40,5 +40,5 @@ index 492d1538f..df24bac3b 100644
      }
  
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0193-Add-setPlayerProfile-API-for-Skulls.patch

@@ -1,4 +1,4 @@
-From 2ef86bc0487e416d204b91b9fb1ca946971dbe13 Mon Sep 17 00:00:00 2001
+From ed3bb3a215f95fd2c7df8b6899e6562ed30e874c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 19 Jan 2018 00:36:25 -0500
 Subject: [PATCH] Add setPlayerProfile API for Skulls
@@ -7,7 +7,7 @@ This allows you to create already filled textures on Skulls to avoid texture loo
 which commonly cause rate limit issues with Mojang API
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
-index a4bc7f970..2dd2f476f 100644
+index a4bc7f9701..2dd2f476f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftSkull.java
 @@ -1,5 +1,7 @@
@@ -48,7 +48,7 @@ index a4bc7f970..2dd2f476f 100644
      public BlockFace getRotation() {
          BlockData blockData = getBlockData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
-index a83abc722..c29a78fd3 100644
+index a83abc722d..c29a78fd3c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaSkull.java
 @@ -3,6 +3,8 @@ package org.bukkit.craftbukkit.inventory;
@@ -89,5 +89,5 @@ index a83abc722..c29a78fd3 100644
      public OfflinePlayer getOwningPlayer() {
          if (hasOwner()) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0194-Fill-Profile-Property-Events.patch

@@ -1,4 +1,4 @@
-From 29b51a8a3a8baa13e34edeb2742e860244d98ccc Mon Sep 17 00:00:00 2001
+From 70b63c7727ebbe78bdbd664f30409d630b2e2271 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 2 Jan 2018 00:31:26 -0500
 Subject: [PATCH] Fill Profile Property Events
@@ -11,7 +11,7 @@ If Mojang API does need to be hit, event fire so you can get the results.
 This is useful for implementing a ProfileCache for Player Skulls
 
 diff --git a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
-index 4b2a67423..61cfdf73c 100644
+index 4b2a67423f..61cfdf73c8 100644
 --- a/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 +++ b/src/main/java/com/destroystokyo/paper/profile/PaperMinecraftSessionService.java
 @@ -1,5 +1,7 @@
@@ -40,5 +40,5 @@ index 4b2a67423..61cfdf73c 100644
  
      @Override
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0195-PlayerAdvancementCriterionGrantEvent.patch

@@ -1,11 +1,11 @@
-From a995742255e4fdbd4865622b4047974b45b91b59 Mon Sep 17 00:00:00 2001
+From bcf95fe63d4cd386decaceeb3a2a713bd36086f3 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 19 Jan 2018 08:15:29 -0600
 Subject: [PATCH] PlayerAdvancementCriterionGrantEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
-index 4407e760c..fe5bea363 100644
+index 4407e760cb..fe5bea363f 100644
 --- a/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 +++ b/src/main/java/net/minecraft/server/AdvancementDataPlayer.java
 @@ -276,6 +276,12 @@ public class AdvancementDataPlayer {
@@ -22,5 +22,5 @@ index 4407e760c..fe5bea363 100644
              this.i.add(advancement);
              flag = true;
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0196-Add-ArmorStand-Item-Meta.patch

@@ -1,4 +1,4 @@
-From adffa3a0e999f6283f0c7cc41049bd40d3a7354c Mon Sep 17 00:00:00 2001
+From 2cac6305d9f20cbb442a69d9dedbe940c0087b5f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 27 Jan 2018 17:04:14 -0500
 Subject: [PATCH] Add ArmorStand Item Meta
@@ -13,7 +13,7 @@ starting point for future additions in this area.
 Fixes GH-559
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
-index f70052284..3723facca 100644
+index f700522840..3723faccac 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaArmorStand.java
 @@ -8,13 +8,39 @@ import org.bukkit.Material;
@@ -267,7 +267,7 @@ index f70052284..3723facca 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 5ee968f2e..1eede4bcc 100644
+index 5ee968f2e0..1eede4bcc6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -1428,7 +1428,15 @@ class CraftMetaItem implements ItemMeta, Damageable, Repairable, BlockDataMeta {
@@ -288,7 +288,7 @@ index 5ee968f2e..1eede4bcc 100644
              }
              return HANDLED_TAGS;
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
-index 630233960..3a82bede7 100644
+index 6302339601..3a82bede7c 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 +++ b/src/test/java/org/bukkit/craftbukkit/inventory/ItemMetaTest.java
 @@ -6,6 +6,7 @@ import java.util.ArrayList;
@@ -308,5 +308,5 @@ index 630233960..3a82bede7 100644
                      return cleanStack;
                  }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0197-Extend-Player-Interact-cancellation.patch

@@ -1,4 +1,4 @@
-From cf5b0d2dad1db1eb4f84e52d537acdff1882a711 Mon Sep 17 00:00:00 2001
+From 01183d139a2b287c2ef78efb863c855655ee0bd3 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Feb 2018 10:43:46 +0000
 Subject: [PATCH] Extend Player Interact cancellation
@@ -13,7 +13,7 @@ Update adjacent blocks of doors, double plants, pistons and beds
 when cancelling interaction.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 56f249c43..18ff6dd68 100644
+index 56f249c431..18ff6dd686 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -137,6 +137,11 @@ public class PlayerInteractManager {
@@ -55,5 +55,5 @@ index 56f249c43..18ff6dd68 100644
              enuminteractionresult = (event.useItemInHand() != Event.Result.ALLOW) ? EnumInteractionResult.SUCCESS : EnumInteractionResult.PASS;
          } else if (this.gamemode == EnumGamemode.SPECTATOR) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0198-Tameable-getOwnerUniqueId-API.patch

@@ -1,4 +1,4 @@
-From 2d9fdd1cb99d883bc8c08484c733055f154d8b8d Mon Sep 17 00:00:00 2001
+From 38a1d36783c330734362167fde6718a19d496b02 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 24 Feb 2018 01:14:55 -0500
 Subject: [PATCH] Tameable#getOwnerUniqueId API
@@ -7,7 +7,7 @@ This is faster if all you need is the UUID, as .getOwner() will cause
 an OfflinePlayer to be loaded from disk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
-index 9952db3eb..1aea5f3f0 100644
+index 9952db3eb5..1aea5f3f05 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftAbstractHorse.java
 @@ -90,6 +90,9 @@ public abstract class CraftAbstractHorse extends CraftAnimals implements Abstrac
@@ -21,7 +21,7 @@ index 9952db3eb..1aea5f3f0 100644
          return getHandle().getOwnerUUID();
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
-index 5dfa40dda..407b95caf 100644
+index 5dfa40dda1..407b95cafd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTameableAnimal.java
 @@ -17,6 +17,9 @@ public class CraftTameableAnimal extends CraftAnimals implements Tameable, Creat
@@ -35,5 +35,5 @@ index 5dfa40dda..407b95caf 100644
          try {
              return getHandle().getOwnerUUID();
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0199-Toggleable-player-crits-helps-mitigate-hacked-client.patch

@@ -1,11 +1,11 @@
-From 7168d4b9d1760a2b192340f2b1d42c23eec90328 Mon Sep 17 00:00:00 2001
+From 53c70ef02af18b8a46227272d21fd4a24d35a931 Mon Sep 17 00:00:00 2001
 From: MiniDigger <admin@minidigger.me>
 Date: Sat, 10 Mar 2018 00:50:24 +0100
 Subject: [PATCH] Toggleable player crits, helps mitigate hacked clients.
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e315a00cc..2607c4e5f 100644
+index e315a00cc3..2607c4e5fa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -187,6 +187,11 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index e315a00cc..2607c4e5f 100644
      private void allChunksAreSlimeChunks() {
          allChunksAreSlimeChunks = getBoolean("all-chunks-are-slime-chunks", false);
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index fd7de143e..eb8f3833e 100644
+index fd7de143e3..eb8f3833ec 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1063,6 +1063,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -33,5 +33,5 @@ index fd7de143e..eb8f3833e 100644
                      if (flag2) {
                          f *= 1.5F;
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0200-Fix-NPE-when-getting-location-from-InventoryEnderChe.patch

@@ -1,4 +1,4 @@
-From 32c5eda601084a43d756e78afb3b9f215a8dbcd0 Mon Sep 17 00:00:00 2001
+From c7a1a29a606ac2ac3a6a2ecf0172ab530798dbec Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 10 Mar 2018 13:03:49 +0000
 Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix NPE when getting location from InventoryEnderChest opened
 
 
 diff --git a/src/main/java/net/minecraft/server/InventoryEnderChest.java b/src/main/java/net/minecraft/server/InventoryEnderChest.java
-index 5a9ac3960..fd31b9a6d 100644
+index 5a9ac3960d..fd31b9a6dc 100644
 --- a/src/main/java/net/minecraft/server/InventoryEnderChest.java
 +++ b/src/main/java/net/minecraft/server/InventoryEnderChest.java
 @@ -5,7 +5,7 @@ import org.bukkit.inventory.InventoryHolder;
@@ -27,5 +27,5 @@ index 5a9ac3960..fd31b9a6d 100644
      }
  
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0201-Prevent-Frosted-Ice-from-loading-holding-chunks.patch

@@ -1,11 +1,11 @@
-From 220a60e8e84b4da22e86c2aed5f2da427ae2c721 Mon Sep 17 00:00:00 2001
+From 37753ff75ed0edba06f7328de1ca42f56e78f090 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Mar 2018 16:33:15 -0500
 Subject: [PATCH] Prevent Frosted Ice from loading/holding chunks
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index 5e414138e..638a0aa5a 100644
+index 5e414138e4..638a0aa5ae 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -26,8 +26,8 @@ public class BlockIceFrost extends BlockIce {
@@ -29,5 +29,5 @@ index 5e414138e..638a0aa5a 100644
                      if (j >= i) {
                          boolean flag = false;
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0202-Disable-Explicit-Network-Manager-Flushing.patch

@@ -1,4 +1,4 @@
-From 39155da9b345372c1221b2d7850c7d7b0f2f8e26 Mon Sep 17 00:00:00 2001
+From f2941c6f8f5805f8bcd34dad5d7c918f2e87b6b1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 11 Mar 2018 14:13:33 -0400
 Subject: [PATCH] Disable Explicit Network Manager Flushing
@@ -12,7 +12,7 @@ flushing on the netty event loop, so it won't do the flush on the main thread.
 Renable flushing by passing -Dpaper.explicit-flush=true
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index e2d8ed88f..08e314af7 100644
+index e2d8ed88f0..08e314af7c 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -63,6 +63,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -33,5 +33,5 @@ index e2d8ed88f..08e314af7 100644
  
          if (this.t++ % 20 == 0) {
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 85dd7c98b6fe9a8daaae06ce0aa84d6335381510 Mon Sep 17 00:00:00 2001
+From f641996995a86cf099fcaa53f850625edb707bcc Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 15:56:26 +0200
 Subject: [PATCH] Implement extended PaperServerListPingEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement extended PaperServerListPingEvent
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
 new file mode 100644
-index 000000000..c1a8e295b
+index 0000000000..c1a8e295b6
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperServerListPingEventImpl.java
 @@ -0,0 +1,31 @@
@@ -43,7 +43,7 @@ index 000000000..c1a8e295b
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
 new file mode 100644
-index 000000000..a2a409e63
+index 0000000000..a2a409e635
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperStatusClient.java
 @@ -0,0 +1,11 @@
@@ -60,7 +60,7 @@ index 000000000..a2a409e63
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 new file mode 100644
-index 000000000..a85466bc7
+index 0000000000..a85466bc7e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/StandardPaperServerListPingEventImpl.java
 @@ -0,0 +1,112 @@
@@ -177,7 +177,7 @@ index 000000000..a85466bc7
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 1ddb10741..97a0a6924 100644
+index 1ddb10741b..97a0a69247 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1,6 +1,9 @@
@@ -200,7 +200,7 @@ index 1ddb10741..97a0a6924 100644
  
              for (int k = 0; k < agameprofile.length; ++k) {
 diff --git a/src/main/java/net/minecraft/server/PacketStatusListener.java b/src/main/java/net/minecraft/server/PacketStatusListener.java
-index 658ea609c..4bb21c48b 100644
+index 658ea609cb..4bb21c48bd 100644
 --- a/src/main/java/net/minecraft/server/PacketStatusListener.java
 +++ b/src/main/java/net/minecraft/server/PacketStatusListener.java
 @@ -37,6 +37,8 @@ public class PacketStatusListener implements PacketStatusInListener {
@@ -223,7 +223,7 @@ index 658ea609c..4bb21c48b 100644
          // CraftBukkit end
      }
 diff --git a/src/main/java/net/minecraft/server/ServerPing.java b/src/main/java/net/minecraft/server/ServerPing.java
-index aa125a52d..ea52e89bd 100644
+index aa125a52dc..ea52e89bd9 100644
 --- a/src/main/java/net/minecraft/server/ServerPing.java
 +++ b/src/main/java/net/minecraft/server/ServerPing.java
 @@ -29,6 +29,7 @@ public class ServerPing {
@@ -248,7 +248,7 @@ index aa125a52d..ea52e89bd 100644
              this.c = agameprofile;
          }
 diff --git a/src/main/java/org/spigotmc/SpigotConfig.java b/src/main/java/org/spigotmc/SpigotConfig.java
-index 783aa6db1..33767c85c 100644
+index 6d77bbc5aa..1cf214eaca 100644
 --- a/src/main/java/org/spigotmc/SpigotConfig.java
 +++ b/src/main/java/org/spigotmc/SpigotConfig.java
 @@ -285,7 +285,7 @@ public class SpigotConfig
@@ -261,5 +261,5 @@ index 783aa6db1..33767c85c 100644
      }
  
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0204-Improved-Async-Task-Scheduler.patch

@@ -1,4 +1,4 @@
-From cfad943ea663c283bb1f29e4873a882158d2c2d3 Mon Sep 17 00:00:00 2001
+From 18a12fd61ac30c984eec18f436140016bb7e072e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Mar 2018 22:59:43 -0400
 Subject: [PATCH] Improved Async Task Scheduler
@@ -32,7 +32,7 @@ operations are decoupled from the sync tasks queue.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 new file mode 100644
-index 000000000..3c1992e21
+index 0000000000..3c1992e212
 --- /dev/null
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftAsyncScheduler.java
 @@ -0,0 +1,122 @@
@@ -159,7 +159,7 @@ index 000000000..3c1992e21
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index e102be583..5db848de1 100644
+index e102be583c..5db848de14 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 @@ -62,7 +62,7 @@ public class CraftScheduler implements BukkitScheduler {
@@ -365,5 +365,5 @@ index e102be583..5db848de1 100644
  
      private boolean isReady(final int currentTick) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0205-Ability-to-change-PlayerProfile-in-AsyncPreLoginEven.patch

@@ -1,4 +1,4 @@
-From 4a6a24dad2e9fbd89fd2843d554781ead788e13b Mon Sep 17 00:00:00 2001
+From 992532977da87f5636f6d26d3ca13a372071db85 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 11:45:57 -0400
 Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Ability to change PlayerProfile in AsyncPreLoginEvent
 This will allow you to change the players name or skin on login.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 828b64e41..0614976b8 100644
+index 828b64e419..0614976b86 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -1,5 +1,7 @@
@@ -44,5 +44,5 @@ index 828b64e41..0614976b8 100644
                              if (PlayerPreLoginEvent.getHandlerList().getRegisteredListeners().length != 0) {
                                  final PlayerPreLoginEvent event = new PlayerPreLoginEvent(playerName, address, uniqueId);
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From b8ef4a1e566f44104d288e456d79bdb4e33feb9b Mon Sep 17 00:00:00 2001
+From 3536545d96acde2dd82d5b6a3e0c9c5045a0026a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 18 Mar 2018 12:29:48 -0400
 Subject: [PATCH] Player.setPlayerProfile API
@@ -6,7 +6,7 @@ Subject: [PATCH] Player.setPlayerProfile API
 This can be useful for changing name or skins after a player has logged in.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index eb8f3833e..205a842ee 100644
+index eb8f3833ec..205a842ee6 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -66,7 +66,7 @@ public abstract class EntityHuman extends EntityLiving {
@@ -19,7 +19,7 @@ index eb8f3833e..205a842ee 100644
      private final ItemCooldown bW;
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index 0614976b8..a985ae7ba 100644
+index 0614976b86..a985ae7ba0 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -37,7 +37,7 @@ public class LoginListener implements PacketLoginInListener {
@@ -48,7 +48,7 @@ index 0614976b8..a985ae7ba 100644
                              uniqueId = i.getId();
                              // Paper end
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6bdee24f8..96b1eec91 100644
+index 6bdee24f84..96b1eec916 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,6 +1,8 @@
@@ -138,5 +138,5 @@ index 6bdee24f8..96b1eec91 100644
      public void removeDisconnectingPlayer(Player player) {
          hiddenPlayers.remove(player.getUniqueId());
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0207-Fix-Dragon-Server-Crashes.patch

@@ -1,4 +1,4 @@
-From 98467daafc3c829fb77aa7b95d3eeb908cd43e4e Mon Sep 17 00:00:00 2001
+From 6a9a1797c502aa96a964168b5d5f0a32fae0709d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Mar 2018 20:52:07 -0400
 Subject: [PATCH] Fix Dragon Server Crashes
@@ -7,7 +7,7 @@ If the dragon tries to find "ground" and hits a hole, or off edge,
 it will infinitely keep looking for non air and eventually crash.
 
 diff --git a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
-index c42de9771..40a8beff5 100644
+index c42de9771e..40a8beff55 100644
 --- a/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 +++ b/src/main/java/net/minecraft/server/DragonControllerLandedFlame.java
 @@ -54,7 +54,7 @@ public class DragonControllerLandedFlame extends AbstractDragonControllerLanded
@@ -20,5 +20,5 @@ index c42de9771..40a8beff5 100644
                  if (d3 < 0.0D) {
                      d3 = d2;
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0208-getPlayerUniqueId-API.patch

@@ -1,4 +1,4 @@
-From a8739afeb83ca2ccda5b6485ad3fba3702c1ccf5 Mon Sep 17 00:00:00 2001
+From b3f434caaf4cd3c54698cee75bbdd1fc66ebb530 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 22 Mar 2018 01:40:24 -0400
 Subject: [PATCH] getPlayerUniqueId API
@@ -9,7 +9,7 @@ In Offline Mode, will return an Offline UUID
 This is a more performant way to obtain a UUID for a name than loading an OfflinePlayer
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 9fe19fb59..296a11f14 100644
+index 9fe19fb595..296a11f141 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1364,6 +1364,26 @@ public final class CraftServer implements Server {
@@ -40,5 +40,5 @@ index 9fe19fb59..296a11f14 100644
      @Deprecated
      public OfflinePlayer getOfflinePlayer(String name) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0209-Make-player-data-saving-configurable.patch

@@ -1,11 +1,11 @@
-From 6f44e546f3bf909bfe8955e190a860fd1e7bf36e Mon Sep 17 00:00:00 2001
+From cbdc8be63d8cc41da8d4d75ad99e066d9132fd04 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 26 Mar 2018 18:30:53 +0300
 Subject: [PATCH] Make player data saving configurable
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5884b04f7..ba341e017 100644
+index 5884b04f7e..ba341e0174 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -270,4 +270,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 5884b04f7..ba341e017 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldNBTStorage.java b/src/main/java/net/minecraft/server/WorldNBTStorage.java
-index a0254d8e5..e60e10c57 100644
+index a0254d8e51..e60e10c57d 100644
 --- a/src/main/java/net/minecraft/server/WorldNBTStorage.java
 +++ b/src/main/java/net/minecraft/server/WorldNBTStorage.java
 @@ -138,6 +138,7 @@ public class WorldNBTStorage implements IPlayerFileData {
@@ -35,5 +35,5 @@ index a0254d8e5..e60e10c57 100644
              NBTTagCompound nbttagcompound = entityhuman.save(new NBTTagCompound());
              File file = new File(this.playerDir, entityhuman.getUniqueIDString() + ".dat.tmp");
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0210-Make-legacy-ping-handler-more-reliable.patch

@@ -1,4 +1,4 @@
-From ce39789a663bcb1d132ab10623b3535fd6680797 Mon Sep 17 00:00:00 2001
+From 88e48ce26b86d60d39c9bb4d371d48e995fc6502 Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 18:22:50 +0200
 Subject: [PATCH] Make legacy ping handler more reliable
@@ -28,7 +28,7 @@ respond to the request.
 [2]: https://netty.io/wiki/user-guide-for-4.x.html#wiki-h4-13
 
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 9ee5a1ff0..063efe9bb 100644
+index 9ee5a1ff02..063efe9bbe 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -14,6 +14,7 @@ public class LegacyPingHandler extends ChannelInboundHandlerAdapter {
@@ -167,5 +167,5 @@ index 9ee5a1ff0..063efe9bb 100644
          channelhandlercontext.pipeline().firstContext().writeAndFlush(bytebuf).addListener(ChannelFutureListener.CLOSE);
      }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0211-Call-PaperServerListPingEvent-for-legacy-pings.patch

@@ -1,4 +1,4 @@
-From 828caedc08c05b4702952f1447f9a9e79e64586f Mon Sep 17 00:00:00 2001
+From 302dff4265ee6786aa146d3f0a91335e603e83fc Mon Sep 17 00:00:00 2001
 From: Minecrell <minecrell@minecrell.net>
 Date: Wed, 11 Oct 2017 19:30:51 +0200
 Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
@@ -6,7 +6,7 @@ Subject: [PATCH] Call PaperServerListPingEvent for legacy pings
 
 diff --git a/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 new file mode 100644
-index 000000000..74c012fd4
+index 0000000000..74c012fd40
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/network/PaperLegacyStatusClient.java
 @@ -0,0 +1,73 @@
@@ -84,7 +84,7 @@ index 000000000..74c012fd4
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/LegacyPingHandler.java b/src/main/java/net/minecraft/server/LegacyPingHandler.java
-index 063efe9bb..4a49fe4cc 100644
+index 063efe9bbe..4a49fe4cc6 100644
 --- a/src/main/java/net/minecraft/server/LegacyPingHandler.java
 +++ b/src/main/java/net/minecraft/server/LegacyPingHandler.java
 @@ -1,5 +1,7 @@
@@ -153,5 +153,5 @@ index 063efe9bb..4a49fe4cc 100644
      }
  
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 708fcdaf3cb707f2d8ceeef9ee0afd71baaad221 Mon Sep 17 00:00:00 2001
+From 41d0afaa76bb4b80d203d3dbb08aa243d643af26 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 31 Mar 2018 17:04:26 +0100
 Subject: [PATCH] Flag to disable the channel limit
@@ -9,7 +9,7 @@ e.g. servers which allow and support the usage of mod packs.
 provide an optional flag to disable this check, at your own risk.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index e786641cc..b3a2b7fea 100644
+index 96b1eec916..ebf025c8aa 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -138,6 +138,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -30,5 +30,5 @@ index e786641cc..b3a2b7fea 100644
          if (channels.add(channel)) {
              server.getPluginManager().callEvent(new PlayerRegisterChannelEvent(this, channel));
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,11 +1,11 @@
-From 97c9c6abb25684ca2eef0039ac1098d3cabf5941 Mon Sep 17 00:00:00 2001
+From a5fef17d17b313d74e01ed606dcb48ef44a87b79 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 1 Apr 2018 02:29:37 +0300
 Subject: [PATCH] Add method to open already placed sign
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index a1397d142..cd8ad2704 100644
+index a1397d1427..cd8ad27047 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 @@ -764,4 +764,17 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@@ -27,5 +27,5 @@ index a1397d142..cd8ad2704 100644
 +    // Paper end
  }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0214-Configurable-sprint-interruption-on-attack.patch

@@ -1,4 +1,4 @@
-From 40ca4c9ec73dd0d1d305f637e5f29588f16d9303 Mon Sep 17 00:00:00 2001
+From ab9d9343bd388345ec9a2c56b1281f5fd721d9cb Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sat, 14 Apr 2018 20:20:46 +0200
 Subject: [PATCH] Configurable sprint interruption on attack
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable sprint interruption on attack
 If the sprint interruption is disabled players continue sprinting when they attack entities.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 2607c4e5f..1d3120b9b 100644
+index 2607c4e5fa..1d3120b9bf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -354,4 +354,9 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 2607c4e5f..1d3120b9b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 205a842ee..4e91fdd69 100644
+index 205a842ee6..4e91fdd69e 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -1112,7 +1112,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -37,5 +37,5 @@ index 205a842ee..4e91fdd69 100644
  
                          if (flag3) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0215-Fix-exploit-that-allowed-colored-signs-to-be-created.patch

@@ -1,11 +1,11 @@
-From ee33643447f7f46a805022cbc1e6ff9ae0025517 Mon Sep 17 00:00:00 2001
+From 525e9a5b2ced642a9fa7fd1ad5e1f5e3b12ea495 Mon Sep 17 00:00:00 2001
 From: 0x22 <0x22@futureclient.net>
 Date: Thu, 26 Apr 2018 04:41:11 -0400
 Subject: [PATCH] Fix exploit that allowed colored signs to be created
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ad2a36627..8757b6751 100644
+index ad2a366275..8757b6751e 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2501,7 +2501,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -18,5 +18,5 @@ index ad2a36627..8757b6751 100644
              SignChangeEvent event = new SignChangeEvent((org.bukkit.craftbukkit.block.CraftBlock) player.getWorld().getBlockAt(x, y, z), this.server.getPlayer(this.player), lines);
              this.server.getPluginManager().callEvent(event);
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0216-EndermanEscapeEvent.patch

@@ -1,4 +1,4 @@
-From 95f1d8935e27b90364050306fa692c00ad998f2f Mon Sep 17 00:00:00 2001
+From 602aee708d913111e6007e8fd3171a22eb56d68e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:15:55 -0400
 Subject: [PATCH] EndermanEscapeEvent
@@ -8,7 +8,7 @@ Fires an event anytime an enderman intends to teleport away from the player
 You may cancel this, enabling ranged attacks to damage the enderman for example.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 4519be39a..60ff02770 100644
+index 4519be39ad..60ff027700 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -2,6 +2,7 @@ package net.minecraft.server;
@@ -81,5 +81,5 @@ index 4519be39a..60ff02770 100644
                          }
  
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0217-Enderman.teleportRandomly.patch

@@ -1,4 +1,4 @@
-From 918588265838ec621e001485b36f68a4af54becb Mon Sep 17 00:00:00 2001
+From 35f7c053217f45c19fea1bae3ab1d64c3081ca0a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 13:29:44 -0400
 Subject: [PATCH] Enderman.teleportRandomly()
@@ -6,7 +6,7 @@ Subject: [PATCH] Enderman.teleportRandomly()
 Ability to trigger the vanilla "teleport randomly" mechanic of an enderman.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 60ff02770..6868ca415 100644
+index 60ff027700..6868ca4154 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -193,6 +193,7 @@ public class EntityEnderman extends EntityMonster {
@@ -18,7 +18,7 @@ index 60ff02770..6868ca415 100644
          if (!this.world.p_() && this.isAlive()) {
              double d0 = this.locX() + (this.random.nextDouble() - 0.5D) * 64.0D;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
-index 970efabd3..0c5f35934 100644
+index 970efabd37..0c5f359346 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEnderman.java
 @@ -16,6 +16,7 @@ public class CraftEnderman extends CraftMonster implements Enderman {
@@ -30,5 +30,5 @@ index 970efabd3..0c5f35934 100644
      public MaterialData getCarriedMaterial() {
          IBlockData blockData = getHandle().getCarried();
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0218-Block-Enderpearl-Travel-Exploit.patch

@@ -1,4 +1,4 @@
-From 36ce57946d39251b606722693561454b8b63e7a2 Mon Sep 17 00:00:00 2001
+From 8bed28be730343282419516db2bb02293d4d9aeb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 30 Apr 2018 17:15:26 -0400
 Subject: [PATCH] Block Enderpearl Travel Exploit
@@ -12,7 +12,7 @@ This disables that by not saving the thrower when the chunk is unloaded.
 This is mainly useful for survival servers that do not allow freeform teleporting.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 1d3120b9b..585646ded 100644
+index 1d3120b9bf..585646deda 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -359,4 +359,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index 1d3120b9b..585646ded 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 724b78b5d..9eed1dce3 100644
+index 724b78b5d2..9eed1dce3e 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -201,6 +201,7 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -39,5 +39,5 @@ index 724b78b5d..9eed1dce3 100644
      }
  
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 33aeabed1a727fd1745d0c9d8eceef2260106725 Mon Sep 17 00:00:00 2001
+From d6bb623518ca5a620eef3aa68a872719f181e8f3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 15 Aug 2017 22:29:12 -0400
 Subject: [PATCH] Expand World.spawnParticle API and add Builder
@@ -10,7 +10,7 @@ Adds an option to control the force mode of the particle.
 This adds a new Builder API which is much friendlier to use.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f84e727d9..8a8c2eaf5 100644
+index f84e727d9f..8a8c2eaf58 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -55,7 +55,7 @@ public class WorldServer extends World {
@@ -43,7 +43,7 @@ index f84e727d9..8a8c2eaf5 100644
  
              if (this.a(entityplayer, force, d0, d1, d2, packetplayoutworldparticles)) { // CraftBukkit
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1e59f3f14..2f1f308ab 100644
+index 1e59f3f147..2f1f308ab1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -2233,11 +2233,17 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0220-EndermanAttackPlayerEvent.patch

@@ -1,4 +1,4 @@
-From 2525095dad65d3f653f2900049dabd95e9af773d Mon Sep 17 00:00:00 2001
+From 24c9f46cdac11e14f83a383b6dbc4917c75dab16 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 1 May 2018 20:18:54 -0400
 Subject: [PATCH] EndermanAttackPlayerEvent
@@ -8,7 +8,7 @@ Allow control over whether or not an enderman aggros a player.
 This allows you to override/extend the pumpkin/stare logic.
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 6868ca415..607d6da6a 100644
+index 6868ca4154..607d6da6a4 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -141,7 +141,15 @@ public class EntityEnderman extends EntityMonster {
@@ -28,5 +28,5 @@ index 6868ca415..607d6da6a 100644
  
          if (itemstack.getItem() == Blocks.CARVED_PUMPKIN.getItem()) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0221-WitchConsumePotionEvent.patch

@@ -1,4 +1,4 @@
-From e2e97b1806e88aecdbbaa983a3f1ec0eac102b39 Mon Sep 17 00:00:00 2001
+From 660fec333580d4510f4bcd1c645c14461a341c31 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:35:16 -0400
 Subject: [PATCH] WitchConsumePotionEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchConsumePotionEvent
 Fires when a witch consumes the potion in their hand
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index ddff0b578..aa9011171 100644
+index ddff0b5786..aa90111716 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -88,7 +88,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -23,5 +23,5 @@ index ddff0b578..aa9011171 100644
                          if (list != null) {
                              Iterator iterator = list.iterator();
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0222-WitchThrowPotionEvent.patch

@@ -1,4 +1,4 @@
-From d752ec090fd564619e2e18a95ef1090909fdeb75 Mon Sep 17 00:00:00 2001
+From 6472b7b72f2ec634ac692407a510ee91e004db33 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 16 May 2018 20:44:58 -0400
 Subject: [PATCH] WitchThrowPotionEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] WitchThrowPotionEvent
 Fired when a witch throws a potion at a player
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index aa9011171..1f2759e95 100644
+index aa90111716..1f2759e95e 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -185,9 +185,16 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -29,5 +29,5 @@ index aa9011171..1f2759e95 100644
              entitypotion.shoot(d0, d1 + (double) (f1 * 0.2F), d2, 0.75F, 8.0F);
              this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_THROW, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From dc1627fdf76e17665a6053858faa93c077e62622 Mon Sep 17 00:00:00 2001
+From bf1fd2d7de1417e3d99088b483c266b01f0aa7bf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Jun 2018 20:39:20 -0400
 Subject: [PATCH] Allow spawning Item entities with World.spawnEntity
@@ -8,7 +8,7 @@ This API has more capabilities than .dropItem with the Consumer function
 Item can be set inside of the Consumer pre spawn function.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2f1f308ab..b66fa7b89 100644
+index 2f1f308ab1..b66fa7b894 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1465,6 +1465,10 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0224-WitchReadyPotionEvent.patch

@@ -1,11 +1,11 @@
-From 7822c66db3ab96c5b892428bd1c3a7df96645715 Mon Sep 17 00:00:00 2001
+From 799359edc3098c9b8ac49c02fdaf8e61f8793fd4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 22:47:26 -0400
 Subject: [PATCH] WitchReadyPotionEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index 1f2759e95..be6ecfb08 100644
+index 1f2759e95e..be6ecfb08a 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -121,7 +121,11 @@ public class EntityWitch extends EntityRaider implements IRangedEntity {
@@ -22,5 +22,5 @@ index 1f2759e95..be6ecfb08 100644
                      this.t(true);
                      this.world.playSound((EntityHuman) null, this.locX(), this.locY(), this.locZ(), SoundEffects.ENTITY_WITCH_DRINK, this.getSoundCategory(), 1.0F, 0.8F + this.random.nextFloat() * 0.4F);
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0225-ItemStack-getMaxItemUseDuration.patch

@@ -1,4 +1,4 @@
-From 73e6994894a822b241cf0cc485ac9b8b1d6a8c76 Mon Sep 17 00:00:00 2001
+From 3668331a4c3224665732696a292e087603180f9e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jun 2018 23:00:29 -0400
 Subject: [PATCH] ItemStack#getMaxItemUseDuration
@@ -6,7 +6,7 @@ Subject: [PATCH] ItemStack#getMaxItemUseDuration
 Allows you to determine how long it takes to use a usable/consumable item
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 2d0a8c58f..5fc7124dd 100644
+index 2d0a8c58fb..5fc7124dd5 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -548,6 +548,7 @@ public final class ItemStack {
@@ -18,7 +18,7 @@ index 2d0a8c58f..5fc7124dd 100644
          return this.getItem().f_(this);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 410444747..553f60987 100644
+index 3dd912abe3..a41be8fdae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -174,6 +174,13 @@ public final class CraftItemStack extends ItemStack {
@@ -36,5 +36,5 @@ index 410444747..553f60987 100644
      public void addUnsafeEnchantment(Enchantment ench, int level) {
          Validate.notNull(ench, "Cannot add null enchantment");
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0226-Implement-EntityTeleportEndGatewayEvent.patch

@@ -1,11 +1,11 @@
-From 72c985a2c8e569e9471edc10f46e5edd7e9e7cd9 Mon Sep 17 00:00:00 2001
+From 5df14fcf69aad1c5e8fedb327641895e3b825a1b Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 9 Jun 2018 14:08:39 +0200
 Subject: [PATCH] Implement EntityTeleportEndGatewayEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index 78fba7937..c71f76004 100644
+index 78fba79378..c71f76004e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -145,8 +145,19 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@@ -30,5 +30,5 @@ index 78fba7937..c71f76004 100644
  
              this.h();
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0227-Unset-Ignited-flag-on-cancel-of-Explosion-Event.patch

@@ -1,4 +1,4 @@
-From 29ec2e2ea3e8cc94fa15a4bdbd7f9fef3a4c3381 Mon Sep 17 00:00:00 2001
+From 71b17d41c230f37f7896238653970eb145a1bca7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 01:18:49 -0400
 Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
@@ -6,7 +6,7 @@ Subject: [PATCH] Unset Ignited flag on cancel of Explosion Event
 Otherwise the creeper infinite explodes
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreeper.java b/src/main/java/net/minecraft/server/EntityCreeper.java
-index dabe40c5f..317c1998e 100644
+index dabe40c5f9..317c1998e6 100644
 --- a/src/main/java/net/minecraft/server/EntityCreeper.java
 +++ b/src/main/java/net/minecraft/server/EntityCreeper.java
 @@ -12,7 +12,7 @@ public class EntityCreeper extends EntityMonster {
@@ -27,5 +27,5 @@ index dabe40c5f..317c1998e 100644
              // CraftBukkit end
          }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0228-Fix-CraftEntity-hashCode.patch

@@ -1,4 +1,4 @@
-From 22b1f8bebd55c58a20f60090957dc3e8bd4fc9f7 Mon Sep 17 00:00:00 2001
+From 655e6e34576247e9c6e0dc75782d760880823d12 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 10 Jun 2018 20:20:15 -0400
 Subject: [PATCH] Fix CraftEntity hashCode
@@ -21,7 +21,7 @@ check is essentially the same as this.getHandle() == other.getHandle()
 However, replaced it too to make it clearer of intent.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 495a7c464..915ccb180 100644
+index 495a7c464f..915ccb1807 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -723,14 +723,15 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -45,5 +45,5 @@ index 495a7c464..915ccb180 100644
  
      @Override
 -- 
-2.17.1
+2.24.1