Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 0969eedc Clarify furnace burn time behaviour as per SPIGOT-844 16453bfd SPIGOT-4503: Add API to insert complete ItemStack into Jukebox CraftBukkit Changes: dff66dfc Reduce copying of positions from block states 91cae6ef SPIGOT-4387: Durability looping from cancelled BlockPlaceEvent 24c5e68c SPIGOT-4493: Allow burnt out furnaces to remain lit like Vanilla whilst retaining SPIGOT-844 API bc943daf Fix Jukebox API not synchronizing playing data with state fe89a8c1 SPIGOT-4503: Add API to insert complete ItemStack into Jukebox fc102494 Make CraftBlockState use BlockPosition 89ab4887 SPIGOT-4543: Jukebox playing calls should not use legacy data 6ff5a64c SPIGOT-4541: Cancelled bucket events require inventory update
2018-12-23 17:04:13 +00:00 · 2018-12-23 17:04:13 +00:00 · 0318e62b45
parent ac66acab27
commit 0318e62b45
48 changed files with 187 additions and 253 deletions
--- a/Spigot-API-Patches/0154-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-API-Patches/0154-Implement-furnace-cook-speed-multiplier-API.patch
@ -1,4 +1,4 @@
-From ce4f8f0180f41db23e516b3004e75d9bf716fcb6 Mon Sep 17 00:00:00 2001
+From 85d81decb16af5bacff8ec75be26f94d1c81b5fa Mon Sep 17 00:00:00 2001
 From: Tassu <git@tassu.me>
 Date: Thu, 13 Sep 2018 08:45:01 +0300
 Subject: [PATCH] Implement furnace cook speed multiplier API
@ -6,10 +6,10 @@ Subject: [PATCH] Implement furnace cook speed multiplier API
 Signed-off-by: Tassu <git@tassu.me>

 diff --git a/src/main/java/org/bukkit/block/Furnace.java b/src/main/java/org/bukkit/block/Furnace.java
-index ee8a95601..437c7c4fd 100644
+index b41e8ffd..e797b060 100644
 --- a/src/main/java/org/bukkit/block/Furnace.java
 +++ b/src/main/java/org/bukkit/block/Furnace.java
-@@ -36,6 +36,26 @@ public interface Furnace extends Container, Nameable {
+@@ -39,6 +39,26 @@ public interface Furnace extends Container, Nameable {
      */
     public void setCookTime(short cookTime);
 
@ -37,5 +37,5 @@ index ee8a95601..437c7c4fd 100644
     public FurnaceInventory getInventory();
 
 -- 
-2.19.0
+2.20.1

--- a/Spigot-Server-Patches/0004-MC-Utils.patch
+++ b/Spigot-Server-Patches/0004-MC-Utils.patch
@ -1,4 +1,4 @@
-From 6fa007b705e027301b61812c60b75dab498a177b Mon Sep 17 00:00:00 2001
+From a1159c5878541b6ae4bf920b87f42f7ce31dd1cf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils
@ -65,7 +65,7 @@ index 50e29464b..880ce16b1 100644
             return this.c(MathHelper.floor(d0), MathHelper.floor(d1), MathHelper.floor(d2));
         }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 773a8c52d..5dd08018c 100644
+index 40f892b24..22fec8697 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -32,7 +32,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent;
@ -290,7 +290,7 @@ index bcdc790ba..339abdc01 100644
     // Paper end
 }
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index ac081d230..faae6d09d 100644
+index 7047b7c70..92f8d0633 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -26,6 +26,7 @@ import org.bukkit.TreeType;
@ -301,7 +301,7 @@ index ac081d230..faae6d09d 100644
 import org.bukkit.craftbukkit.util.CraftMagicNumbers;
 import org.bukkit.entity.Player;
 import org.bukkit.event.block.BlockFertilizeEvent;
