Drop hopper optimization patch

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

@@ -1,4 +1,4 @@
-From 3fc1c76a17b253d86af5396c7df7bad5a945abad Mon Sep 17 00:00:00 2001
+From dc069e1a6668c0e44a93eef06e15d919abdc74ca Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Thu, 23 Aug 2018 11:45:32 -0400
 Subject: [PATCH] Optimize CraftBlockData Creation
@@ -7,7 +7,7 @@ Avoids a hashmap lookup by cacheing a reference to the CraftBlockData
 and cloning it when one is needed.
 
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index 08d884649..8fb0b5af0 100644
+index 9ab57be85..c1ff62aa5 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -4,6 +4,8 @@ import com.google.common.collect.ImmutableMap;
@@ -58,5 +58,5 @@ index e371e7f6d..32e1e7e20 100644
      }
  }
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0281-Optimize-Hoppers.patch

@@ -1,308 +0,0 @@
-From bd7c380b8e4238b100012405cf46a02a0e05990d Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Wed, 27 Apr 2016 22:09:52 -0400
-Subject: [PATCH] Optimize Hoppers
-
-* Removes unnecessary extra calls to .update() that are very expensive
-* Lots of itemstack cloning removed. Only clone if the item is actually moved
-* Return true when a plugin cancels inventory move item event instead of false, as false causes pulls to cycle through all items.
-  However, pushes do not exhibit the same behavior, so this is not something plugins could of been relying on.
-* Add option (Default on) to cooldown hoppers when they fail to move an item due to full inventory
-* Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 42d14fac2..80d66c647 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -397,4 +397,13 @@ public class PaperWorldConfig {
-         this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
-         log("ArmorStand ticking is " + (this.armorStandTick ? "enabled" : "disabled") + " by default");
-     }
-+
-+    public boolean cooldownHopperWhenFull = true;
-+    public boolean disableHopperMoveEvents = false;
-+    private void hopperOptimizations() {
-+        cooldownHopperWhenFull = getBoolean("hopper.cooldown-when-full", cooldownHopperWhenFull);
-+        log("Cooldown Hoppers when Full: " + (cooldownHopperWhenFull ? "enabled" : "disabled"));
-+        disableHopperMoveEvents = getBoolean("hopper.disable-move-event", disableHopperMoveEvents);
-+        log("Hopper Move Item Events: " + (disableHopperMoveEvents ? "disabled" : "enabled"));
-+    }
- }
-diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 33d9cac4d..627fa465c 100644
---- a/src/main/java/net/minecraft/server/ItemStack.java
-+++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -481,11 +481,12 @@ public final class ItemStack {
-         return this.getItem().a(this, entityhuman, entityliving, enumhand);
-     }
- 
--    public ItemStack cloneItemStack() {
-+    public ItemStack cloneItemStack() { return cloneItemStack(false); } // Paper
-+    public ItemStack cloneItemStack(boolean origItem) { // Paper
-         if (this.isEmpty()) {
-             return ItemStack.a;
-         } else {
--            ItemStack itemstack = new ItemStack(this.getItem(), this.count);
-+            ItemStack itemstack = new ItemStack(origItem ? this.item : this.getItem(), this.count); // Paper
- 
-             itemstack.d(this.C());
-             if (this.tag != null) {
-diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index dd2d8712e..206a4ad64 100644
---- a/src/main/java/net/minecraft/server/MinecraftServer.java
-+++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -1168,6 +1168,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
-             WorldServer worldserver = (WorldServer) iterator.next();
- 
-             worldserver.hasPhysicsEvent =  org.bukkit.event.block.BlockPhysicsEvent.getHandlerList().getRegisteredListeners().length > 0; // Paper
-+            TileEntityHopper.skipHopperEvents = worldserver.paperConfig.disableHopperMoveEvents || org.bukkit.event.inventory.InventoryMoveItemEvent.getHandlerList().getRegisteredListeners().length == 0; // Paper
-             if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit
-                 this.methodProfiler.a(() -> {
-                     return worldserver.getWorldData().getName() + " " + IRegistry.DIMENSION_TYPE.getKey(worldserver.worldProvider.getDimensionManager());
-diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index 958279249..a8e64dfda 100644
---- a/src/main/java/net/minecraft/server/TileEntity.java
-+++ b/src/main/java/net/minecraft/server/TileEntity.java
-@@ -62,6 +62,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
-     public void setCurrentChunk(Chunk chunk) {
-         this.currentChunk = chunk != null ? new java.lang.ref.WeakReference<>(chunk) : null;
-     }
-+    static boolean IGNORE_TILE_UPDATES = false;
-     // Paper end
- 
-     @Nullable
-@@ -140,6 +141,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
- 
-     public void update() {
-         if (this.world != null) {
-+            if (IGNORE_TILE_UPDATES) return; // Paper
-             this.c = this.world.getType(this.position);
-             this.world.b(this.position, this);
-             if (!this.c.isAir()) {
-diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index e08faf538..e7cf14d10 100644
---- a/src/main/java/net/minecraft/server/TileEntityHopper.java
-+++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
-@@ -168,6 +168,158 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
-         return false;
-     }
- 
-+    // Paper start - Optimize Hoppers
-+    private static boolean skipPullModeEventFire = false;
-+    private static boolean skipPushModeEventFire = false;
-+    static boolean skipHopperEvents = false;
-+
-+    private boolean hopperPush(IInventory iinventory, EnumDirection enumdirection) {
-+        skipPushModeEventFire = skipHopperEvents;
-+        boolean foundItem = false;
-+        for (int i = 0; i < this.getSize(); ++i) {
-+            if (!this.getItem(i).isEmpty()) {
-+                foundItem = true;
-+                ItemStack origItemStack = this.getItem(i);
-+                ItemStack itemstack = origItemStack;
-+
-+                final int origCount = origItemStack.getCount();
-+                final int moved = Math.min(world.spigotConfig.hopperAmount, origCount);
-+                origItemStack.setCount(moved);
-+
-+                // We only need to fire the event once to give protection plugins a chance to cancel this event
-+                // Because nothing uses getItem, every event call should end up the same result.
-+                if (!skipPushModeEventFire) {
-+                    itemstack = callPushMoveEvent(iinventory, itemstack);
-+                    if (itemstack == null) { // cancelled
-+                        origItemStack.setCount(origCount);
-+                        return false;
-+                    }
-+                }
-+                final ItemStack itemstack2 = addItem(this, iinventory, itemstack, enumdirection);
-+                final int remaining = itemstack2.getCount();
-+                if (remaining != moved) {
-+                    origItemStack = origItemStack.cloneItemStack(true);
-+                    if (!origItemStack.isEmpty()) {
-+                        origItemStack.setCount(origCount - moved + remaining);
-+                    }
-+                    this.setItem(i, origItemStack);
-+                    iinventory.update();
-+                    return true;
-+                }
-+                origItemStack.setCount(origCount);
-+            }
-+        }
-+        if (foundItem && world.paperConfig.cooldownHopperWhenFull) { // Inventory was full - cooldown
-+            this.setCooldown(world.spigotConfig.hopperTransfer);
-+        }
-+        return false;
-+    }
-+
-+    private static boolean hopperPull(IHopper ihopper, IInventory iinventory, int i) {
-+        ItemStack origItemStack = iinventory.getItem(i);
-+        ItemStack itemstack = origItemStack;
-+        final int origCount = origItemStack.getCount();
-+        final World world = ihopper.getWorld();
-+        final int moved = Math.min(world.spigotConfig.hopperAmount, origCount);
-+        itemstack.setCount(moved);
-+
-+        if (!skipPullModeEventFire) {
-+            itemstack = callPullMoveEvent(ihopper, iinventory, itemstack);
-+            if (itemstack == null) { // cancelled
-+                origItemStack.setCount(origCount);
-+                // Drastically improve performance by returning true.
-+                // No plugin could of relied on the behavior of false as the other call
-+                // site for IMIE did not exhibit the same behavior
-+                return true;
-+            }
-+        }
-+
-+        final ItemStack itemstack2 = addItem(iinventory, ihopper, itemstack, null);
-+        final int remaining = itemstack2.getCount();
-+        if (remaining != moved) {
-+            origItemStack = origItemStack.cloneItemStack(true);
-+            if (!origItemStack.isEmpty()) {
-+                origItemStack.setCount(origCount - moved + remaining);
-+            }
-+            IGNORE_TILE_UPDATES = true;
-+            iinventory.setItem(i, origItemStack);
-+            IGNORE_TILE_UPDATES = false;
-+            iinventory.update();
-+            return true;
-+        }
-+        origItemStack.setCount(origCount);
-+
-+        if (world.paperConfig.cooldownHopperWhenFull) {
-+            cooldownHopper(ihopper);
-+        }
-+
-+        return false;
-+    }
-+
-+    private ItemStack callPushMoveEvent(IInventory iinventory, ItemStack itemstack) {
-+        Inventory destinationInventory = getInventory(iinventory);
-+        InventoryMoveItemEvent event = new InventoryMoveItemEvent(this.getOwner(false).getInventory(),
-+            CraftItemStack.asCraftMirror(itemstack), destinationInventory, true);
-+        boolean result = event.callEvent();
-+        if (!event.calledGetItem && !event.calledSetItem) {
-+            skipPushModeEventFire = true;
-+        }
-+        if (!result) {
-+            cooldownHopper(this);
-+            return null;
-+        }
-+
-+        if (event.calledSetItem) {
-+            return CraftItemStack.asNMSCopy(event.getItem());
-+        } else {
-+            return itemstack;
-+        }
-+    }
-+
-+    private static ItemStack callPullMoveEvent(IHopper hopper, IInventory iinventory, ItemStack itemstack) {
-+        Inventory sourceInventory = getInventory(iinventory);
-+        Inventory destination = getInventory(hopper);
-+
-+        InventoryMoveItemEvent event = new InventoryMoveItemEvent(sourceInventory,
-+            // Mirror is safe as we no plugins ever use this item
-+            CraftItemStack.asCraftMirror(itemstack), destination, false);
-+        boolean result = event.callEvent();
-+        if (!event.calledGetItem && !event.calledSetItem) {
-+            skipPullModeEventFire = true;
-+        }
-+        if (!result) {
-+            cooldownHopper(hopper);
-+            return null;
-+        }
-+
-+        if (event.calledSetItem) {
-+            return CraftItemStack.asNMSCopy(event.getItem());
-+        } else {
-+            return itemstack;
-+        }
-+    }
-+
-+    private static Inventory getInventory(IInventory iinventory) {
-+        Inventory sourceInventory;// Have to special case large chests as they work oddly
-+        if (iinventory instanceof InventoryLargeChest) {
-+            sourceInventory = new org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest((InventoryLargeChest) iinventory);
-+        } else if (iinventory instanceof TileEntity) {
-+            sourceInventory = ((TileEntity) iinventory).getOwner(false).getInventory();
-+        } else {
-+            sourceInventory = iinventory.getOwner().getInventory();
-+        }
-+        return sourceInventory;
-+    }
-+
-+    private static void cooldownHopper(IHopper hopper) {
-+        if (hopper instanceof TileEntityHopper) {
-+            ((TileEntityHopper) hopper).setCooldown(hopper.getWorld().spigotConfig.hopperTransfer);
-+        } else if (hopper instanceof EntityMinecartHopper) {
-+            ((EntityMinecartHopper) hopper).setCooldown(hopper.getWorld().spigotConfig.hopperTransfer / 2);
-+        }
-+    }
-+    // Paper end
-+
-     private boolean j() {
-         IInventory iinventory = this.k();
- 
-@@ -179,6 +331,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
-             if (this.b(iinventory, enumdirection)) {
-                 return false;
-             } else {
-+                return hopperPush(iinventory, enumdirection); /* // Paper - disable rest
-                 for (int i = 0; i < this.getSize(); ++i) {
-                     if (!this.getItem(i).isEmpty()) {
-                         ItemStack itemstack = this.getItem(i).cloneItemStack();
-@@ -216,7 +369,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
-                     }
-                 }
- 
--                return false;
-+                return false;*/ // Paper - end commenting out replaced block for Hopper Optimizations
-             }
-         }
-     }
-@@ -246,6 +399,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
-             EnumDirection enumdirection = EnumDirection.DOWN;
- 
-             return c(iinventory, enumdirection) ? false : a(iinventory, enumdirection).anyMatch((i) -> {
-+                skipPullModeEventFire = skipHopperEvents; // Paper
-                 return a(ihopper, iinventory, i, enumdirection);
-             });
-         } else {
-@@ -269,6 +423,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
-         ItemStack itemstack = iinventory.getItem(i);
- 
-         if (!itemstack.isEmpty() && b(iinventory, itemstack, i, enumdirection)) {
-+            return hopperPull(ihopper, iinventory, i); /* // Paper - disable rest
-             ItemStack itemstack1 = itemstack.cloneItemStack();
-             // ItemStack itemstack2 = addItem(iinventory, ihopper, iinventory.splitStack(i, 1), (EnumDirection) null);
-             // CraftBukkit start - Call event on collection of items from inventories into the hopper
-@@ -305,7 +460,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
-             }
- 
-             itemstack1.subtract(origCount - itemstack2.getCount()); // Spigot
--            iinventory.setItem(i, itemstack1);
-+            iinventory.setItem(i, itemstack1);*/ // Paper - end commenting out replaced block for Hopper Optimizations
-         }
- 
-         return false;
-@@ -314,7 +469,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
-     public static boolean a(IInventory iinventory, EntityItem entityitem) {
-         boolean flag = false;
-         // CraftBukkit start
--        InventoryPickupItemEvent event = new InventoryPickupItemEvent(iinventory.getOwner().getInventory(), (org.bukkit.entity.Item) entityitem.getBukkitEntity());
-+        InventoryPickupItemEvent event = new InventoryPickupItemEvent(getInventory(iinventory), (org.bukkit.entity.Item) entityitem.getBukkitEntity()); // Paper - use getInventory() to avoid snapshot creation
-         entityitem.world.getServer().getPluginManager().callEvent(event);
-         if (event.isCancelled()) {
-             return false;
-@@ -368,7 +523,9 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
-             boolean flag1 = iinventory1.isNotEmpty();
- 
-             if (itemstack1.isEmpty()) {
-+                IGNORE_TILE_UPDATES = true; // Paper
-                 iinventory1.setItem(i, itemstack);
-+                IGNORE_TILE_UPDATES = false; // Paper
-                 itemstack = ItemStack.a;
-                 flag = true;
-             } else if (a(itemstack1, itemstack)) {
--- 
-2.24.1
-

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

@@ -1,4 +1,4 @@
-From c9add3dc1b55a0e314d5666f92048780391543e4 Mon Sep 17 00:00:00 2001
+From dac3f29d0a5a4e59c4f826b6d50dce11025c4504 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 23 Aug 2018 09:25:30 -0500
 Subject: [PATCH] Fix MC-124320
@@ -49,5 +49,5 @@ index 607d6da6a..9783576e3 100644
              if (iblockdata2 != null && this.a(world, blockposition, iblockdata2, iblockdata, iblockdata1, blockposition1)) {
                  // CraftBukkit start - Place event
 -- 
-2.24.0
+2.24.1
 

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

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

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

@@ -1,16 +1,16 @@
-From 2dbf414e34fd7e66b41f5a61ba339066334b96bc Mon Sep 17 00:00:00 2001
+From e7f1401564669e09a5cc18a9fe4c286ee592e14f Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 8 Aug 2018 16:33:21 -0600
 Subject: [PATCH] Configurable speed for water flowing over lava
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 80d66c647..e49318a19 100644
+index 42d14fac2..50ac7afa3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -406,4 +406,10 @@ public class PaperWorldConfig {
-         disableHopperMoveEvents = getBoolean("hopper.disable-move-event", disableHopperMoveEvents);
-         log("Hopper Move Item Events: " + (disableHopperMoveEvents ? "disabled" : "enabled"));
+@@ -397,4 +397,10 @@ public class PaperWorldConfig {
+         this.armorStandTick = this.getBoolean("armor-stands-tick", this.armorStandTick);
+         log("ArmorStand ticking is " + (this.armorStandTick ? "enabled" : "disabled") + " by default");
      }
 +
 +    public int waterOverLavaFlowSpeed;
@@ -63,5 +63,5 @@ index f56e14e1e..6d351f097 100644
  
      }
 -- 
-2.24.0
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 968d20619e07b3799919f9e99e7cc45ea49648df Mon Sep 17 00:00:00 2001
+From eded868d4f4ee0db989d4d4450005d72b7763e04 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Aug 2018 20:49:50 -0400
 Subject: [PATCH] Optimize RegistryMaterials
@@ -31,5 +31,5 @@ index 2d6a7b3a4..8477febca 100644
      }
  }
 -- 
-2.24.0
+2.24.1
 

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

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

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

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

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

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

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

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

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

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

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

@@ -1,4 +1,4 @@
-From 3590e4bd260d911e814106f2fb07e0ed215f4b15 Mon Sep 17 00:00:00 2001
+From 621287e4ba520e85816acbd76d953782e6135bda Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:02:00 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
@@ -27,7 +27,7 @@ index 007934d8c..78e48f478 100644
          this.aB = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 61dbb31e7..c6c392676 100644
+index ba4eb3726..609e274a3 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1911,6 +1911,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -52,5 +52,5 @@ index 61dbb31e7..c6c392676 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From fa128e7c426f23d5895d0fbe65280a461599d94a Mon Sep 17 00:00:00 2001
+From ef392b83073887b09af57cfec07da022cc478055 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events

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

@@ -1,11 +1,11 @@
-From 4b88c16c6b5fde287c99a5871c991940d9da6e34 Mon Sep 17 00:00:00 2001
+From 1b80a8b0485c770ffc0e7a9a211d513b63d49755 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 8 Sep 2018 18:43:31 -0500
 Subject: [PATCH] Allow chests to be placed with NBT data
 
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 627fa465c..df85f9df0 100644
+index 33d9cac4d..d891e7b0e 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -240,6 +240,7 @@ public final class ItemStack {
@@ -30,5 +30,5 @@ index c4766f729..b22bd06e2 100644
      // CraftBukkit end
  }
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 16c59686eddc334ed5c83c69bd51dba172461a3a Mon Sep 17 00:00:00 2001
+From 584c67abf4dd71762380e31f5fc963983ada8d23 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 9 Sep 2018 13:30:00 -0400
 Subject: [PATCH] Mob Pathfinding API
@@ -243,5 +243,5 @@ index 5bf1cd06f..53c2d154e 100644
      public void setTarget(LivingEntity target) {
          EntityInsentient entity = getHandle();
 -- 
-2.24.0
+2.24.1
 

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

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

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

@@ -1,4 +1,4 @@
-From e1c3b29f882864102b37e502f90ad0714d4c063d Mon Sep 17 00:00:00 2001
+From 85fb0de6a6b21cb679f1b8bfe80731ba8e3703ca Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:55 +0300
 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
@@ -432,5 +432,5 @@ index 1eede4bcc..fb78d6cce 100644
 +    // Paper end
  }
 -- 
-2.24.0
+2.24.1
 

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

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

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

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

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

@@ -1,4 +1,4 @@
-From 91a26f5f31fbdf3cf220efe39c89eb72e51ecbf2 Mon Sep 17 00:00:00 2001
+From aebda4e47815964a87d71d557e486a2f52ff8ba7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 12 Sep 2018 21:47:01 -0400
 Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
@@ -67,5 +67,5 @@ index 253890e53..0102a170d 100644
  
          @Nullable
 -- 
-2.17.1
+2.24.1
 

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

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

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

@@ -1,4 +1,4 @@
-From 0eed64a0b976bed022de7e3687e5ba6b90175684 Mon Sep 17 00:00:00 2001
+From ad2d8db5351b84ed2078f553b337151701cd7f1a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:05:31 -0400
 Subject: [PATCH] Support Overriding World Seeds
@@ -59,7 +59,7 @@ index 214b577b3..559e6b42b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 206a4ad64..ec575bc8f 100644
+index dd2d8712e..7fd040409 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -377,7 +377,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -98,5 +98,5 @@ index 8636283fd..1ca9a7724 100644
              if (parsedSettings.isJsonObject()) {
                  worldSettings.setGeneratorSettings(parsedSettings.getAsJsonObject());
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 1f1b2b4fe376c15fb7fb86336dea14e707193662 Mon Sep 17 00:00:00 2001
+From e7d49cef72f6b4ddb01388f114549d62d2b77f96 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Sep 2018 23:37:31 -0400
 Subject: [PATCH] Optimize Server World Map
@@ -217,7 +217,7 @@ index 000000000..6bb2f98b4
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ec575bc8f..3120f91de 100644
+index 7fd040409..553014b79 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -88,7 +88,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -247,5 +247,5 @@ index ec575bc8f..3120f91de 100644
              DimensionManager dimensionmanager = worldserver.worldProvider.getDimensionManager();
              ForcedChunk forcedchunk = (ForcedChunk) worldserver.getWorldPersistentData().b(ForcedChunk::new, "chunks");
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0303-PreSpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From bf51abc6cd8762190a3fdfd17d8812ad2678002f Mon Sep 17 00:00:00 2001
+From c6f33ee6e264960037e6d684a68ba1a585515fc4 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:53:23 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
@@ -28,5 +28,5 @@ index fe8bc7f75..90ca1ee14 100644
                              if (!event.callEvent()) {
                                  flag = true;
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From d0753d8956404e8627cbd646846915a2d24b124c Mon Sep 17 00:00:00 2001
+From 2ed32884d4ea2411a043f0726eae08d08a639377 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 22 Sep 2018 15:56:59 -0400
 Subject: [PATCH] Catch JsonParseException in Entity and TE names
@@ -39,7 +39,7 @@ index b03316bc8..5d31068d7 100644
  
                      this.setCustomNameVisible(nbttagcompound.getBoolean("CustomNameVisible"));
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 6d278a0da..ec3732193 100644
+index 670f8313a..d49e210a3 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -339,4 +339,19 @@ public final class MCUtil {
@@ -89,5 +89,5 @@ index 473ec2cbd..ab6b86e4e 100644
  
      }
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From dee157487f5d414b061a794695a77f9a9b7d608a Mon Sep 17 00:00:00 2001
+From 70c826696730642c3602faf0056ab265ed2f90cc Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 25 Sep 2018 06:53:43 +0200
 Subject: [PATCH] Avoid dimension id collisions
@@ -21,5 +21,5 @@ index 1ca9a7724..e1c9a9e12 100644
                      dimension++;
                      break;
 -- 
-2.17.1
+2.24.1
 

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

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

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

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

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

@@ -1,4 +1,4 @@
-From c1dff6a365bdb99e77f4a3368d97154e430f6eb8 Mon Sep 17 00:00:00 2001
+From 0fa9ae56f2a4b9832143a7e78918ec2711089b51 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 3 Oct 2018 20:09:18 -0400
 Subject: [PATCH] Hook into CB plugin rewrites
@@ -187,5 +187,5 @@ index 467b2d938..61f102355 100644
                          {
                              if ( owner.equals( "org/bukkit/Material" ) )
 -- 
-2.17.1
+2.24.1
 

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

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

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

@@ -1,4 +1,4 @@
-From 8262e20d455717a97ebf851e6645d32ad97ba000 Mon Sep 17 00:00:00 2001
+From ad6bd5036e5ee80145156399673df57eb80ce635 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API
@@ -29,7 +29,7 @@ index 7a9159252..3e4632425 100644
          return this.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD && this.c < 4;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 182322752..578fe8d19 100644
+index 8a0675037..aec657952 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -855,6 +855,13 @@ public class CraftWorld implements World {
@@ -63,5 +63,5 @@ index 53c2d154e..56c233872 100644
 +    // Paper end
  }
 -- 
-2.24.0
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From ddc7cc6102fac211c5920f559f1b9262cacdc429 Mon Sep 17 00:00:00 2001
+From 072b7b87fcff080669bf7a70369b96f0a3d4e7d2 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Wed, 10 Oct 2018 21:22:44 -0500
 Subject: [PATCH] Check Drowned for Villager Aggression Config
@@ -18,5 +18,5 @@ index 255b3d0cd..3a1928b22 100644
          this.targetSelector.a(5, new PathfinderGoalNearestAttackableTarget<>(this, EntityTurtle.class, 10, true, false, EntityTurtle.bw));
      }
 -- 
-2.17.1
+2.24.1
 

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

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

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

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

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

@@ -1,11 +1,11 @@
-From ebf53752a5a07cefac575ed2ea3f09bcb7501450 Mon Sep 17 00:00:00 2001
+From b61262b1d7a4a8d8e63c8e0546d8d9ecd6279b3a Mon Sep 17 00:00:00 2001
 From: Trigary <trigary0@gmail.com>
 Date: Fri, 14 Sep 2018 17:42:08 +0200
 Subject: [PATCH] Limit lightning strike effect distance
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e49318a19..fe3e78f36 100644
+index 50ac7afa3..7dda0803c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -240,6 +240,28 @@ public class PaperWorldConfig {
@@ -82,5 +82,5 @@ index a0c714129..ecfcecfdc 100644
  
      @Override
 -- 
-2.17.1
+2.24.1
 

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

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

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

@@ -1,11 +1,11 @@
-From 8de1621abf5b2c62d7370831f711c0544ad9829c Mon Sep 17 00:00:00 2001
+From 43cc803ad57c8c12fc1b674583d951a13f88c130 Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:32:19 -0500
 Subject: [PATCH] Call player spectator target events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 51b3acadb..9b1758303 100644
+index 4c7692721..de11e1249 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -67,5 +67,5 @@ index 51b3acadb..9b1758303 100644
  
      @Override
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 520dedf2e368085a97f21d0490d96ba949b7c2b4 Mon Sep 17 00:00:00 2001
+From e72f06db36a229d2c0bc532bae74f722fac0a233 Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 8 Oct 2018 14:36:14 -0400
 Subject: [PATCH] Add Velocity IP Forwarding Support
@@ -291,5 +291,5 @@ index e1c9a9e12..7e810e008 100644
          } else {
              return this.configuration.getInt("settings.connection-throttle");
 -- 
-2.17.1
+2.24.1
 

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

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

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

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

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

@@ -1,4 +1,4 @@
-From 50b3ce124cd8ee5a083bbca9b1dfc9ba2e4e0599 Mon Sep 17 00:00:00 2001
+From 3377e609d184a9aa40e18e32cbc9f87657a01dc7 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
@@ -6,10 +6,10 @@ Subject: [PATCH] Add option to prevent players from moving into unloaded
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index fe3e78f36..4bcba0a2b 100644
+index 7dda0803c..dd5e263d7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -434,4 +434,9 @@ public class PaperWorldConfig {
+@@ -425,4 +425,9 @@ public class PaperWorldConfig {
          waterOverLavaFlowSpeed = getInt("water-over-lava-flow-speed", 5);
          log("Water over lava flow speed: " + waterOverLavaFlowSpeed);
      }
@@ -63,5 +63,5 @@ index 77c375f71..ccad0a601 100644
                              if (!this.player.H() && (!this.player.getWorldServer().getGameRules().getBoolean(GameRules.DISABLE_ELYTRA_MOVEMENT_CHECK) || !this.player.isGliding())) {
                                  float f2 = this.player.isGliding() ? 300.0F : 100.0F;
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 7d91c54dad37261266ba5ae2e7e369b70fd20ba6 Mon Sep 17 00:00:00 2001
+From 7c1513e669c5fad4b1a3c3e799b3447c28c2683b Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn
@@ -17,7 +17,7 @@ index 5d31068d7..365984bb8 100644
          return 300;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 9b1758303..c467ca356 100644
+index de11e1249..8eb20424f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1831,6 +1831,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -29,5 +29,5 @@ index 9b1758303..c467ca356 100644
          this.fallDistance = 0;
          this.foodData = new FoodMetaData(this);
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0322-Strip-private-area-unicode-characters-from-signs.patch

@@ -1,4 +1,4 @@
-From 29a2005d88440d66d642aa51165df37c50873f75 Mon Sep 17 00:00:00 2001
+From c69b65368cddc674f019eb4cb7c37a31173a259c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 23 Oct 2018 20:53:43 -0400
 Subject: [PATCH] Strip private area unicode characters from signs
@@ -89,5 +89,5 @@ index 03f6ddf00..4c2273497 100644
  
      public void a(int i, IChatBaseComponent ichatbasecomponent) {
 -- 
-2.17.1
+2.24.1
 

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

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

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

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

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

@@ -1,4 +1,4 @@
-From 8088dd2c577b40267e6d2beb9c9ed3919b8e19d7 Mon Sep 17 00:00:00 2001
+From f583ea4420282cd91b18bae2fbca841fa9fb9fe5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Nov 2018 23:11:51 -0400
 Subject: [PATCH] Optimize World Time Updates
@@ -8,7 +8,7 @@ the updates per world, so that we can re-use the same packet
 object for every player unless they have per-player time enabled.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3120f91de..8fc55d31a 100644
+index 553014b79..ca45093e6 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1155,12 +1155,24 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -41,5 +41,5 @@ index 3120f91de..8fc55d31a 100644
  
          while (iterator.hasNext()) {
 -- 
-2.17.1
+2.24.1
 

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

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

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

@@ -1,4 +1,4 @@
-From 0009fc84267605a552dfa51dbc975e2dcb50acea Mon Sep 17 00:00:00 2001
+From c7a89c6bc396372086d221e61f91a4dcae92a800 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 8 Nov 2018 21:33:09 -0500
 Subject: [PATCH] Use Vanilla Minecart Speeds
@@ -23,5 +23,5 @@ index 1b64ad824..4388186db 100644
      // CraftBukkit end
  
 -- 
-2.17.1
+2.24.1
 

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

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

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

@@ -1,4 +1,4 @@
-From 77a88c318a96133abb83de1f3713a713e95039bb Mon Sep 17 00:00:00 2001
+From 493a77676345fe8ae6915ae48b0b40be2405cfbd Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Nov 2018 21:01:09 +0000
 Subject: [PATCH] Don't allow digging into unloaded chunks
@@ -21,5 +21,5 @@ index ccad0a601..d263897da 100644
                  return;
              default:
 -- 
-2.17.1
+2.24.1
 

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

@@ -1,4 +1,4 @@
-From 5225647a32d31190b65163bd55c830f46e18761b Mon Sep 17 00:00:00 2001
+From 8491e3914100159923445dc9a4a811dc40c288e4 Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@@ -19,10 +19,10 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4bcba0a2b..3b1289099 100644
+index dd5e263d7..357c7cf1d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -439,4 +439,14 @@ public class PaperWorldConfig {
+@@ -430,4 +430,14 @@ public class PaperWorldConfig {
      private void preventMovingIntoUnloadedChunks() {
          preventMovingIntoUnloadedChunks = getBoolean("prevent-moving-into-unloaded-chunks", false);
      }
@@ -1144,5 +1144,5 @@ index 3e4632425..3e7ba9be6 100644
          int i = 0;
          EnumDirection[] aenumdirection = World.a;
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0331-force-entity-dismount-during-teleportation.patch

@@ -1,4 +1,4 @@
-From a0ddf16dbdd0b8368556bc9be5cf01669975da09 Mon Sep 17 00:00:00 2001
+From 480eccfddcbf1ac36970a4a0d2721cb1e87c73a5 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation

Spigot-Server-Patches/0332-Book-Size-Limits.patch

@@ -1,4 +1,4 @@
-From af6bf25c3137de313e090306d566b020ac70ef46 Mon Sep 17 00:00:00 2001
+From 804b4e3ee0fa012ea4c0de1481983200156a2acc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 16 Nov 2018 23:08:50 -0500
 Subject: [PATCH] Book Size Limits
@@ -77,5 +77,5 @@ index d263897da..e5db2de26 100644
          // CraftBukkit start
          if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0333-Make-the-default-permission-message-configurable.patch

@@ -1,4 +1,4 @@
-From ebbe338096c77f671dec0bb6d35054d802bcddb8 Mon Sep 17 00:00:00 2001
+From df4e32369884d66afe8eecadd52cb1421d018aac Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 18 Nov 2018 19:49:56 +0000
 Subject: [PATCH] Make the default permission message configurable
@@ -45,5 +45,5 @@ index 7e810e008..58b343259 100644
      public com.destroystokyo.paper.profile.PlayerProfile createProfile(@Nonnull UUID uuid) {
          return createProfile(uuid, null);
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0334-Add-more-Zombie-API.patch

@@ -1,4 +1,4 @@
-From fc21da59d50e0969a0d038aaf58676bbaa01f4ef Mon Sep 17 00:00:00 2001
+From fd585e1a2f0dab7075eb13314c98b410d069a1f7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 04:29:59 -0500
 Subject: [PATCH] Add more Zombie API
@@ -138,5 +138,5 @@ index 0429cf020..c4320dbb6 100644
 +    // Paper end
  }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0335-Prevent-rayTrace-from-loading-chunks.patch

@@ -1,4 +1,4 @@
-From 28c7246755b0d632c7fb7ced86c8d915acf5cad6 Mon Sep 17 00:00:00 2001
+From 57232ac435cd24bbab737587e73ff06b0af41062 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Nov 2018 19:21:58 -0500
 Subject: [PATCH] Prevent rayTrace from loading chunks
@@ -28,5 +28,5 @@ index 0dff02352..29cdc0087 100644
              Vec3D vec3d = raytrace1.b();
              Vec3D vec3d1 = raytrace1.a();
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0336-Handle-Large-Packets-disconnecting-client.patch

@@ -1,4 +1,4 @@
-From 1489b2b551819fbd5dc80491d34ad50655279569 Mon Sep 17 00:00:00 2001
+From f63177f1c6cbbef1a89cdf6c11e9fc7c83d686da Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Nov 2018 21:18:06 -0500
 Subject: [PATCH] Handle Large Packets disconnecting client
@@ -113,5 +113,5 @@ index f7c365567..631234324 100644
  
      public PacketPlayOutWindowItems(int i, NonNullList<ItemStack> nonnulllist) {
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0337-Lazy-init-world-storage-in-CraftOfflinePlayer.patch

@@ -1,4 +1,4 @@
-From 9d1b272b4ccf35d5f84c79ca400de67e0a6b3d3b Mon Sep 17 00:00:00 2001
+From 97678a5b421b5dd54b2268949dc692cf514dcaa6 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Tue, 11 Dec 2018 22:25:07 -0500
 Subject: [PATCH] Lazy init world storage in CraftOfflinePlayer
@@ -61,5 +61,5 @@ index 6a448c02e..c1ef1c950 100644
  
      @Override
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0338-Add-PlayerConnectionCloseEvent.patch

@@ -1,4 +1,4 @@
-From 95881a068c457b9003d460c0c67d42489eb36a26 Mon Sep 17 00:00:00 2001
+From 245beba4063a8d227258da3fded8a6b968787727 Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Sun, 7 Oct 2018 12:05:28 -0700
 Subject: [PATCH] Add PlayerConnectionCloseEvent
@@ -81,5 +81,5 @@ index d4aad8a5b..b1dededc1 100644
  
          }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0339-Prevent-Enderman-from-loading-chunks.patch

@@ -1,4 +1,4 @@
-From 861bb451159a101b782480f03f81c74306d73d5b Mon Sep 17 00:00:00 2001
+From f2d1ceccb42459e2a3aabcafde5ac1c0a8d7af25 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 18 Dec 2018 02:15:08 +0000
 Subject: [PATCH] Prevent Enderman from loading chunks
@@ -29,5 +29,5 @@ index 9783576e3..13507edbc 100644
              IBlockData iblockdata1 = world.getType(blockposition1);
              IBlockData iblockdata2 = Block.getValidBlockForPosition(getEnderman().getCarried(), getEnderman().world, blockposition); // Paper - Fix MC-124320
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0340-Add-APIs-to-replace-OfflinePlayer-getLastPlayed.patch

@@ -1,4 +1,4 @@
-From 258afe1d3af26813306c091e0c8012fc1450a569 Mon Sep 17 00:00:00 2001
+From 8f4e56613b709136c437992da11ab426cbfd91b4 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Wed, 2 Jan 2019 00:35:43 -0600
 Subject: [PATCH] Add APIs to replace OfflinePlayer#getLastPlayed
@@ -16,7 +16,7 @@ intent to remove) and replace it with two new methods, clearly named and
 documented as to their purpose.
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 64992e139..ad600c318 100644
+index 635be7ccc..a9ea2fd87 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -106,7 +106,7 @@ index c1ef1c950..3824180ee 100644
      public Location getBedSpawnLocation() {
          NBTTagCompound data = getData();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 05f380023..67a960616 100644
+index 73a7cc7fd..14695d1a1 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -139,6 +139,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -163,5 +163,5 @@ index 05f380023..67a960616 100644
  
      @Override
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0341-Fix-PlayerEditBookEvent.patch

@@ -1,4 +1,4 @@
-From 0838a4fbce101df7c999ae363a80966f4254b181 Mon Sep 17 00:00:00 2001
+From 9fccc9f9807f4d7345a8508acecd7a6a58f58276 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 16 Dec 2018 13:07:33 +1100
 Subject: [PATCH] Fix PlayerEditBookEvent
@@ -29,5 +29,5 @@ index e5db2de26..c3feccbd6 100644
                  }
  
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0342-Workaround-for-vehicle-tracking-issue-on-disconnect.patch

@@ -1,11 +1,11 @@
-From 0bedd55ef9732090f7f853a3f78e38726522ba10 Mon Sep 17 00:00:00 2001
+From 7bab0dc65e44afd64b0dcd1c5904fea7d79f71da Mon Sep 17 00:00:00 2001
 From: connorhartley <vectrixu+gh@gmail.com>
 Date: Mon, 7 Jan 2019 14:43:48 -0600
 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 0f8e0e81e..ac032c0ed 100644
+index a9ea2fd87..65b6051cf 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1260,6 +1260,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -23,5 +23,5 @@ index 0f8e0e81e..ac032c0ed 100644
              this.wakeup(true, false);
          }
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0343-Fire-BlockPistonRetractEvent-for-all-empty-pistons.patch

@@ -1,4 +1,4 @@
-From 111d5782c3a945f09b0deeaba4f2bc486ef688ea Mon Sep 17 00:00:00 2001
+From d7a6b3885c2d0b5a9d49de9a62b586c429c1d617 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Thu, 31 Jan 2019 16:33:36 -0500
 Subject: [PATCH] Fire BlockPistonRetractEvent for all empty pistons

Spigot-Server-Patches/0344-Block-Entity-remove-from-being-called-on-Players.patch

@@ -1,4 +1,4 @@
-From 8b6d5725bfd52f3a65c23c7e60e8c409dd5319f8 Mon Sep 17 00:00:00 2001
+From 0891775894bfad96f05fd5db0b3cd18065e4b474 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Feb 2019 23:33:24 -0500
 Subject: [PATCH] Block Entity#remove from being called on Players
@@ -12,7 +12,7 @@ Player we will look at limiting the scope of this change. It appears to
 be unintentional in the few cases we've seen so far.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 67a960616..b176b2346 100644
+index 14695d1a1..10c653e8e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1956,6 +1956,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -32,5 +32,5 @@ index 67a960616..b176b2346 100644
  
      // Spigot start
 -- 
-2.17.1
+2.24.1
 

Spigot-Server-Patches/0345-BlockDestroyEvent.patch

@@ -1,4 +1,4 @@
-From 10a9a42dfb78cdd1e27b1c8ea4d5a89590abb829 Mon Sep 17 00:00:00 2001
+From cac5d2a4ffc2717f6f7a300daae26228fefa3d0a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent
@@ -37,5 +37,5 @@ index 3e7ba9be6..77db1b73d 100644
                  TileEntity tileentity = iblockdata.getBlock().isTileEntity() ? this.getTileEntity(blockposition) : null;
  
 -- 
-2.24.0
+2.24.1
 

Spigot-Server-Patches/0346-Fix-Custom-Shapeless-Custom-Crafting-Recipes.patch

@@ -1,4 +1,4 @@
-From 307884933b37b55fe6d6817fc76c784338ae9fc6 Mon Sep 17 00:00:00 2001
+From e4ebe3851390cc69d980db8b3e4ab44cef833fcc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Jan 2019 00:08:15 -0500
 Subject: [PATCH] Fix Custom Shapeless Custom Crafting Recipes

Spigot-Server-Patches/0347-Fix-sign-edit-memory-leak.patch

@@ -1,4 +1,4 @@
-From 69e589820919b6e3f2c4d15ac01e7809e34d2542 Mon Sep 17 00:00:00 2001
+From a387b5bd36b555aea67243d4582c92cd3a28defc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Feb 2019 00:15:28 -0500
 Subject: [PATCH] Fix sign edit memory leak

Spigot-Server-Patches/0348-Limit-Client-Sign-length-more.patch

@@ -1,4 +1,4 @@
-From 885df137b3ddc82c61dd104a09c06484a77ee036 Mon Sep 17 00:00:00 2001
+From 53ad129e65ef3a97b87ad130d6f44270355b9889 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Feb 2019 22:18:40 -0500
 Subject: [PATCH] Limit Client Sign length more

Spigot-Server-Patches/0349-Don-t-check-ConvertSigns-boolean-every-sign-save.patch

@@ -1,4 +1,4 @@
-From 41f9d0be57621cbc16042166cd33d910b614614b Mon Sep 17 00:00:00 2001
+From 51425c63846a9797f41a025ffcf79a980f202c65 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 11:11:29 -0500
 Subject: [PATCH] Don't check ConvertSigns boolean every sign save

Spigot-Server-Patches/0350-Handle-Excessive-Signs-in-Chunks-creating-too-large-.patch

@@ -1,4 +1,4 @@
-From 954930d0c2cb54bb03e013fcc8f71d96e686b435 Mon Sep 17 00:00:00 2001
+From 1f16dbca7a54ed7372011bb8a9c9349bc6539d7a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 14:55:01 -0500
 Subject: [PATCH] Handle Excessive Signs in Chunks creating too large of

Spigot-Server-Patches/0351-MC-145260-Fix-Whitelist-On-Off-inconsistency.patch

@@ -1,4 +1,4 @@
-From 35b6aeaf8f660351da0c23de6d030fed32b8ca97 Mon Sep 17 00:00:00 2001
+From e7840847814412233a6867a8da08e412b8a09ce9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 2 Mar 2019 16:12:35 -0500
 Subject: [PATCH] MC-145260: Fix Whitelist On/Off inconsistency

Spigot-Server-Patches/0352-Set-Zombie-last-tick-at-start-of-drowning-process.patch

@@ -1,4 +1,4 @@
-From d757d0f8136435c7603b9d6b3480b0a6196c95dd Mon Sep 17 00:00:00 2001
+From 4e754ad0b171a557958d8ce94be5437538d113b8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 4 Mar 2019 02:23:28 -0500
 Subject: [PATCH] Set Zombie last tick at start of drowning process

Spigot-Server-Patches/0353-Allow-Saving-of-Oversized-Chunks.patch

@@ -1,4 +1,4 @@
-From e9df190e917429e60eac351992ead4b7d6e38757 Mon Sep 17 00:00:00 2001
+From 70341166bd7df7e0f9972190de9bbcccb59f6e1d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 15 Feb 2019 01:08:19 -0500
 Subject: [PATCH] Allow Saving of Oversized Chunks

Spigot-Server-Patches/0354-Call-WhitelistToggleEvent-when-whitelist-is-toggled.patch

@@ -1,4 +1,4 @@
-From bdd7d6a947e30a7134f904b33ce6403821bf6989 Mon Sep 17 00:00:00 2001
+From bd633c440866b6ebd290e2352b9e604aa7a8673f Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 13 Mar 2019 20:08:09 +0200
 Subject: [PATCH] Call WhitelistToggleEvent when whitelist is toggled

Spigot-Server-Patches/0355-Add-LivingEntity-getTargetEntity.patch

@@ -1,4 +1,4 @@
-From c1513403d09c44b7bfae1d234148767584907e80 Mon Sep 17 00:00:00 2001
+From 6554913c44e191eeecdd9a48520ba5ca59d4ec20 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 22 Sep 2018 00:33:08 -0500
 Subject: [PATCH] Add LivingEntity#getTargetEntity

Spigot-Server-Patches/0356-Use-proper-max-length-when-serialising-BungeeCord-te.patch

@@ -1,4 +1,4 @@
-From 16b1e0a58ce97d724e3050460eef23dcab50b4d8 Mon Sep 17 00:00:00 2001
+From 079403370e8a777a76c09884240e8617ba978bf8 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 20 Mar 2019 21:19:29 -0700
 Subject: [PATCH] Use proper max length when serialising BungeeCord text

Spigot-Server-Patches/0357-Entity-getEntitySpawnReason.patch

@@ -1,4 +1,4 @@
-From 236f26380b33310cff61b7424b6560529ecce8a9 Mon Sep 17 00:00:00 2001
+From b2f085403fbb7a053640b0e8f3a85dd87ad30e99 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 00:24:52 -0400
 Subject: [PATCH] Entity#getEntitySpawnReason

Spigot-Server-Patches/0358-Update-entity-Metadata-for-all-tracked-players.patch

@@ -1,4 +1,4 @@
-From 95d4a9a7e592b91b0e1337b8bde1a801eda42039 Mon Sep 17 00:00:00 2001
+From ef60d8ea89f7715ab6c57ea1b6eea65606085469 Mon Sep 17 00:00:00 2001
 From: AgentTroll <woodyc40@gmail.com>
 Date: Fri, 22 Mar 2019 22:24:03 -0700
 Subject: [PATCH] Update entity Metadata for all tracked players

Spigot-Server-Patches/0359-Fire-event-on-GS4-query.patch

@@ -1,4 +1,4 @@
-From d9a672f6244bc86e3389a9968fa8aa962ab874ae Mon Sep 17 00:00:00 2001
+From 08b4aba6d52afdb2ca5deaea9fcbaab087f7e216 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Sun, 17 Mar 2019 21:46:56 +0200
 Subject: [PATCH] Fire event on GS4 query

Spigot-Server-Patches/0360-Implement-PlayerPostRespawnEvent.patch

@@ -1,4 +1,4 @@
-From f45d0df3f43b34fb59b7fc477ffe642f9e934fa8 Mon Sep 17 00:00:00 2001
+From c6db972505d9fb1479441cff4bc9fdc6001d0fda Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Fri, 26 Oct 2018 21:31:00 -0700
 Subject: [PATCH] Implement PlayerPostRespawnEvent

Spigot-Server-Patches/0361-don-t-go-below-0-for-pickupDelay-breaks-picking-up-i.patch

@@ -1,4 +1,4 @@
-From 9cab8df420787a6200fca4c9c3faa86ceac87075 Mon Sep 17 00:00:00 2001
+From 352fa634de72bb5b7f40f8314fee276ffa27deb9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 24 Mar 2019 18:09:20 -0400
 Subject: [PATCH] don't go below 0 for pickupDelay, breaks picking up items

Spigot-Server-Patches/0362-Implement-getters-and-setters-for-EntityItem-owner-a.patch

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

Spigot-Server-Patches/0363-Server-Tick-Events.patch

@@ -1,4 +1,4 @@
-From 86a54e33b960ae1e787bda711cc696ef090b3415 Mon Sep 17 00:00:00 2001
+From 9911de7013eb89584b2a954de92c2bc8d9f77614 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 22:48:45 -0400
 Subject: [PATCH] Server Tick Events
@@ -6,7 +6,7 @@ Subject: [PATCH] Server Tick Events
 Fires event at start and end of a server tick
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 8fc55d31a..c023848c7 100644
+index ca45093e6..430d38b9c 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1080,6 +1080,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

Spigot-Server-Patches/0364-PlayerDeathEvent-getItemsToKeep.patch

@@ -1,4 +1,4 @@
-From 737e70fa2923a0b94fe8e6ab6835d1538450c1dd Mon Sep 17 00:00:00 2001
+From 151f1f2d13a5e08079841b18441366477de1d0ea Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Mar 2019 23:01:33 -0400
 Subject: [PATCH] PlayerDeathEvent#getItemsToKeep

Spigot-Server-Patches/0365-Optimize-Captured-TileEntity-Lookup.patch

@@ -1,4 +1,4 @@
-From 2e6b199a401dd9269326b4892869c566b0279da9 Mon Sep 17 00:00:00 2001
+From fe758c19c612b165efc5f0e41a47cc003615ef39 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 6 Apr 2019 10:16:48 -0400
 Subject: [PATCH] Optimize Captured TileEntity Lookup

Spigot-Server-Patches/0366-Add-Heightmap-API.patch

@@ -1,4 +1,4 @@
-From c0110825b0e7532a885d2c488434f96c17942005 Mon Sep 17 00:00:00 2001
+From f71bed37cfda78178f562dc43d9a59ac6720aead Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Tue, 1 Jan 2019 02:22:01 -0800
 Subject: [PATCH] Add Heightmap API

Spigot-Server-Patches/0367-Mob-Spawner-API-Enhancements.patch

@@ -1,4 +1,4 @@
-From e01d52625f08e8115a1145fe158643465a5d8fb0 Mon Sep 17 00:00:00 2001
+From 5c0e95ab17ba63cef874c180171859bddc33a5c8 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Fri, 19 Apr 2019 12:41:13 -0500
 Subject: [PATCH] Mob Spawner API Enhancements

Spigot-Server-Patches/0368-Per-Player-View-Distance-API-placeholders.patch

@@ -1,4 +1,4 @@
-From 30724313dcf4a3ba4a4ecf9596a09247f4a93fd7 Mon Sep 17 00:00:00 2001
+From a82afc02122f372ee3da63677e94eb3890f2657a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach@zachbr.io>
 Date: Mon, 6 May 2019 01:29:25 -0400
 Subject: [PATCH] Per-Player View Distance API placeholders

Spigot-Server-Patches/0369-Fix-CB-call-to-changed-postToMainThread-method.patch

@@ -1,4 +1,4 @@
-From 0cebabccd9505b15af3be4913a9f447e4e245a55 Mon Sep 17 00:00:00 2001
+From c020d00b79f4d675eb51c9b87d4b311abcf89d60 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 10 May 2019 18:38:19 +0100
 Subject: [PATCH] Fix CB call to changed postToMainThread method

Spigot-Server-Patches/0370-Fix-sounds-when-item-frames-are-modified-MC-123450.patch

@@ -1,4 +1,4 @@
-From 2024b1c830efb09fba218fc8abf4aabffda1799d Mon Sep 17 00:00:00 2001
+From 1484860a31c238ec53bd91145a3cb0124e2a338e Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Sat, 27 Apr 2019 20:00:43 +0100
 Subject: [PATCH] Fix sounds when item frames are modified (MC-123450)

Spigot-Server-Patches/0371-Fix-CraftServer-isPrimaryThread-and-MinecraftServer-.patch

@@ -1,4 +1,4 @@
-From 975d2b4732210ce8a1e1c1a06a1675fffd37c6c3 Mon Sep 17 00:00:00 2001
+From 626b1d6c3c35deb8aae7928131378a751ad845ed Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Mon, 13 May 2019 21:10:59 -0700
 Subject: [PATCH] Fix CraftServer#isPrimaryThread and MinecraftServer
@@ -16,10 +16,10 @@ handling that should have been handled synchronously will be handled
 synchronously when the server gets shut down.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c023848c7..443e727dc 100644
+index 430d38b9c..be31fef79 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
-@@ -2200,7 +2200,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
+@@ -2199,7 +2199,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
      // CraftBukkit start
      @Override
      public boolean isMainThread() {

Spigot-Server-Patches/0372-Fix-issues-with-entity-loss-due-to-unloaded-chunks.patch

@@ -1,4 +1,4 @@
-From c4766ed3acccded07f6705146ce1ae56d6fa7c16 Mon Sep 17 00:00:00 2001
+From 85aa39dbc3abe289e50479e679cdef0d6baac6de Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 21:49:53 -0400
 Subject: [PATCH] Fix issues with entity loss due to unloaded chunks

Spigot-Server-Patches/0373-Duplicate-UUID-Resolve-Option.patch

@@ -1,4 +1,4 @@
-From 40ef22f09f6cde352f44083fab5aeb50a3ff8659 Mon Sep 17 00:00:00 2001
+From 4d3393a297882dea5e713803d18a237db3268509 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 14:27:34 -0400
 Subject: [PATCH] Duplicate UUID Resolve Option
@@ -33,10 +33,10 @@ But for those who are ok with leaving this inconsistent behavior, you may use WA
 It is recommended you regenerate the entities, as these were legit entities, and deserve your love.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 3b1289099..14fa5fdb7 100644
+index 357c7cf1d..2b2c82d5e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -449,4 +449,43 @@ public class PaperWorldConfig {
+@@ -440,4 +440,43 @@ public class PaperWorldConfig {
              log("Using vanilla redstone algorithm.");
          }
      }

Spigot-Server-Patches/0374-improve-CraftWorld-isChunkLoaded.patch

@@ -1,4 +1,4 @@
-From a59b1080bb3fa6936ada204bf1ea7257ac629071 Mon Sep 17 00:00:00 2001
+From c87b8edb5b45bf1861a3c487d2c8862d9b590166 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 21 May 2019 02:34:04 +0100
 Subject: [PATCH] improve CraftWorld#isChunkLoaded

Spigot-Server-Patches/0375-Configurable-Keep-Spawn-Loaded-range-per-world.patch

@@ -1,4 +1,4 @@
-From 362d0c2ad0362a3d5646d98ad8d8e3583245b2c7 Mon Sep 17 00:00:00 2001
+From 77bf85a030697ecce07563ca6319030815f78bc4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -6,10 +6,10 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 14fa5fdb7..332f20ce8 100644
+index 2b2c82d5e..778de4630 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -488,4 +488,10 @@ public class PaperWorldConfig {
+@@ -479,4 +479,10 @@ public class PaperWorldConfig {
                  break;
          }
      }
@@ -21,7 +21,7 @@ index 14fa5fdb7..332f20ce8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 443e727dc..0a7648381 100644
+index be31fef79..6be2e1e2f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -585,6 +585,14 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas

Spigot-Server-Patches/0376-Fix-some-generation-concurrency-issues.patch

@@ -1,4 +1,4 @@
-From f0195eee180708b96f8cc291406a6a14db60a68c Mon Sep 17 00:00:00 2001
+From 456b08a9c36183ca6be42b2bf40f5c43a34162cb Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Fri, 24 May 2019 07:53:16 +0100
 Subject: [PATCH] Fix some generation concurrency issues

Spigot-Server-Patches/0377-MC-114618-Fix-EntityAreaEffectCloud-from-going-negat.patch

@@ -1,4 +1,4 @@
-From fccbe5248ff52daf32ff59119244aebf5d418073 Mon Sep 17 00:00:00 2001
+From 1f992db60d9b4ab3db9479fd43f1d7261080eb84 Mon Sep 17 00:00:00 2001
 From: William Blake Galbreath <blake.galbreath@gmail.com>
 Date: Mon, 27 May 2019 17:35:39 -0500
 Subject: [PATCH] MC-114618 - Fix EntityAreaEffectCloud from going negative

Spigot-Server-Patches/0378-ChunkMapDistance-CME.patch

@@ -1,4 +1,4 @@
-From d6f1614afe2775c5b94a7fd8839714a466dd1c97 Mon Sep 17 00:00:00 2001
+From 83d334835999f4e8cca2658fc8abf1a4155c47b9 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 29 May 2019 04:01:22 +0100
 Subject: [PATCH] ChunkMapDistance CME

Spigot-Server-Patches/0379-Implement-CraftBlockSoundGroup.patch

@@ -1,4 +1,4 @@
-From ed3224e4158f46de0018aff479b8e46ad364724e Mon Sep 17 00:00:00 2001
+From afaec6e1906c61cd27dc92535b247e489f413462 Mon Sep 17 00:00:00 2001
 From: simpleauthority <jacob@algorithmjunkie.com>
 Date: Tue, 28 May 2019 03:48:51 -0700
 Subject: [PATCH] Implement CraftBlockSoundGroup