-@@ -561,6 +562,17 @@ public final class ItemStack {
+@@ -574,6 +575,17 @@ public final class ItemStack {
         return this.tag != null ? this.tag.getList("Enchantments", 10) : new NBTTagList();
     }
 
@ -856,5 +856,5 @@ index 25d4907b3..1f6de76a7 100644
 
     static enum IdentityHashingStrategy implements Strategy<Object> {
 -- 
-2.20.0
+2.20.1

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

 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index b9fa5ccc7..50812b70f 100644
+index 92f8d0633..dbc9fbd66 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
@ -61,7 +61,7 @@ index b9fa5ccc7..50812b70f 100644
             this.getItem().a(this.tag);
             // CraftBukkit end
         }
-@@ -575,6 +594,7 @@ public final class ItemStack {
+@@ -588,6 +607,7 @@ public final class ItemStack {
     // Paper end
     public void setTag(@Nullable NBTTagCompound nbttagcompound) {
         this.tag = nbttagcompound;
@ -69,7 +69,7 @@ index b9fa5ccc7..50812b70f 100644
     }
 
     public IChatBaseComponent getName() {
-@@ -651,6 +671,7 @@ public final class ItemStack {
+@@ -664,6 +684,7 @@ public final class ItemStack {
         nbttagcompound.setString("id", String.valueOf(IRegistry.ENCHANTMENT.getKey(enchantment)));
         nbttagcompound.setShort("lvl", (short) ((byte) i));
         nbttaglist.add((NBTBase) nbttagcompound);
@ -201,7 +201,7 @@ index 2ef4ac64b..d1a546c8f 100644
 
     static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index dfc5bb4fd..c00ced8e8 100644
+index 0764a6835..407adbdae 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
@@ -8,6 +8,7 @@ import java.lang.reflect.Constructor;
@ -337,5 +337,5 @@ index dfc5bb4fd..c00ced8e8 100644
     private final Spigot spigot = new Spigot()
     {
 -- 
-2.19.2
+2.20.1

--- a/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
+++ b/Spigot-Server-Patches/0094-Configurable-Keep-Spawn-Loaded-range-per-world.patch
@ -1,4 +1,4 @@
-From 7b96e2cf79f6c8f5fd688ae20700b1398670593b Mon Sep 17 00:00:00 2001
+From 7f55fefff3414e5298ee5cdf9071c0435a1d600f 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
@ -63,7 +63,7 @@ index eef8d2b5a..cc98b745b 100644
         }
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ceb4102af..02a62d6d7 100644
+index 520235d1b..7953d7f99 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -2852,8 +2852,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -91,10 +91,10 @@ index acd54067e..c655d51ac 100644
             for (int j = -short1; j <= short1; j += 16) {
                 for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 1676fcc85..b19eef1b1 100644
+index 889f99d66..ff1ccbd64 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1404,8 +1404,9 @@ public class CraftWorld implements World {
+@@ -1397,8 +1397,9 @@ public class CraftWorld implements World {
         int chunkCoordX = chunkcoordinates.getX() >> 4;
         int chunkCoordZ = chunkcoordinates.getZ() >> 4;
         // Cycle through the 25x25 Chunks around it to load/unload the chunks.
@ -107,5 +107,5 @@ index 1676fcc85..b19eef1b1 100644
                     loadChunk(chunkCoordX + x, chunkCoordZ + z);
                 } else {
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch
+++ b/Spigot-Server-Patches/0111-LootTable-API-Replenishable-Lootables-Feature.patch
@ -1,4 +1,4 @@
-From e32c5e652c24937db46d8609de109d5e5f7492dc Mon Sep 17 00:00:00 2001
+From 33e61dd190f6ec4964e57784f282124f44568536 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@ -520,7 +520,7 @@ index 000000000..d50410532
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e60e8e8fe..3846e36f7 100644
+index b39e3ef13..1338eff40 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -69,6 +69,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -532,7 +532,7 @@ index e60e8e8fe..3846e36f7 100644
 
     public CraftEntity getBukkitEntity() {
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index 8945ab275..184809b83 100644
+index 520cca48c..e228fc853 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
@@ -15,10 +15,11 @@ public abstract class EntityMinecartContainer extends EntityMinecartAbstract imp
@ -591,7 +591,7 @@ index 8945ab275..184809b83 100644
 
             if (this.lootTableSeed == 0L) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java
-index 25328bf41..6e3779c41 100644
+index 7d066a18d..c9c29528a 100644
 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java
 +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java
@@ -4,9 +4,10 @@ import java.util.Random;
@ -646,7 +646,7 @@ index 25328bf41..6e3779c41 100644
             if (this.h == 0L) {
                 random = new Random();
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index ac9b4297b..0558cafe3 100644
+index 8617fac6b..4f4121adc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
@@ -61,7 +61,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@ -659,20 +659,14 @@ index ac9b4297b..0558cafe3 100644
     }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index dff5bb517..c3e40aa17 100644
+index fa03d17a4..14b5be75f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-@@ -1,6 +1,7 @@
- package org.bukkit.craftbukkit.block;
- 
- import net.minecraft.server.BlockChest;
-+import com.destroystokyo.paper.loottable.PaperLootableBlockInventory; // Paper
- import net.minecraft.server.BlockPosition;
- import net.minecraft.server.Blocks;
- import net.minecraft.server.ITileInventory;
-@@ -15,7 +16,7 @@ import org.bukkit.craftbukkit.inventory.CraftInventory;
+@@ -13,8 +13,9 @@ import org.bukkit.craftbukkit.CraftWorld;
+ import org.bukkit.craftbukkit.inventory.CraftInventory;
 import org.bukkit.craftbukkit.inventory.CraftInventoryDoubleChest;
 import org.bukkit.inventory.Inventory;
+import com.destroystokyo.paper.loottable.PaperLootableBlockInventory; // Paper
 
 -public class CraftChest extends CraftLootable<TileEntityChest> implements Chest {
 +public class CraftChest extends CraftLootable<TileEntityChest> implements Chest, PaperLootableBlockInventory { // Paper
@ -762,5 +756,5 @@ index f29365c94..1937f7b9a 100644
 
     public CraftMinecartHopper(CraftServer server, EntityMinecartHopper entity) {
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
+++ b/Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch
@ -1,4 +1,4 @@
-From 3e1acb4e8c061bfd5ad065665b8466a8d1cbdcd9 Mon Sep 17 00:00:00 2001
+From ec6342a78de5a84e7a81431fcdbf37db320b27c8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@ -43,7 +43,7 @@ index 42d951554..d8f258105 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index f470eba29..86bdd6e7f 100644
+index f6bfd6ece..7380c4386 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -41,6 +41,7 @@ public class Chunk implements IChunkAccess {
@ -172,7 +172,7 @@ index 3d17ad646..c3ac66d35 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5d7370029..6f672aa22 100644
+index c484493b0..9a0e5342d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1292,7 +1292,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -191,10 +191,10 @@ index 5d7370029..6f672aa22 100644
                         this.methodProfiler.a(() -> {
                             return String.valueOf(TileEntityTypes.a(tileentity.C()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index b19eef1b1..f1320f5ac 100644
+index ff1ccbd64..3e71cdcdc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1757,7 +1757,7 @@ public class CraftWorld implements World {
+@@ -1750,7 +1750,7 @@ public class CraftWorld implements World {
         ChunkProviderServer cps = world.getChunkProvider();
         for (net.minecraft.server.Chunk chunk : cps.chunks.values()) {
             // If in use, skip it
@ -220,5 +220,5 @@ index d08ef3fe1..081789a8f 100644
     }
 }
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0168-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
+++ b/Spigot-Server-Patches/0168-ExperienceOrbs-API-for-Reason-Source-Triggering-play.patch
@ -1,4 +1,4 @@
-From ed3e84df8aeeedde312bc586cd7216a2a9d85c0e Mon Sep 17 00:00:00 2001
+From 0d70e74b76862481874c3b71e500c7b0cf6c6f1f 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 fb7688e9e..1bf01000e 100644
+index 8aa6ed8d8..b8684f6a2 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
@@ -451,13 +451,13 @@ public class Block implements IMaterial {
@ -28,7 +28,7 @@ index fb7688e9e..1bf01000e 100644
         }
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index 3ec3053c7..473773724 100644
+index 61b18ca8a..32fd5adc6 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
@@ -618,7 +618,7 @@ public class EntityEnderDragon extends EntityInsentient implements IComplex, IMo
@ -41,7 +41,7 @@ index 3ec3053c7..473773724 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 2f6fd88ca..dfd6230b2 100644
+index 3030dd9c3..404a222b4 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -15,9 +15,59 @@ public class EntityExperienceOrb extends Entity {
@ -120,7 +120,7 @@ index 2f6fd88ca..dfd6230b2 100644
 
     public void d(EntityHuman entityhuman) {
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 84a9375db..e494552f6 100644
+index 45a326779..cccb19589 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -467,7 +467,7 @@ public class EntityFishingHook extends Entity {
@ -133,7 +133,7 @@ index 84a9375db..e494552f6 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 3c6d02e27..83605e7c7 100644
+index 162de836e..284e22bbd 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -354,7 +354,8 @@ public abstract class EntityLiving extends Entity {
@ -160,7 +160,7 @@ index a5e1939e0..e73dba09a 100644
 
             this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index ac81a8d76..a11e66262 100644
+index bd799d0c6..f80634d54 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -413,7 +413,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@ -199,7 +199,7 @@ index c8cfa3abe..aa7780eff 100644
                 // CraftBukkit end
 
 diff --git a/src/main/java/net/minecraft/server/SlotFurnaceResult.java b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
-index a6999f868..4ab6747d4 100644
+index bbb4ee3ec..839cccbe3 100644
 --- a/src/main/java/net/minecraft/server/SlotFurnaceResult.java
 +++ b/src/main/java/net/minecraft/server/SlotFurnaceResult.java
@@ -9,7 +9,7 @@ import org.bukkit.event.inventory.FurnaceExtractEvent;
@ -221,10 +221,10 @@ index a6999f868..4ab6747d4 100644
             }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 3a30349f4..e1c09452b 100644
+index bbe9c5e89..b4f908164 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1339,7 +1339,7 @@ public class CraftWorld implements World {
+@@ -1332,7 +1332,7 @@ public class CraftWorld implements World {
         } else if (TNTPrimed.class.isAssignableFrom(clazz)) {
             entity = new EntityTNTPrimed(world, x, y, z, null);
         } else if (ExperienceOrb.class.isAssignableFrom(clazz)) {
@ -257,5 +257,5 @@ index 3a09cab3d..3302af0e4 100644
     public EntityExperienceOrb getHandle() {
         return (EntityExperienceOrb) entity;
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0216-API-to-get-a-BlockState-without-a-snapshot.patch
+++ b/Spigot-Server-Patches/0216-API-to-get-a-BlockState-without-a-snapshot.patch
@ -1,4 +1,4 @@
-From 09d151a0244868bedef166b468f436c807180199 Mon Sep 17 00:00:00 2001
+From ed595cb3cc0cf53d6f2fad9c919916fdcf9aec21 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
@ -64,12 +64,12 @@ index d40127075..e7ccee480 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 0558cafe3..d4d9c5fc5 100644
+index 4f4121adc..082a1b6e2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
@@ -23,20 +23,40 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
         CraftWorld world = (CraftWorld) this.getWorld();
-         this.tileEntity = tileEntityClass.cast(world.getTileEntityAt(this.getX(), this.getY(), this.getZ()));
+         this.tileEntity = tileEntityClass.cast(world.getHandle().getTileEntity(this.getPosition()));
 
 +        // Paper start
 +        this.snapshotDisabled = DISABLE_SNAPSHOT;
--- a/Spigot-Server-Patches/0255-Expand-World.spawnParticle-API-and-add-Builder.patch
+++ b/Spigot-Server-Patches/0255-Expand-World.spawnParticle-API-and-add-Builder.patch
@ -1,4 +1,4 @@
-From 76463a17eba739e541025e77eeabee94f11eff0a Mon Sep 17 00:00:00 2001
+From f8709649cb9c3da028d7044b2c7a100169adba61 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
@ -34,10 +34,10 @@ index 5f386ff04..55e45dbb1 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 8c4b7aee6..c844c4579 100644
+index b4f908164..d3be0211f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1746,11 +1746,17 @@ public class CraftWorld implements World {
+@@ -1739,11 +1739,17 @@ public class CraftWorld implements World {
 
     @Override
     public <T> void spawnParticle(Particle particle, double x, double y, double z, int count, double offsetX, double offsetY, double offsetZ, double extra, T data, boolean force) {
@ -57,5 +57,5 @@ index 8c4b7aee6..c844c4579 100644
                 x, y, z, // Position
                 count,  // Count
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0259-Allow-spawning-Item-entities-with-World.spawnEntity.patch
+++ b/Spigot-Server-Patches/0259-Allow-spawning-Item-entities-with-World.spawnEntity.patch
@ -1,4 +1,4 @@
-From 5f4d733d640cf0a0161ce388123fc93dba66b756 Mon Sep 17 00:00:00 2001
+From ecb315e97bab98133c73a2c6a5852646c6d3e4b6 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,10 +8,10 @@ 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 84bde3ef2..e127cc91e 100644
+index d3be0211f..b50785aa0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1055,6 +1055,10 @@ public class CraftWorld implements World {
+@@ -1048,6 +1048,10 @@ public class CraftWorld implements World {
         if (Boat.class.isAssignableFrom(clazz)) {
             entity = new EntityBoat(world, x, y, z);
             entity.setPositionRotation(x, y, z, yaw, pitch);
@ -23,5 +23,5 @@ index 84bde3ef2..e127cc91e 100644
             entity = new EntityFallingBlock(world, x, y, z, world.getType(new BlockPosition(x, y, z)));
         } else if (Projectile.class.isAssignableFrom(clazz)) {
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0262-ItemStack-getMaxItemUseDuration.patch
+++ b/Spigot-Server-Patches/0262-ItemStack-getMaxItemUseDuration.patch
@ -1,4 +1,4 @@
-From b99b87b8536146f38d5b9b768b315bb3db69c28a Mon Sep 17 00:00:00 2001
+From 022de98bb6050d8e9e9e32b31fb68000d42ffd4c 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,10 +6,10 @@ 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 3de567851..a1ec3879b 100644
+index f7ac69456..16d0c2662 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -522,6 +522,7 @@ public final class ItemStack {
+@@ -524,6 +524,7 @@ public final class ItemStack {
         this.getItem().b(this, world, entityhuman);
     }
 
@ -36,5 +36,5 @@ index 284630f74..1282ee399 100644
     public void addUnsafeEnchantment(Enchantment ench, int level) {
         Validate.notNull(ench, "Cannot add null enchantment");
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0275-Expand-Explosions-API.patch
+++ b/Spigot-Server-Patches/0275-Expand-Explosions-API.patch
@ -1,4 +1,4 @@
-From d90d21380374c1524ad795a87d28747124f4c57e Mon Sep 17 00:00:00 2001
+From 424a73b6b937df0974e5bb448020f4efb3ab1e8b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 20 Jun 2018 23:17:24 -0400
 Subject: [PATCH] Expand Explosions API
@ -6,10 +6,10 @@ Subject: [PATCH] Expand Explosions API
 Add Entity as a Source capability, and add more API choices, and on Location.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e127cc91e..d6f995377 100644
+index b50785aa0..142ba2c0a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -524,6 +524,11 @@ public class CraftWorld implements World {
+@@ -517,6 +517,11 @@ public class CraftWorld implements World {
     public boolean createExplosion(double x, double y, double z, float power, boolean setFire, boolean breakBlocks) {
         return !world.createExplosion(null, x, y, z, power, setFire, breakBlocks).wasCanceled;
     }
@ -22,5 +22,5 @@ index e127cc91e..d6f995377 100644
     public boolean createExplosion(Location loc, float power) {
         return createExplosion(loc, power, false);
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0280-Implement-World.getEntity-UUID-API.patch
+++ b/Spigot-Server-Patches/0280-Implement-World.getEntity-UUID-API.patch
@ -1,14 +1,14 @@
-From 2f7cc4b77d8a76cd5591cdd73dc0a593ed30d667 Mon Sep 17 00:00:00 2001
+From 79205c69704678c69f4b4c8cca5bef5bdea6a0d2 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 3 Jul 2018 16:08:14 +0200
 Subject: [PATCH] Implement World.getEntity(UUID) API


 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index d6f995377..a05320c90 100644
+index 142ba2c0a..d9385aa7a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -875,6 +875,14 @@ public class CraftWorld implements World {
+@@ -868,6 +868,14 @@ public class CraftWorld implements World {
         return list;
     }
 
@ -24,5 +24,5 @@ index d6f995377..a05320c90 100644
     // Spigot start
         save(true);
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0310-Ignore-Dead-Entities-in-entityList-iteration.patch
+++ b/Spigot-Server-Patches/0310-Ignore-Dead-Entities-in-entityList-iteration.patch
@ -1,4 +1,4 @@
-From 1ed451ce0e318248640bc5651acab3af82aace6a Mon Sep 17 00:00:00 2001
+From 872ce010ad9229fda6204d6bf8731b13d863786f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@ -35,7 +35,7 @@ index 469dce5df..f1abcadcc 100644
     public float length;
     public float J;
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f5f1452b7..762ae7366 100644
+index 31bc34239..6958f00d7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1046,6 +1046,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -71,10 +71,10 @@ index f5f1452b7..762ae7366 100644
             if (entity instanceof EntityInsentient) {
                 EntityInsentient entityinsentient = (EntityInsentient) entity;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index a41716fd4..20fb157fa 100644
+index d9385aa7a..ee2b443dd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -619,6 +619,7 @@ public class CraftWorld implements World {
+@@ -612,6 +612,7 @@ public class CraftWorld implements World {
         for (Object o : world.entityList) {
             if (o instanceof net.minecraft.server.Entity) {
                 net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@ -82,7 +82,7 @@ index a41716fd4..20fb157fa 100644
                 Entity bukkitEntity = mcEnt.getBukkitEntity();
 
                 // Assuming that bukkitEntity isn't null
-@@ -637,6 +638,7 @@ public class CraftWorld implements World {
+@@ -630,6 +631,7 @@ public class CraftWorld implements World {
         for (Object o : world.entityList) {
             if (o instanceof net.minecraft.server.Entity) {
                 net.minecraft.server.Entity mcEnt = (net.minecraft.server.Entity) o;
@ -90,7 +90,7 @@ index a41716fd4..20fb157fa 100644
                 Entity bukkitEntity = mcEnt.getBukkitEntity();
 
                 // Assuming that bukkitEntity isn't null
-@@ -661,6 +663,7 @@ public class CraftWorld implements World {
+@@ -654,6 +656,7 @@ public class CraftWorld implements World {
 
         for (Object entity: world.entityList) {
             if (entity instanceof net.minecraft.server.Entity) {
@ -98,7 +98,7 @@ index a41716fd4..20fb157fa 100644
                 Entity bukkitEntity = ((net.minecraft.server.Entity) entity).getBukkitEntity();
 
                 if (bukkitEntity == null) {
-@@ -683,6 +686,7 @@ public class CraftWorld implements World {
+@@ -676,6 +679,7 @@ public class CraftWorld implements World {
 
         for (Object entity: world.entityList) {
             if (entity instanceof net.minecraft.server.Entity) {
@ -107,5 +107,5 @@ index a41716fd4..20fb157fa 100644
 
                 if (bukkitEntity == null) {
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0319-Add-hand-to-bucket-events.patch
+++ b/Spigot-Server-Patches/0319-Add-hand-to-bucket-events.patch
@ -1,11 +1,11 @@
-From b52532546fa0fb8da126d7dc9c49ea77f8554af2 Mon Sep 17 00:00:00 2001
+From ba4ec600e42e8a8fb436f0cc63fa4e3de22cddb0 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events


 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index c9e9b45dc..6bb80975e 100644
+index 5ac88166f..5874d2993 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
@@ -65,7 +65,7 @@ public class EntityCow extends EntityAnimal {
@ -18,7 +18,7 @@ index c9e9b45dc..6bb80975e 100644
             if (event.isCancelled()) {
                 return false;
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index 92c596e2c..edd35fe8a 100644
+index 6e12bf84f..5d8568a1c 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
@@ -35,7 +35,7 @@ public class ItemBucket extends Item {
@ -29,8 +29,8 @@ index 92c596e2c..edd35fe8a 100644
 +                        PlayerBucketFillEvent event = CraftEventFactory.callPlayerBucketFillEvent(entityhuman, blockposition.getX(), blockposition.getY(), blockposition.getZ(), null, itemstack, dummyFluid.b(), enumhand); // Paper - add enumHand
 
                         if (event.isCancelled()) {
-                             return new InteractionResultWrapper(EnumInteractionResult.FAIL, itemstack);
-@@ -61,7 +61,7 @@ public class ItemBucket extends Item {
+                             ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
+@@ -62,7 +62,7 @@ public class ItemBucket extends Item {
                     iblockdata = world.getType(blockposition);
                     BlockPosition blockposition1 = this.a(iblockdata, blockposition, movingobjectposition);
 
@ -39,7 +39,7 @@ index 92c596e2c..edd35fe8a 100644
                         this.a(world, itemstack, blockposition1);
                         if (entityhuman instanceof EntityPlayer) {
                             CriterionTriggers.y.a((EntityPlayer) entityhuman, blockposition1, itemstack);
-@@ -117,6 +117,12 @@ public class ItemBucket extends Item {
+@@ -118,6 +118,12 @@ public class ItemBucket extends Item {
     }
 
     public boolean a(EntityHuman entityhuman, World world, BlockPosition blockposition, @Nullable MovingObjectPosition movingobjectposition, EnumDirection enumdirection, BlockPosition clicked, ItemStack itemstack) {
@ -52,7 +52,7 @@ index 92c596e2c..edd35fe8a 100644
         // CraftBukkit end
         if (!(this.fluidType instanceof FluidTypeFlowing)) {
             return false;
-@@ -127,11 +133,11 @@ public class ItemBucket extends Item {
+@@ -128,11 +134,11 @@ public class ItemBucket extends Item {
             boolean flag1 = material.isReplaceable();
 
             if (!world.isEmpty(blockposition) && !flag && !flag1 && (!(iblockdata.getBlock() instanceof IFluidContainer) || !((IFluidContainer) iblockdata.getBlock()).canPlace(world, blockposition, iblockdata, this.fluidType))) {
@ -65,9 +65,9 @@ index 92c596e2c..edd35fe8a 100644
 +                    PlayerBucketEmptyEvent event = CraftEventFactory.callPlayerBucketEmptyEvent(entityhuman, clicked.getX(), clicked.getY(), clicked.getZ(), enumdirection, itemstack, enumhand); // Paper - add enumHand
                     if (event.isCancelled()) {
                         ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
-                         // TODO: inventory not updated
+                         ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 672c32858..cd6ae3b8e 100644
+index 41b05f231..c6cd2f3be 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
@@ -229,6 +229,20 @@ public class CraftEventFactory {
@ -105,5 +105,5 @@ index 672c32858..cd6ae3b8e 100644
         }
 
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0331-Send-nearby-packets-from-world-player-list-not-serve.patch
+++ b/Spigot-Server-Patches/0331-Send-nearby-packets-from-world-player-list-not-serve.patch
@ -1,4 +1,4 @@
-From d6c60139c223c8e820175315c42194e44755aff6 Mon Sep 17 00:00:00 2001
+From 710d5ad369ece6e4eda1d9c02b1631b84c550ea5 Mon Sep 17 00:00:00 2001
 From: Mystiflow <mystiflow@gmail.com>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list
@ -119,10 +119,10 @@ index 10630ac96..b355c3f53 100644
         }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 20fb157fa..e61dc2c26 100644
+index ee2b443dd..5a7857e25 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1621,7 +1621,7 @@ public class CraftWorld implements World {
+@@ -1614,7 +1614,7 @@ public class CraftWorld implements World {
         double z = loc.getZ();
 
         PacketPlayOutCustomSoundEffect packet = new PacketPlayOutCustomSoundEffect(new MinecraftKey(sound), SoundCategory.valueOf(category.name()), new Vec3D(x, y, z), volume, pitch);
@ -132,5 +132,5 @@ index 20fb157fa..e61dc2c26 100644
 
     public String getGameRuleValue(String rule) {
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0334-Optimize-Hoppers.patch
+++ b/Spigot-Server-Patches/0334-Optimize-Hoppers.patch
@ -1,4 +1,4 @@
-From 705f90c7c280551734be5b98060ccac275b8ad1e Mon Sep 17 00:00:00 2001
+From 17aa1c3fa6671bacf38808cedb910bc2028a1213 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
@ -31,10 +31,10 @@ index 10efe6b3d..6feea98b6 100644
     private void disableSprintInterruptionOnAttack() {
         disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 7afcac499..cf1ca505f 100644
+index 569f301a2..d32ea9c92 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -459,8 +459,9 @@ public final class ItemStack {
+@@ -461,8 +461,9 @@ public final class ItemStack {
         return this.getItem().a(this, entityhuman, entityliving, enumhand);
     }
 
@ -301,5 +301,5 @@ index 15e4a37fb..5291c1836 100644
                 flag = true;
             } else if (a(itemstack1, itemstack)) {
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0344-Implement-Force-Loaded-Chunk-API.patch
+++ b/Spigot-Server-Patches/0344-Implement-Force-Loaded-Chunk-API.patch
@ -1,4 +1,4 @@
-From 52cf83bd470922c316b22cf3633cf3b21ca786e7 Mon Sep 17 00:00:00 2001
+From 2ecae931b07c751b61679f7366213834d2b4a1be Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Wed, 29 Aug 2018 00:37:42 -0400
 Subject: [PATCH] Implement Force-Loaded Chunk API
@ -28,10 +28,10 @@ index 12c6d850d..b9371e3ae 100644
         Arrays.fill(emptySkyLight, (byte) 0xFF);
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4237e5e3c..d5936eb19 100644
+index 5a7857e25..48831e45b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -571,6 +571,12 @@ public class CraftWorld implements World {
+@@ -564,6 +564,12 @@ public class CraftWorld implements World {
         return getChunkAt(location.getBlockX() >> 4, location.getBlockZ() >> 4);
     }
 
@ -45,5 +45,5 @@ index 4237e5e3c..d5936eb19 100644
         return generator;
     }
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0354-Allow-chests-to-be-placed-with-NBT-data.patch
+++ b/Spigot-Server-Patches/0354-Allow-chests-to-be-placed-with-NBT-data.patch
@ -1,14 +1,14 @@
-From d8ec170594cd5d62e56b820d4d372c7ae867f7d2 Mon Sep 17 00:00:00 2001
+From 4b5e545bb6a57d1fb6168e7ae397a111d33dace0 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 eea6d9419..4d29cb8d8 100644
+index d32ea9c92..d1000805a 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -228,6 +228,15 @@ public final class ItemStack {
+@@ -232,6 +232,15 @@ public final class ItemStack {
                     enuminteractionresult = EnumInteractionResult.FAIL; // cancel placement
                     // PAIL: Remove this when MC-99075 fixed
                     placeEvent.getPlayer().updateInventory();
@ -25,7 +25,7 @@ index eea6d9419..4d29cb8d8 100644
                     for (BlockState blockstate : blocks) {
                         blockstate.update(true, false);
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 9573a4ecd..7594c16e9 100644
+index f00c7dade..961e9d62c 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
@@ -305,7 +305,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
@ -38,5 +38,5 @@ index 9573a4ecd..7594c16e9 100644
     // CraftBukkit end
 }
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0362-Implement-furnace-cook-speed-multiplier-API.patch
+++ b/Spigot-Server-Patches/0362-Implement-furnace-cook-speed-multiplier-API.patch
@ -1,4 +1,4 @@
-From 55878b98117a59bc88932cd317004fe2392df359 Mon Sep 17 00:00:00 2001
+From 4e869dd25e33172bfeef6e9d57016dceeaf31515 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
@ -6,7 +6,7 @@ Subject: [PATCH] Implement furnace cook speed multiplier API
 Signed-off-by: Tassu <git@tassu.me>

 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index 1634b8ce0..324a8431c 100644
+index 7ec656ebe..c3c230c21 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
@@ -10,6 +10,7 @@ import java.util.Map.Entry;
@ -57,10 +57,10 @@ index 1634b8ce0..324a8431c 100644
                         this.cookTimeTotal = this.s();
                         this.burn(irecipe);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
-index 469dc4ff2..0ffbe8cd6 100644
+index 6ca6a6bf2..cb456f726 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
-@@ -71,4 +71,18 @@ public class CraftFurnace extends CraftContainer<TileEntityFurnace> implements F
+@@ -74,4 +74,18 @@ public class CraftFurnace extends CraftContainer<TileEntityFurnace> implements F
             furnace.setCustomName(null);
         }
     }
@ -80,5 +80,5 @@ index 469dc4ff2..0ffbe8cd6 100644
 +    // Paper end
 }
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0369-Async-Chunk-Loading-and-Generation.patch
+++ b/Spigot-Server-Patches/0369-Async-Chunk-Loading-and-Generation.patch
@ -1,4 +1,4 @@
-From e22e2ee24da923acb3e2ea7eb4389918c5bf8578 Mon Sep 17 00:00:00 2001
+From 0a9fba478449b363ca64fe653a250248a34d80a2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jul 2018 16:55:04 -0400
 Subject: [PATCH] Async Chunk Loading and Generation
@ -458,7 +458,7 @@ index 000000000..8f18c2869
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index c3a54576f..6255aa285 100644
+index 25e49de19..8246194df 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
@@ -191,6 +191,7 @@ public class Chunk implements IChunkAccess {
@ -2019,7 +2019,7 @@ index 1926c902a..1117e4ae2 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 72bb3f862..d736ac63d 100644
+index cb09e1052..cd31792b7 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -46,7 +46,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@ -2070,7 +2070,7 @@ index 72bb3f862..d736ac63d 100644
             Iterator<CraftBlockState> it = capturedBlockStates.iterator();
             while (it.hasNext()) {
                 CraftBlockState previous = it.next();
-                if (previous.getX() == blockposition.getX() && previous.getY() == blockposition.getY() && previous.getZ() == blockposition.getZ()) {
+-                if (previous.getPosition().equals(blockposition)) {
 -                    return previous.getHandle();
 +                if (previous.getX() == x && previous.getY() == blockposition.getY() && previous.getZ() == z) {
 +                    return java.util.concurrent.CompletableFuture.completedFuture(previous.getHandle());
@ -2304,7 +2304,7 @@ index a0f255ff1..eb4b3c7a2 100644
             }
         }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5552b64fb..c6d033928 100644
+index 7ef3c7746..162ff3414 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -162,6 +162,16 @@ public class CraftWorld implements World {
@ -2324,7 +2324,7 @@ index 5552b64fb..c6d033928 100644
     public Chunk getChunkAt(int x, int z) {
         return this.world.getChunkProvider().getChunkAt(x, z, true, true).bukkitChunk;
     }
-@@ -1457,10 +1467,13 @@ public class CraftWorld implements World {
+@@ -1450,10 +1460,13 @@ public class CraftWorld implements World {
         int chunkCoordZ = chunkcoordinates.getZ() >> 4;
         // Cycle through the 25x25 Chunks around it to load/unload the chunks.
         int radius = world.paperConfig.keepLoadedRange / 16; // Paper
@ -2432,5 +2432,5 @@ index 9c917370a..a299092a5 100644
         this.random = new Random(seed);
         this.chunkManager = world.worldProvider.getChunkGenerator().getWorldChunkManager();
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0381-Add-sun-related-API.patch
+++ b/Spigot-Server-Patches/0381-Add-sun-related-API.patch
@ -1,11 +1,11 @@
-From 59a962dc195d077d4ca77c9b5da82faefe987854 Mon Sep 17 00:00:00 2001
+From ccc5d9238cb4d5c5378e3d55e77ccb46b8cba678 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API


 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index d92b6a6ea..6a1c8e8bd 100644
+index 877337eed..48c1ae624 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
@@ -1286,6 +1286,7 @@ public abstract class EntityInsentient extends EntityLiving {
@ -17,7 +17,7 @@ index d92b6a6ea..6a1c8e8bd 100644
         if (this.world.L() && !this.world.isClientSide) {
             float f = this.az();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2b9da597a..d202360bd 100644
+index 9fc0d7576..c8a7f5e59 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -827,6 +827,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -29,10 +29,10 @@ index 2b9da597a..d202360bd 100644
         return this.G < 4;
     }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index ef5a7bc38..10fa12253 100644
+index 162ff3414..86e70f236 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -523,6 +523,12 @@ public class CraftWorld implements World {
+@@ -516,6 +516,12 @@ public class CraftWorld implements World {
         }
     }
 
@ -61,5 +61,5 @@ index 53c2d154e..40a429942 100644
 +    // Paper end
 }
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0393-Add-option-to-prevent-players-from-moving-into-unloa.patch
+++ b/Spigot-Server-Patches/0393-Add-option-to-prevent-players-from-moving-into-unloa.patch
@ -1,4 +1,4 @@
-From 3232746a90f2ca339eaeb1a7bcdbd6fd0b2c6edc Mon Sep 17 00:00:00 2001
+From 8964e2d4d208ad60e4f8373c32c062401d9f1c5f Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Mon, 22 Oct 2018 17:34:10 +0200
 Subject: [PATCH] Add option to prevent players from moving into unloaded
@ -20,7 +20,7 @@ index 48920b045..77368b17a 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 8e436c7f4..5e8c85cfb 100644
+index f2f977fff..96db9121b 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -342,6 +342,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -64,5 +64,5 @@ index 8e436c7f4..5e8c85cfb 100644
                                 float f2 = this.player.dc() ? 300.0F : 100.0F;
 
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0393-Don-t-modify-item-tag-if-interaction-is-canceled.patch
+++ b/Spigot-Server-Patches/0393-Don-t-modify-item-tag-if-interaction-is-canceled.patch
@ -1,60 +0,0 @@
-From 31d6fee4dc2059d68332b4edca5b0a145454804e Mon Sep 17 00:00:00 2001
-From: Brokkonaut <hannos17@gmx.de>
-Date: Sat, 20 Oct 2018 03:45:34 +0200
-Subject: [PATCH] Don't modify item tag if interaction is canceled
-
-The item tag is stored before executing the interaction and restored before handling the
-resulting events. If the event was not canceled and the ItemStack is not modified in the
-event, the new tag is set back to the new one afterwards. This is similar to the handling
-of the item amount.
-
-This fixes a bug where tools lose durability when the interaction is canceled and another bug
-where tools become completely repaired when they should break but the interaction was canceled.
-
-diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 4d29cb8d8..cb77bc8a5 100644
--- a/src/main/java/net/minecraft/server/ItemStack.java
-+++ b/src/main/java/net/minecraft/server/ItemStack.java
-@@ -168,6 +168,7 @@ public final class ItemStack {
-         } else {
-             // CraftBukkit start - handle all block place event logic here
-             int oldCount = this.getCount();
-+            NBTTagCompound oldTag = this.tag != null ? this.tag.clone() : null; // Paper - capture old tag
-             World world = itemactioncontext.getWorld();
- 
-             if (!(this.getItem() instanceof ItemBucket)) { // if not bucket
-@@ -180,7 +181,9 @@ public final class ItemStack {
-             Item item = this.getItem();
-             EnumInteractionResult enuminteractionresult = item.a(itemactioncontext);
-             int newCount = this.getCount();
-+            NBTTagCompound newTag = this.tag != null ? this.tag.clone() : null; // Paper - capture modified tag
-             this.setCount(oldCount);
-+            this.tag = oldTag; // Paper - restore old tag for the event
-             world.captureBlockStates = false;
-             if (enuminteractionresult == EnumInteractionResult.SUCCESS && world.captureTreeGeneration && world.capturedBlockStates.size() > 0) {
-                 world.captureTreeGeneration = false;
-@@ -202,8 +205,9 @@ public final class ItemStack {
- 
-                 if (!fertilizeEvent.isCancelled()) {
-                     // Change the stack to its new contents if it hasn't been tampered with.
-                    if (this.getCount() == oldCount) {
-+                    if (this.getCount() == oldCount && java.util.Objects.equals(this.tag, oldTag)) { // Paper - compare the tag too
-                         this.setCount(newCount);
-+                        this.tag = newTag; // Paper - restore modified tag
-                     }
-                     for (BlockState blockstate : blocks) {
-                         blockstate.update(true);
-@@ -249,8 +253,9 @@ public final class ItemStack {
-                     }
-                 } else {
-                     // Change the stack to its new contents if it hasn't been tampered with.
-                    if (this.getCount() == oldCount) {
-+                    if (this.getCount() == oldCount && java.util.Objects.equals(this.tag, oldTag)) { // Paper - compare the tag too
-                         this.setCount(newCount);
-+                        this.tag = newTag; // Paper - restore modified tag
-                     }
- 
-                     for (Map.Entry<BlockPosition, TileEntity> e : world.capturedTileEntities.entrySet()) {
-- 
-2.20.0
-
--- a/Spigot-Server-Patches/0394-Reset-players-airTicks-on-respawn.patch
+++ b/Spigot-Server-Patches/0394-Reset-players-airTicks-on-respawn.patch
@ -1,4 +1,4 @@
-From 0c803b56a779ad4b3007acae7b2cb9f444ca6121 Mon Sep 17 00:00:00 2001
+From 6d31f1bc406ebb30036e805af520eecd4f6b1386 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
@ -30,5 +30,5 @@ index 2679c2358..d04570171 100644
         this.fallDistance = 0;
         this.foodData = new FoodMetaData(this);
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0395-Strip-private-area-unicode-characters-from-signs.patch
+++ b/Spigot-Server-Patches/0395-Strip-private-area-unicode-characters-from-signs.patch
@ -1,4 +1,4 @@
-From fd8522ce3ddbd90e469df1984f4a78f462c4e55f Mon Sep 17 00:00:00 2001
+From 42425d017e77310ab50c65a34bce0820810c701b 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
@ -20,7 +20,7 @@ think of no reason to use it.
 Fixes GH-1571

 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 20dc3f272..3c712fc93 100644
+index 458d1561d..c2bcbbbab 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
@@ -11,6 +11,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener {
@ -89,5 +89,5 @@ index 20dc3f272..3c712fc93 100644
 
     public void a(int i, IChatBaseComponent ichatbasecomponent) {
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0396-Don-t-sleep-after-profile-lookups-if-not-needed.patch
+++ b/Spigot-Server-Patches/0396-Don-t-sleep-after-profile-lookups-if-not-needed.patch
@ -1,4 +1,4 @@
-From 8b5a8d3da1491173f9a0f64c64a35e01f8adf5b9 Mon Sep 17 00:00:00 2001
+From 5b3d32951a03785299c87ad545b1b8280ab5e239 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 26a743722..6ed3199c3 100644
                     try {
                         Thread.sleep(DELAY_BETWEEN_PAGES);
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0397-Use-more-reasonable-thread-count-default-for-bootstr.patch
+++ b/Spigot-Server-Patches/0397-Use-more-reasonable-thread-count-default-for-bootstr.patch
@ -1,4 +1,4 @@
-From 55d24fdbcaf2a193f697c2e4f7490d6fb2f0de72 Mon Sep 17 00:00:00 2001
+From 4a703c9cefecaf88cd005f9895443ba79faf61d8 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 13f237ec4..012d878cb 100644
         pool.shutdown();
         return fixer;
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0398-Use-EntityTypes-for-living-entities.patch
+++ b/Spigot-Server-Patches/0398-Use-EntityTypes-for-living-entities.patch
@ -1,4 +1,4 @@
-From 4e612d73f947ef9e6b6b08eb8be56663c8671b26 Mon Sep 17 00:00:00 2001
+From e7ba701585566280af85db40fcf861248e03ef75 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 4 Oct 2018 10:08:02 -0500
 Subject: [PATCH] Use EntityTypes for living entities
@ -699,10 +699,10 @@ index 63c802d02..4d93a22d8 100644
                             entityhorseskeleton.s(true);
                             entityhorseskeleton.setAgeRaw(0);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2d6d4307b..ee1079f80 100644
+index 86e70f236..159d6bb73 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-@@ -1172,153 +1172,153 @@ public class CraftWorld implements World {
+@@ -1165,153 +1165,153 @@ public class CraftWorld implements World {
             entity.setPositionRotation(x, y, z, 0, 0);
         } else if (LivingEntity.class.isAssignableFrom(clazz)) {
             if (Chicken.class.isAssignableFrom(clazz)) {
@ -915,5 +915,5 @@ index 2d6d4307b..ee1079f80 100644
 
             if (entity != null) {
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0399-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
+++ b/Spigot-Server-Patches/0399-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch
@ -1,4 +1,4 @@
-From cf16bcbcc159e8788f7c77444ba2de728b9aa206 Mon Sep 17 00:00:00 2001
+From d00faa76bc2931fcc2fd721bc2057ad5c0904ac9 Mon Sep 17 00:00:00 2001
 From: MisterVector <whizkid3000@hotmail.com>
 Date: Thu, 1 Nov 2018 14:50:05 -0700
 Subject: [PATCH] MC-136865: Use valid item for enchantment checks on block
@ -30,5 +30,5 @@ index 23fc4d8e1..0b6c25936 100644
                         iblockdata.getBlock().a(this.world, this.player, blockposition, iblockdata, tileentity, itemstack2);
                     }
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0400-Optimize-World-Time-Updates.patch
+++ b/Spigot-Server-Patches/0400-Optimize-World-Time-Updates.patch
@ -1,4 +1,4 @@
-From ce53ef45117823d14fb68349adbf192cb6b62b94 Mon Sep 17 00:00:00 2001
+From 918a78d30bc4ddaba7a8a4233b7768534f556ea5 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 17ae26cb8..2023ee118 100644
+index 32aee07d1..55e7dfa17 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1038,12 +1038,24 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@ -41,5 +41,5 @@ index 17ae26cb8..2023ee118 100644
 
         // WorldServer worldserver; // CraftBukkit - dropped down
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0401-Restore-custom-InventoryHolder-support.patch
+++ b/Spigot-Server-Patches/0401-Restore-custom-InventoryHolder-support.patch
@ -1,4 +1,4 @@
-From 7817eebb61ebe27be2a7ccda68255e7366cfc332 Mon Sep 17 00:00:00 2001
+From 4bd5f0bf9b7271816dbcb3046e50f3e2af1a484f 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 23389743d..d25928e09 100644
     }
 
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0402-Use-Vanilla-Minecart-Speeds.patch
+++ b/Spigot-Server-Patches/0402-Use-Vanilla-Minecart-Speeds.patch
@ -1,4 +1,4 @@
-From d5f7c49e1cec24ab58a34916aaa8794feaa64eb4 Mon Sep 17 00:00:00 2001
+From 1edca875cbb3d3715f715b7714866b2b9b9cd3cf 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
@ -6,7 +6,7 @@ Subject: [PATCH] Use Vanilla Minecart Speeds
 CraftBukkit changed the values on flying speed, restore back to vanilla

 diff --git a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
-index b52bc659e..cea8cfce2 100644
+index e741c7f83..6d21527ea 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
@@ -39,9 +39,9 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT
@ -23,5 +23,5 @@ index b52bc659e..cea8cfce2 100644
     // CraftBukkit end
 
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0403-Fix-SpongeAbsortEvent-handling.patch
+++ b/Spigot-Server-Patches/0403-Fix-SpongeAbsortEvent-handling.patch
@ -1,4 +1,4 @@
-From c25257eebd8c342309774a7522eac6768df7cb85 Mon Sep 17 00:00:00 2001
+From 7ed195a3a835d7e005ed8dd89add308a50ed4502 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
@ -6,7 +6,7 @@ Subject: [PATCH] Fix SpongeAbsortEvent handling
 Only process drops when the block is actually going to be removed

 diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java
-index 9c508caa9..4b762a92c 100644
+index ab1ee37a2..852d98a6b 100644
 --- a/src/main/java/net/minecraft/server/BlockSponge.java
 +++ b/src/main/java/net/minecraft/server/BlockSponge.java
@@ -106,7 +106,11 @@ public class BlockSponge extends Block {
@ -40,5 +40,5 @@ index 2d855aae6..bc345a2c3 100644
         this.dropNaturally(world, blockposition, 1.0F, i);
     }
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0404-Don-t-allow-digging-into-unloaded-chunks.patch
+++ b/Spigot-Server-Patches/0404-Don-t-allow-digging-into-unloaded-chunks.patch
@ -1,11 +1,11 @@
-From 1ec53fbad94452966645b7d7fbca15b0b48b8013 Mon Sep 17 00:00:00 2001
+From 2d44fd64a42e7094966027f4f83c3b2705b1b202 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


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 5e8c85cfb..bb4498e0f 100644
+index 96db9121b..44fabe240 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1223,6 +1223,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -21,5 +21,5 @@ index 5e8c85cfb..bb4498e0f 100644
             double d1 = this.player.locY - ((double) blockposition.getY() + 0.5D) + 1.5D;
             double d2 = this.player.locZ - ((double) blockposition.getZ() + 0.5D);
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0405-Optimize-redstone-algorithm.patch
+++ b/Spigot-Server-Patches/0405-Optimize-redstone-algorithm.patch
@ -1,4 +1,4 @@
-From 9f83f2a46779d5164fce7289530d7bc2c312d673 Mon Sep 17 00:00:00 2001
+From 01a417e7f224789b0d8cf1d33e219847b3cbfc8d 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
@ -1140,7 +1140,7 @@ index 0adea6a17..174e84760 100644
                 iblockdata.a(world, blockposition, 0);
                 world.setAir(blockposition);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index a877d4a6b..d14ee6b9b 100644
+index c8a7f5e59..160ef3659 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -646,6 +646,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -1160,5 +1160,5 @@ index a877d4a6b..d14ee6b9b 100644
         int i = 0;
         EnumDirection[] aenumdirection = World.a;
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0406-force-entity-dismount-during-teleportation.patch
+++ b/Spigot-Server-Patches/0406-force-entity-dismount-during-teleportation.patch
@ -1,4 +1,4 @@
-From 3418123f427b84abe247fb9965798a6f26ffe968 Mon Sep 17 00:00:00 2001
+From 39a44a63748b3241a097e788b74fb75da9916405 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
@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!

 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index e4c78c676..ab24ff871 100644
+index 9eeb73d67..80db026ea 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -2096,12 +2096,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@ -72,7 +72,7 @@ index e4c78c676..ab24ff871 100644
             if (event.isCancelled()) {
                 return false;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 6aa3a462f..c25a89111 100644
+index 53ae1528d..a35301ad5 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -994,8 +994,11 @@ public abstract class EntityHuman extends EntityLiving {
@ -90,7 +90,7 @@ index 6aa3a462f..c25a89111 100644
     }
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 34b649dad..4dd24e1d7 100644
+index dc277f439..826ddc25c 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -2478,10 +2478,13 @@ public abstract class EntityLiving extends Entity {
@ -110,7 +110,7 @@ index 34b649dad..4dd24e1d7 100644
             this.A(entity);
         }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1b47d7bd4..7b8dbd00c 100644
+index d04570171..82855b3a8 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -776,10 +776,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@ -130,5 +130,5 @@ index 1b47d7bd4..7b8dbd00c 100644
 
         if (entity1 != entity && this.playerConnection != null) {
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0407-Book-Size-Limits.patch
+++ b/Spigot-Server-Patches/0407-Book-Size-Limits.patch
@ -1,4 +1,4 @@
-From c93839b72c860701de2edb9def83098c7c0c6315 Mon Sep 17 00:00:00 2001
+From b8997d87085049de6ff72b8025e127b243d89476 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
@ -22,7 +22,7 @@ index fef899ae0..468aff713 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index bb4498e0f..a9ef84d0e 100644
+index 44fabe240..6a99fb6b7 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -748,6 +748,38 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -65,5 +65,5 @@ index bb4498e0f..a9ef84d0e 100644
         PlayerConnectionUtils.ensureMainThread(packetplayinbedit, this, this.player.getWorldServer());
         if (this.lastBookTick + 20 > MinecraftServer.currentTick) {
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0408-Make-the-default-permission-message-configurable.patch
+++ b/Spigot-Server-Patches/0408-Make-the-default-permission-message-configurable.patch
@ -1,4 +1,4 @@
-From 4479e6a4f02111bdd6b3c2ee863d394575dfd05f Mon Sep 17 00:00:00 2001
+From bb1cb0d540714ddb74f50a92780f537c0ed99ea6 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
@ -44,5 +44,5 @@ index eb4b3c7a2..7c344ffa2 100644
         return createProfile(uuid, null);
     }
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0409-Add-more-Zombie-API.patch
+++ b/Spigot-Server-Patches/0409-Add-more-Zombie-API.patch
@ -1,4 +1,4 @@
-From 33e6d336c29648d4c515229c8d8d83df8aa15be7 Mon Sep 17 00:00:00 2001
+From e65af43e246fc653434b585cf761de23cb236a81 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
@ -150,5 +150,5 @@ index 7af4ea9f8..4d4c50212 100644
 +    // Paper end
 }
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0410-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
+++ b/Spigot-Server-Patches/0410-limit-the-range-at-which-we-ll-consider-an-attackabl.patch
@ -1,4 +1,4 @@
-From bcbd3dc5032e7d687489b635e0eb1d12bb95860e Mon Sep 17 00:00:00 2001
+From 89ead2699326943c4d79a66df5cb5f79ac0807f4 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Tue, 13 Nov 2018 14:01:00 +0000
 Subject: [PATCH] limit the range at which we'll consider an attackable target
@ -12,7 +12,7 @@ decrease when set, allowing us to skip further checks earlier on
 when looking for an attackable entity

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d14ee6b9b..9bf3f8343 100644
+index 160ef3659..c702b94ef 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -2727,8 +2727,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -31,5 +31,5 @@ index d14ee6b9b..9bf3f8343 100644
 
                 if (entityhuman1.isSneaking()) {
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0411-Prevent-rayTrace-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0411-Prevent-rayTrace-from-loading-chunks.patch
@ -1,4 +1,4 @@
-From 0acb4ed30df82b52e3d01792980ce3dee59e639d Mon Sep 17 00:00:00 2001
+From 98676ff5b942b199f53538a3cef8268133d750c8 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
@ -7,7 +7,7 @@ ray tracing into an unloaded chunk should be treated as a miss
 this saves a ton of lag for when AI tries to raytrace near unloaded chunks.

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 747fda044..bdbacae29 100644
+index c702b94ef..26327895b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -858,7 +858,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@ -31,5 +31,5 @@ index 747fda044..bdbacae29 100644
 
                     if (!flag || iblockdata1.getMaterial() == Material.PORTAL || !iblockdata1.getCollisionShape(this, blockposition).isEmpty()) {
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0412-Handle-Large-Packets-disconnecting-client.patch
+++ b/Spigot-Server-Patches/0412-Handle-Large-Packets-disconnecting-client.patch
@ -1,4 +1,4 @@
-From c5f21c24ee494a5b7a3e161a1f4af4cf6930564d Mon Sep 17 00:00:00 2001
+From a8b39ea15fbb0ad46e7b7c1726499390f351d947 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
@ -114,5 +114,5 @@ index 4d4835353..abdb21f6b 100644
     }
 
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0413-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
+++ b/Spigot-Server-Patches/0413-Lazy-init-world-storage-in-CraftOfflinePlayer.patch
@ -1,4 +1,4 @@
-From cdb32d812029eb5b53ed8b2e3dad3d34b49a325d Mon Sep 17 00:00:00 2001
+From 7c4006d50b89f7c9b4763e64e85aa2797b2af221 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 698cfb918..fbdb2df27 100644
 
     public long getFirstPlayed() {
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0414-Add-PlayerConnectionCloseEvent.patch
+++ b/Spigot-Server-Patches/0414-Add-PlayerConnectionCloseEvent.patch
@ -1,4 +1,4 @@
-From 631184394cd176862f81504ab8355ff175ea4c55 Mon Sep 17 00:00:00 2001
+From 18a056f21d2650e01c0222acb01f017f234fed3b 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
@ -89,5 +89,5 @@ index 065bede4c..21e92b921 100644
 
         }
 -- 
-2.20.0
+2.20.1

--- a/Spigot-Server-Patches/0415-Prevent-Enderman-from-loading-chunks.patch
+++ b/Spigot-Server-Patches/0415-Prevent-Enderman-from-loading-chunks.patch
@ -1,4 +1,4 @@
-From dac80403916d0d136afa630b00ee4a56c0bf983f Mon Sep 17 00:00:00 2001
+From 337b6a7a492cedc30f4e7c564e4dfd83945033fd 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 7ef46851e..1df974bc9 100644
             IBlockData iblockdata2 = Block.getValidBlockForPosition(getEnderman().getCarried(), getEnderman().world, blockposition); // Paper - Fix MC-124320
 
 -- 
-2.20.0
+2.20.1

--- a/work/Bukkit
+++ b/work/Bukkit
@ -1 +1 @@
-Subproject commit 78568d11d3ad8bb1f6a90c1b5dff3394f22f12fc
+Subproject commit 0969eedc88f58ce58fc03bcd4acdfaa1ac91301c
--- a/work/CraftBukkit
+++ b/work/CraftBukkit
@ -1 +1 @@
-Subproject commit 1b982fd67efd09964d565b9ee71df9d4fb0eb093
+Subproject commit dff66dfccd64280d066715340c0692f6e376be0b