Update upstream B/CB/S

Also fixes build as a result of an upstream force push

--- work/Bukkit
Submodule work/Bukkit 217dc08d..d13fdf8c:
  > SPIGOT-4637: Add source block to BlockPhysicsEvent.

--- work/CraftBukkit
Submodule work/CraftBukkit acbba8ba..cb98c6ea:
  > Fix line endings in CraftDefaultPermissions
  > SPIGOT-4637: Add source block to BlockPhysicsEvent.

--- work/Spigot
Submodule work/Spigot 75ee78a0c...4165cd8f4 (commits not present)
  > (Manually Added) - Appears to be a result of an upstream force push
  > (Manually Added) - Changed: SPIGOT-4636: Add creative mode NBT permissions

Spigot-API-Patches/0144-Add-source-block-to-BlockPhysicsEvent.patch

@@ -1,48 +1,27 @@
-From e8b6405b84b65b5726de26bbcff1c2ef0b0519ee Mon Sep 17 00:00:00 2001
+From 92f743e9e76007184f2786aa099069484093b076 Mon Sep 17 00:00:00 2001
 From: Sotr <i@omc.hk>
 Date: Thu, 23 Aug 2018 16:14:25 +0800
 Subject: [PATCH] Add source block to BlockPhysicsEvent
 
 
 diff --git a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
-index 5e47eabe..9d9e4712 100644
+index a34359ed..cda896fa 100644
 --- a/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
 +++ b/src/main/java/org/bukkit/event/block/BlockPhysicsEvent.java
-@@ -29,10 +29,34 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable {
+@@ -31,6 +31,13 @@ public class BlockPhysicsEvent extends BlockEvent implements Cancellable {
-     private static final HandlerList handlers = new HandlerList();
+     private final Block sourceBlock;
-     private final BlockData changed;
      private boolean cancel = false;
-+    // Paper start - add source block
+ 
-+    private int sourceX;
++    // Paper start - Legacy constructor, use #BlockPhysicsEvent(Block, BlockData, Block)
-+    private int sourceY;
++    @Deprecated
-+    private int sourceZ;
-+    private Block sourceBlock;
-+
 +    public BlockPhysicsEvent(final Block block, final BlockData changed, final int sourceX, final int sourceY, final int sourceZ) {
-+        this(block, changed);
++        this(block, changed, block.getWorld().getBlockAt(sourceX, sourceY, sourceZ));
-+        this.sourceX = sourceX;
-+        this.sourceY = sourceY;
-+        this.sourceZ = sourceZ;
-+        this.sourceBlock = null;
-+    }
-+
-+    /**
-+     * Gets the source block, causing this event
-+     *
-+     * @return Source block
-+     */
-+    public Block getSourceBlock() {
-+        return sourceBlock == null ? (sourceBlock = block.getWorld().getBlockAt(sourceX, sourceY, sourceZ)) : sourceBlock;
 +    }
 +    // Paper end
- 
++
      public BlockPhysicsEvent(final Block block, final BlockData changed) {
-         super(block);
+         this(block, changed, block);
-         this.changed = changed;
-+        this.sourceBlock = block; // Paper - add source block
      }
- 
-     /**
 -- 
 2.20.1
 

Spigot-Server-Patches/0082-Option-to-disable-BlockPhysicsEvent-for-Redstone.patch

@@ -1,4 +1,4 @@
-From 900120b3a43fa8b8922f1b44a79ecf5a52b0617c Mon Sep 17 00:00:00 2001
+From e4828c1d88a44e164ad5fa96cca06dc18c8488ad Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 19:55:45 -0400
 Subject: [PATCH] Option to disable BlockPhysicsEvent for Redstone
@@ -25,7 +25,7 @@ index 0faef7cf2..deb4ec254 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6f5719928..541d9c2d6 100644
+index b398dd1b5..e34732c35 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -620,7 +620,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
@@ -34,7 +34,7 @@ index 6f5719928..541d9c2d6 100644
                  CraftWorld world = ((WorldServer) this).getWorld();
 -                if (world != null) {
 +                if (world != null && !((WorldServer)this).stopPhysicsEvent) { // Paper
-                     BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftBlockData.fromData(iblockdata));
+                     BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftBlockData.fromData(iblockdata), world.getBlockAt(blockposition1.getX(), blockposition1.getY(), blockposition1.getZ()));
                      this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java

Spigot-Server-Patches/0337-Add-source-block-to-BlockPhysicsEvent.patch

@@ -1,22 +0,0 @@
-From 26c2d12f82126e938d3873de0bf7d4485db0164e Mon Sep 17 00:00:00 2001
-From: Sotr <i@omc.hk>
-Date: Thu, 23 Aug 2018 16:14:12 +0800
-Subject: [PATCH] Add source block to BlockPhysicsEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 0866c6feb..c8a49d776 100644
---- a/src/main/java/net/minecraft/server/World.java
-+++ b/src/main/java/net/minecraft/server/World.java
-@@ -632,7 +632,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc
-                 // CraftBukkit start
-                 CraftWorld world = ((WorldServer) this).getWorld();
-                 if (world != null && !((WorldServer)this).stopPhysicsEvent) { // Paper
--                    BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftBlockData.fromData(iblockdata));
-+                    BlockPhysicsEvent event = new BlockPhysicsEvent(world.getBlockAt(blockposition.getX(), blockposition.getY(), blockposition.getZ()), CraftBlockData.fromData(iblockdata), blockposition1.getX(), blockposition1.getY(), blockposition1.getZ()); // Paper - add source block
-                     this.getServer().getPluginManager().callEvent(event);
- 
-                     if (event.isCancelled()) {
--- 
-2.20.1
-

Spigot-Server-Patches/0337-Anti-Xray.patch

@@ -1,4 +1,4 @@
-From 7dbfd324c0ed19ad289e2333f2f17bff859e05a2 Mon Sep 17 00:00:00 2001
+From 90e651a3b6a019e8ac6201b1681beb86df5a109f Mon Sep 17 00:00:00 2001
 From: stonar96 <minecraft.stonar96@gmail.com>
 Date: Mon, 20 Aug 2018 03:03:58 +0200
 Subject: [PATCH] Anti-Xray
@@ -1070,7 +1070,7 @@ index 000000000..37093419c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index edf4d9130..71d865b76 100644
+index d22e83f3c..1d006bad1 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -541,7 +541,7 @@ public class Chunk implements IChunkAccess {
@@ -1534,7 +1534,7 @@ index 16e3469d0..e4c0cc6a3 100644
  
              if (enumskyblock == EnumSkyBlock.SKY) {
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c8a49d776..5c5b3ef28 100644
+index 9218f45ed..ee5d478b5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1,6 +1,8 @@

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

@@ -1,11 +1,11 @@
-From 9384bc7280f26242504fedfa2c4721405a7e7554 Mon Sep 17 00:00:00 2001
+From e142de31a76e71e82432fee1cf0132ef972a430d 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 2220a18d9..94c544714 100644
+index 7b1e0d6f2..e04204055 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -472,6 +472,12 @@ public class PaperWorldConfig {

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

@@ -1,4 +1,4 @@
-From fe98f5a260718f88963ab3ca2952092c93954b17 Mon Sep 17 00:00:00 2001
+From 15a763f8d90036c9d62ca19ee6f1debc50960b52 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

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

@@ -1,4 +1,4 @@
-From 3449b18fdabeebb1a02fd6b631eaa001019b127c Mon Sep 17 00:00:00 2001
+From d1aba7bb16817353cd0be79f16f7e8596eb5fe94 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

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

@@ -1,4 +1,4 @@
-From 4f3a46b3a46e768a74c36f76854c96a677eeb203 Mon Sep 17 00:00:00 2001
+From c0a4ea7a94c6b7cee9784046eb7677af3ab1e383 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

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

@@ -1,4 +1,4 @@
-From 9cded53ab343588fee06e5a75b7d3f8785b176a1 Mon Sep 17 00:00:00 2001
+From f9c8c31e588e039f634eb1e6f4a31f4622eda27b 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

Spigot-Server-Patches/0343-Optimize-getChunkIfLoaded-type-calls.patch

@@ -1,4 +1,4 @@
-From 054e75a8aa2efaf8de0b9bd367a3186e38a9a1e1 Mon Sep 17 00:00:00 2001
+From c8660c3dbfdb271d5d03fb6564a4a36963f05e05 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 29 Aug 2018 21:59:22 -0400
 Subject: [PATCH] Optimize getChunkIfLoaded type calls
@@ -23,7 +23,7 @@ index 41926a361..186cfda7e 100644
                      neighbor.setNeighborUnloaded(-x, -z);
                      chunk.setNeighborUnloaded(x, z);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5c5b3ef28..c89a0f7da 100644
+index ee5d478b5..1e51f2bb6 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -162,7 +162,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

Spigot-Server-Patches/0344-fix-newlines-in-spigot-tab-list-API.patch

@@ -1,4 +1,4 @@
-From a55e136708d93f39018512f640777efb9653c7a9 Mon Sep 17 00:00:00 2001
+From 6f777644facfe0beaca514e3f9993ce98b6cc5a0 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 1 Sep 2018 11:29:52 +0100
 Subject: [PATCH] fix newlines in spigot tab list API
@@ -7,7 +7,7 @@ Spigots implementation around the header/footer strips newlines from the
 header/footer, this patch allows the tab list header/footer to retain newlines.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index ce58cfc11e..143779dfc2 100644
+index ce58cfc11..143779dfc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -368,20 +368,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -36,7 +36,7 @@ index ce58cfc11e..143779dfc2 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
-index a067e39d54..5e20a9a619 100644
+index a067e39d5..5e20a9a61 100644
 --- a/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 +++ b/src/main/java/org/bukkit/craftbukkit/util/CraftChatMessage.java
 @@ -143,7 +143,13 @@ public final class CraftChatMessage {

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

@@ -1,4 +1,4 @@
-From d4cb5e252af407394fdad5ea6656aace256590ef Mon Sep 17 00:00:00 2001
+From 4b0795a055270606df155a99de16e1d81edb3295 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 2c4465fff1..95fe3a91bf 100644
+index 2c4465fff..95fe3a91b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -296,7 +296,7 @@ public class CraftWorld implements World {

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

@@ -1,4 +1,4 @@
-From 4b16cca18f6fdcd76917dc5e8c58e2d419ec9db2 Mon Sep 17 00:00:00 2001
+From c92076cfeac6a93fbf9cb8d37f811714b15a9fec 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/0347-Expose-attack-cooldown-methods-for-Player.patch

@@ -1,11 +1,11 @@
-From e4b01dcd11cd942924a16a9693730e2645972219 Mon Sep 17 00:00:00 2001
+From 342a5254b431144db71c70b82c0c687899b2016d Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Tue, 4 Sep 2018 15:02:00 -0500
 Subject: [PATCH] Expose attack cooldown methods for Player
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 59f108e490..82684dd688 100644
+index 59f108e49..82684dd68 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2057,14 +2057,17 @@ public abstract class EntityHuman extends EntityLiving {
@@ -27,7 +27,7 @@ index 59f108e490..82684dd688 100644
          this.aH = 0;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 143779dfc2..07b9545e76 100644
+index 143779dfc..07b9545e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1892,6 +1892,20 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/0348-MC-2025-Save-and-load-entity-AABB-to-prevent-wobble.patch

@@ -1,4 +1,4 @@
-From 0d6646f34d25a48e7a0fac4653c71c724e715af1 Mon Sep 17 00:00:00 2001
+From 12af6ff48e20ae7c665a665d8ffef0b398fcf5a0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 4 Sep 2018 19:07:57 -0400
 Subject: [PATCH] MC-2025: Save and load entity AABB to prevent wobble
@@ -23,7 +23,7 @@ This reasoning leads us to one clear conclusion: The simplest, least invasive, a
 store the AABB in NBT data on chunk save and restore the AABB exactly as it was saved upon reload.
 
 diff --git a/src/main/java/net/minecraft/server/AxisAlignedBB.java b/src/main/java/net/minecraft/server/AxisAlignedBB.java
-index 1c0b783e8e..c5e541985f 100644
+index 1c0b783e8..c5e541985 100644
 --- a/src/main/java/net/minecraft/server/AxisAlignedBB.java
 +++ b/src/main/java/net/minecraft/server/AxisAlignedBB.java
 @@ -5,12 +5,12 @@ import javax.annotation.Nullable;
@@ -46,7 +46,7 @@ index 1c0b783e8e..c5e541985f 100644
      public AxisAlignedBB(double d0, double d1, double d2, double d3, double d4, double d5) {
          this.minX = Math.min(d0, d3);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c29d7eeb0a..6b65c69423 100644
+index c29d7eeb0..6b65c6942 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1673,6 +1673,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

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

@@ -1,4 +1,4 @@
-From a5da0803b43dbfff4d4b6ad181b5f8bc9273a84e Mon Sep 17 00:00:00 2001
+From 154abb777432d6276f3cf162439ed29cdb0e9d5b 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/0350-Allow-chests-to-be-placed-with-NBT-data.patch

@@ -1,11 +1,11 @@
-From 740fee3513cfc3fde95fc3143285c7d873987c03 Mon Sep 17 00:00:00 2001
+From 84161d23970b062dacae0e45f3cc86f783700c07 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 914da48a23..7827f692af 100644
+index 914da48a2..7827f692a 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -232,6 +232,15 @@ public final class ItemStack {
@@ -25,7 +25,7 @@ index 914da48a23..7827f692af 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 c46b761cc5..2e0f782f65 100644
+index c46b761cc..2e0f782f6 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

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

@@ -1,4 +1,4 @@
-From 5ac90bbc0feb33ca051212567a9d978ef739a198 Mon Sep 17 00:00:00 2001
+From 043b98e4a753bdae0ea34258f276ce82c75cc8c7 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
@@ -7,7 +7,7 @@ Implements Pathfinding API for mobs
 
 diff --git a/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 new file mode 100644
-index 0000000000..ed3d86ddd3
+index 000000000..ed3d86ddd
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/entity/PaperPathfinder.java
 @@ -0,0 +1,113 @@
@@ -125,7 +125,7 @@ index 0000000000..ed3d86ddd3
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index c55aadb536..cac0ce2a3a 100644
+index c55aadb53..cac0ce2a3 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -69,7 +69,7 @@ public abstract class NavigationAbstract {
@@ -173,7 +173,7 @@ index c55aadb536..cac0ce2a3a 100644
          this.pathfindFailures = 0; this.lastFailure = 0; // Paper - Pathfinding optimizations
          this.c = null;
 diff --git a/src/main/java/net/minecraft/server/PathEntity.java b/src/main/java/net/minecraft/server/PathEntity.java
-index 31fc1fbc65..5cf7f3bf1b 100644
+index 31fc1fbc6..5cf7f3bf1 100644
 --- a/src/main/java/net/minecraft/server/PathEntity.java
 +++ b/src/main/java/net/minecraft/server/PathEntity.java
 @@ -4,12 +4,13 @@ import javax.annotation.Nullable;
@@ -212,7 +212,7 @@ index 31fc1fbc65..5cf7f3bf1b 100644
  
          return new Vec3D((double) pathpoint.a, (double) pathpoint.b, (double) pathpoint.c);
 diff --git a/src/main/java/net/minecraft/server/PathPoint.java b/src/main/java/net/minecraft/server/PathPoint.java
-index 78ed002868..0dd6e46d12 100644
+index 78ed00286..0dd6e46d1 100644
 --- a/src/main/java/net/minecraft/server/PathPoint.java
 +++ b/src/main/java/net/minecraft/server/PathPoint.java
 @@ -2,9 +2,9 @@ package net.minecraft.server;
@@ -229,7 +229,7 @@ index 78ed002868..0dd6e46d12 100644
      public int d = -1;
      public float e;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
-index 5bf1cd06fa..53c2d154ed 100644
+index 5bf1cd06f..53c2d154e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMob.java
 @@ -12,8 +12,11 @@ import org.bukkit.loot.LootTable;

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

@@ -1,11 +1,11 @@
-From 5a71847deef02674f0c90f28e19de4bbe3d1be27 Mon Sep 17 00:00:00 2001
+From 658dd490f11f1972b72d33202dba2fa69acbeae2 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
 
 
 diff --git a/src/main/java/net/minecraft/server/FluidTypeFlowing.java b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
-index 28edf37d0d..bbffeae3d0 100644
+index 28edf37d0..bbffeae3d 100644
 --- a/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 +++ b/src/main/java/net/minecraft/server/FluidTypeFlowing.java
 @@ -185,7 +185,8 @@ public abstract class FluidTypeFlowing extends FluidType {

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

@@ -1,11 +1,11 @@
-From 112f74898582feab4c96557300cc97ce9de5389e Mon Sep 17 00:00:00 2001
+From e6dbfd0102cfdbd27f6ab61825b79a82954d0409 Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Wed, 12 Sep 2018 18:53:55 +0300
 Subject: [PATCH] Implement an API for CanPlaceOn and CanDestroy NBT values
 
 
 diff --git a/src/main/java/net/minecraft/server/ArgumentBlock.java b/src/main/java/net/minecraft/server/ArgumentBlock.java
-index 8e8390282d..f529365817 100644
+index 8e8390282..f52936581 100644
 --- a/src/main/java/net/minecraft/server/ArgumentBlock.java
 +++ b/src/main/java/net/minecraft/server/ArgumentBlock.java
 @@ -43,7 +43,7 @@ public class ArgumentBlock {
@@ -32,7 +32,7 @@ index 8e8390282d..f529365817 100644
          this.s = this::l;
          if (this.i.canRead() && this.i.peek() == '#') {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index eaf4cd11c4..03644365ce 100644
+index eaf4cd11c..03644365c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -81,6 +81,12 @@ import javax.annotation.Nullable;

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

@@ -1,4 +1,4 @@
-From 596abf69b2fac810f11d4d62d30da12339bc5ac7 Mon Sep 17 00:00:00 2001
+From 03b201f14bedd7e8358726164b2793c1a363bc98 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,7 +74,7 @@ index e58fdee8b..f2c4048c2 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c89a0f7da..bd0271aeb 100644
+index 1e51f2bb6..1e030783b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -764,7 +764,17 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

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

@@ -1,4 +1,4 @@
-From 899e7615e1933e6a98fca25a1c4f2f7cedfc02ef Mon Sep 17 00:00:00 2001
+From 706dbd57e4fe49d668ff31fa4e728d50502046c7 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent mob spawning from loading/generating chunks
 also prevents if out of world border bounds
 
 diff --git a/src/main/java/net/minecraft/server/SpawnerCreature.java b/src/main/java/net/minecraft/server/SpawnerCreature.java
-index bfbe4d3e39..e2bf17f442 100644
+index bfbe4d3e3..e2bf17f44 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -129,9 +129,9 @@ public final class SpawnerCreature {

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

@@ -1,4 +1,4 @@
-From 5e7acdf5c2c844f2936159bdb6554de05cad98b6 Mon Sep 17 00:00:00 2001
+From 890535d3714a533dbcb0fb189aefd8c661e64f8e 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize Biome Mob Lookups for Mob Spawning
 Uses an EnumMap as well as a Set paired List for O(1) contains calls.
 
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index c399bdecc3..3496d4236d 100644
+index c399bdecc..3496d4236 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -120,7 +120,7 @@ public abstract class BiomeBase {

Spigot-Server-Patches/0357-Optimize-and-Fix-ExpiringMap-Issues.patch

@@ -1,4 +1,4 @@
-From fd7247a45305a527faaeb92f0ac887d5bffcddab Mon Sep 17 00:00:00 2001
+From 1d10c30c13027d091b99b887f8fc6753efd9c2f6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 16 Sep 2018 00:00:16 -0400
 Subject: [PATCH] Optimize and Fix ExpiringMap Issues
@@ -14,7 +14,7 @@ manipulation, and instead to run clean
 once per tick per active expiring map.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
-index a237684410..835a2aae40 100644
+index a23768441..835a2aae4 100644
 --- a/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
 +++ b/src/main/java/net/minecraft/server/ChunkGeneratorAbstract.java
 @@ -142,13 +142,13 @@ public abstract class ChunkGeneratorAbstract<C extends GeneratorSettings> implem
@@ -34,7 +34,7 @@ index a237684410..835a2aae40 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ExpiringMap.java b/src/main/java/net/minecraft/server/ExpiringMap.java
-index bd36364796..bf6095137a 100644
+index bd3636479..bf6095137 100644
 --- a/src/main/java/net/minecraft/server/ExpiringMap.java
 +++ b/src/main/java/net/minecraft/server/ExpiringMap.java
 @@ -2,87 +2,211 @@ package net.minecraft.server;
@@ -290,7 +290,7 @@ index bd36364796..bf6095137a 100644
 +    */ // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 41c9dccab3..6138c14eae 100644
+index 41c9dccab..6138c14ea 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -150,6 +150,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -310,7 +310,7 @@ index 41c9dccab3..6138c14eae 100644
          co.aikar.timings.TimingsManager.FULL_SERVER_TICK.stopTiming(); // Paper
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index 4cca65666d..9c917370ae 100644
+index 4cca65666..9c917370a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 @@ -144,7 +144,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin

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

@@ -1,4 +1,4 @@
-From dd8ac638f61f4aecc7bd3c267ac410dd83d58fbf Mon Sep 17 00:00:00 2001
+From ce84fff2cc5efef101f4e678e479598f96f37a2c 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 5b6ccfa9f5..bfbd35bbe5 100644
+index 5b6ccfa9f..bfbd35bbe 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -9,6 +9,7 @@ import java.util.Map.Entry;
@@ -57,7 +57,7 @@ index 5b6ccfa9f5..bfbd35bbe5 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 c2eea8ce03..429c780ec7 100644
+index c2eea8ce0..429c780ec 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftFurnace.java
 @@ -84,4 +84,18 @@ public class CraftFurnace extends CraftContainer<TileEntityFurnace> implements F

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

@@ -1,4 +1,4 @@
-From 597d2af0a40d03f1928c77a2bbe43655529a9fc1 Mon Sep 17 00:00:00 2001
+From c28d1e14a5d3297db12189b3e60a4c8f97456483 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
@@ -85,7 +85,7 @@ index 8458dc17d..b5fb95293 100644
              String s = nbttagcompound.getString("generatorName");
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index bc7d39e26..69bcc941e 100644
+index 81e27949d..6cea317d5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -989,7 +989,7 @@ public final class CraftServer implements Server {

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

@@ -1,4 +1,4 @@
-From e46279653b3711a6e6a537daaab08da2d6d4eef6 Mon Sep 17 00:00:00 2001
+From 2cade16ed21794df62ac84298f79558ab8c409fe 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
@@ -21,7 +21,7 @@ known NMS used methods, but we can add more if naughty plugins are found later.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldMap.java b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 new file mode 100644
-index 0000000000..af9e4455c6
+index 000000000..af9e4455c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldMap.java
 @@ -0,0 +1,191 @@
@@ -217,7 +217,7 @@ index 0000000000..af9e4455c6
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5393a11db0..68743a6b77 100644
+index 5393a11db..68743a6b7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -82,7 +82,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati

Spigot-Server-Patches/0361-PreSpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From b7c96de459d89e977071a0e5ec36d590aa60185c Mon Sep 17 00:00:00 2001
+From b786a93c3796a21b2fa34735dd126abf5ff0da1e Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:53:23 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent
@@ -9,7 +9,7 @@ SpawnerSpawnEvent gets called instead of the CreatureSpawnEvent for
 spawners.
 
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
-index eca3f85ad2..b2d2de7f81 100644
+index eca3f85ad..b2d2de7f8 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerAbstract.java
 @@ -102,11 +102,11 @@ public abstract class MobSpawnerAbstract {

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

@@ -1,4 +1,4 @@
-From fd5c70a2d7cea45e159e5d1b9ae576b5dff62a7e Mon Sep 17 00:00:00 2001
+From e2134922812ac0a55ced3de651c438a1dca6f241 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 22 Sep 2018 15:56:59 -0400
 Subject: [PATCH] Catch JsonParseException in Entity and TE names
@@ -13,7 +13,7 @@ Shulkers) may need to be changed in order for it to re-save properly
 No more crashing though.
 
 diff --git a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
-index e38a0d488e..a245df1dce 100644
+index e38a0d488..a245df1dc 100644
 --- a/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 +++ b/src/main/java/net/minecraft/server/CommandBlockListenerAbstract.java
 @@ -56,7 +56,7 @@ public abstract class CommandBlockListenerAbstract implements ICommandListener {
@@ -26,7 +26,7 @@ index e38a0d488e..a245df1dce 100644
  
          if (nbttagcompound.hasKeyOfType("TrackOutput", 1)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9eb280adc5..a4c5b0b5b5 100644
+index 9eb280adc..a4c5b0b5b 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1748,7 +1748,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -39,7 +39,7 @@ index 9eb280adc5..a4c5b0b5b5 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 0ef5ad1165..f70f5899fa 100644
+index 0ef5ad116..f70f5899f 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 {
@@ -63,7 +63,7 @@ index 0ef5ad1165..f70f5899fa 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityBanner.java b/src/main/java/net/minecraft/server/TileEntityBanner.java
-index 7d9e0837d8..dfee7332ea 100644
+index 7d9e0837d..dfee7332e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBanner.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBanner.java
 @@ -74,7 +74,7 @@ public class TileEntityBanner extends TileEntity implements INamableTileEntity {
@@ -76,7 +76,7 @@ index 7d9e0837d8..dfee7332ea 100644
  
          if (this.hasWorld()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
-index a106a783eb..ff8a5926e1 100644
+index a106a783e..ff8a5926e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
 +++ b/src/main/java/net/minecraft/server/TileEntityBrewingStand.java
 @@ -236,7 +236,7 @@ public class TileEntityBrewingStand extends TileEntityContainer implements IWorl
@@ -89,7 +89,7 @@ index a106a783eb..ff8a5926e1 100644
  
          this.fuelLevel = nbttagcompound.getByte("Fuel");
 diff --git a/src/main/java/net/minecraft/server/TileEntityChest.java b/src/main/java/net/minecraft/server/TileEntityChest.java
-index 2e0f782f65..77c012946a 100644
+index 2e0f782f6..77c012946 100644
 --- a/src/main/java/net/minecraft/server/TileEntityChest.java
 +++ b/src/main/java/net/minecraft/server/TileEntityChest.java
 @@ -83,7 +83,7 @@ public class TileEntityChest extends TileEntityLootable { // Paper - Remove ITic
@@ -102,7 +102,7 @@ index 2e0f782f65..77c012946a 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntityDispenser.java b/src/main/java/net/minecraft/server/TileEntityDispenser.java
-index ddd2e0eb0b..21bd156e91 100644
+index ddd2e0eb0..21bd156e9 100644
 --- a/src/main/java/net/minecraft/server/TileEntityDispenser.java
 +++ b/src/main/java/net/minecraft/server/TileEntityDispenser.java
 @@ -107,7 +107,7 @@ public class TileEntityDispenser extends TileEntityLootable {
@@ -115,7 +115,7 @@ index ddd2e0eb0b..21bd156e91 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index bfbd35bbe5..538ca9bbb4 100644
+index bfbd35bbe..538ca9bbb 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -217,7 +217,7 @@ public class TileEntityFurnace extends TileEntityContainer implements IWorldInve
@@ -128,7 +128,7 @@ index bfbd35bbe5..538ca9bbb4 100644
  
          // Paper start - cook speed API
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 7303a6fdda..544dde4289 100644
+index 7303a6fdd..544dde428 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -60,7 +60,7 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -141,7 +141,7 @@ index 7303a6fdda..544dde4289 100644
  
          this.f = nbttagcompound.getInt("TransferCooldown");
 diff --git a/src/main/java/net/minecraft/server/TileEntityShulkerBox.java b/src/main/java/net/minecraft/server/TileEntityShulkerBox.java
-index fedba2e1fd..296b8dd56d 100644
+index fedba2e1f..296b8dd56 100644
 --- a/src/main/java/net/minecraft/server/TileEntityShulkerBox.java
 +++ b/src/main/java/net/minecraft/server/TileEntityShulkerBox.java
 @@ -249,7 +249,7 @@ public class TileEntityShulkerBox extends TileEntityLootable implements IWorldIn

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

@@ -1,4 +1,4 @@
-From 0e6ec29dc3477ddae58d262913c67ecd0b33502c Mon Sep 17 00:00:00 2001
+From d153419e11223422645a7e0879c6c87fda1a8a8e 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
@@ -8,7 +8,7 @@ we would reuse an existing dimension id, if some other dimension was
 unloaded before.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 69bcc941e..5fca9e4bd 100644
+index 6cea317d5..fac42f8e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -975,7 +975,7 @@ public final class CraftServer implements Server {

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

@@ -1,11 +1,11 @@
-From d03995270a2ea0676fbf224d1959984c7fa89ea4 Mon Sep 17 00:00:00 2001
+From ea16edc8618b7b13c00efceabda8bc2d2b932cfd 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityAgeable.java b/src/main/java/net/minecraft/server/EntityAgeable.java
-index 2af1ac7028..aa54e380e4 100644
+index 2af1ac702..aa54e380e 100644
 --- a/src/main/java/net/minecraft/server/EntityAgeable.java
 +++ b/src/main/java/net/minecraft/server/EntityAgeable.java
 @@ -82,6 +82,7 @@ public abstract class EntityAgeable extends EntityCreature {

Spigot-Server-Patches/0365-Async-Chunk-Loading-and-Generation.patch

@@ -1,4 +1,4 @@
-From cee4125e99e69e9d7b2344e915d39b7955a722b7 Mon Sep 17 00:00:00 2001
+From 379679e1a5e01a0aa54cb0c5c369b5fc287e600d 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
@@ -43,7 +43,7 @@ reading or writing to the chunk will be safe, so plugins still
 should not be touching chunks asynchronously!
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 359c538f32..942520088e 100644
+index 359c538f3..942520088 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -376,4 +376,57 @@ public class PaperConfig {
@@ -106,7 +106,7 @@ index 359c538f32..942520088e 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java
 new file mode 100644
-index 0000000000..8f18c28695
+index 000000000..8f18c2869
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/PriorityQueuedExecutor.java
 @@ -0,0 +1,347 @@
@@ -458,7 +458,7 @@ index 0000000000..8f18c28695
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 71d865b76a..6d3f5b6512 100644
+index 1d006bad1..a002aabf3 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -190,6 +190,7 @@ public class Chunk implements IChunkAccess {
@@ -470,7 +470,7 @@ index 71d865b76a..6d3f5b6512 100644
  
          Iterator iterator = protochunk.s().iterator();
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index 2021c0d02e..154ab09e0c 100644
+index 2021c0d02..154ab09e0 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -14,9 +14,17 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -562,7 +562,7 @@ index 2021c0d02e..154ab09e0c 100644
  
      public void putAll(Map<? extends Long, ? extends Chunk> map) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 186cfda7e4..781e068770 100644
+index 186cfda7e..781e06877 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -33,12 +33,12 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -713,7 +713,7 @@ index 186cfda7e4..781e068770 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index d938eb3749..51df075b44 100644
+index d938eb374..51df075b4 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -119,7 +119,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -740,7 +740,7 @@ index d938eb3749..51df075b44 100644
                  completion = new Supplier<NBTTagCompound>() {
                      public NBTTagCompound get() {
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 2af07ae592..9c6844d441 100644
+index 2af07ae59..9c6844d44 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -25,7 +25,17 @@ public class ChunkSection {
@@ -762,7 +762,7 @@ index 2af07ae592..9c6844d441 100644
      public IBlockData getType(int i, int j, int k) {
          return (IBlockData) this.blockIds.a(i, j, k);
 diff --git a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
-index d3898599f8..8f061f5ca3 100644
+index d3898599f..8f061f5ca 100644
 --- a/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 +++ b/src/main/java/net/minecraft/server/ChunkTaskScheduler.java
 @@ -17,13 +17,14 @@ public class ChunkTaskScheduler extends Scheduler<ChunkCoordIntPair, ChunkStatus
@@ -833,7 +833,7 @@ index d3898599f8..8f061f5ca3 100644
  
      protected ProtoChunk a(ChunkCoordIntPair chunkcoordintpair, ChunkStatus chunkstatus, Map<ChunkCoordIntPair, ProtoChunk> map) {
 diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
-index 454903a0e7..dcbcb655c5 100644
+index 454903a0e..dcbcb655c 100644
 --- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
 +++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
 @@ -3,7 +3,7 @@ package net.minecraft.server;
@@ -921,7 +921,7 @@ index 454903a0e7..dcbcb655c5 100644
  
      // Paper start - Anti-Xray - Support default methods
 diff --git a/src/main/java/net/minecraft/server/DefinedStructureManager.java b/src/main/java/net/minecraft/server/DefinedStructureManager.java
-index f5a6387f27..f456850997 100644
+index f5a6387f2..f45685099 100644
 --- a/src/main/java/net/minecraft/server/DefinedStructureManager.java
 +++ b/src/main/java/net/minecraft/server/DefinedStructureManager.java
 @@ -21,7 +21,7 @@ import org.apache.logging.log4j.Logger;
@@ -934,7 +934,7 @@ index f5a6387f27..f456850997 100644
      private final MinecraftServer d;
      private final java.nio.file.Path e;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a4c5b0b5b5..b572e535ac 100644
+index a4c5b0b5b..b572e535a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -207,7 +207,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -947,7 +947,7 @@ index a4c5b0b5b5..b572e535ac 100644
          this.aJ = Sets.newHashSet();
          this.aL = new double[] { 0.0D, 0.0D, 0.0D};
 diff --git a/src/main/java/net/minecraft/server/IChunkLoader.java b/src/main/java/net/minecraft/server/IChunkLoader.java
-index 4698ee99f8..dfb45cc4ea 100644
+index 4698ee99f..dfb45cc4e 100644
 --- a/src/main/java/net/minecraft/server/IChunkLoader.java
 +++ b/src/main/java/net/minecraft/server/IChunkLoader.java
 @@ -6,6 +6,8 @@ import javax.annotation.Nullable;
@@ -960,7 +960,7 @@ index 4698ee99f8..dfb45cc4ea 100644
      Chunk a(GeneratorAccess generatoraccess, int i, int j, Consumer<Chunk> consumer) throws IOException;
  
 diff --git a/src/main/java/net/minecraft/server/MathHelper.java b/src/main/java/net/minecraft/server/MathHelper.java
-index 8bb2593aa9..67bb289545 100644
+index 8bb2593aa..67bb28954 100644
 --- a/src/main/java/net/minecraft/server/MathHelper.java
 +++ b/src/main/java/net/minecraft/server/MathHelper.java
 @@ -7,7 +7,7 @@ import java.util.function.IntPredicate;
@@ -981,7 +981,7 @@ index 8bb2593aa9..67bb289545 100644
          f %= 360.0F;
          if (f >= 180.0F) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 68743a6b77..1dbb03a9a0 100644
+index 68743a6b7..1dbb03a9a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -499,6 +499,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -1071,7 +1071,7 @@ index 68743a6b77..1dbb03a9a0 100644
              if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit
 diff --git a/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
 new file mode 100644
-index 0000000000..851756d65e
+index 000000000..851756d65
 --- /dev/null
 +++ b/src/main/java/net/minecraft/server/PaperAsyncChunkProvider.java
 @@ -0,0 +1,658 @@
@@ -1734,7 +1734,7 @@ index 0000000000..851756d65e
 +
 +}
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index 240f590666..e4cf8548d3 100644
+index 240f59066..e4cf8548d 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -22,6 +22,52 @@ public class PlayerChunk {
@@ -1832,7 +1832,7 @@ index 240f590666..e4cf8548d3 100644
          }
      }
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 679488a3cf..b7dda8e282 100644
+index 679488a3c..b7dda8e28 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -25,10 +25,10 @@ public class PlayerChunkMap {
@@ -1892,7 +1892,7 @@ index 679488a3cf..b7dda8e282 100644
  
      private void e() {
 diff --git a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
-index de6dd4fed7..da6df06d84 100644
+index de6dd4fed..da6df06d8 100644
 --- a/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
 +++ b/src/main/java/net/minecraft/server/RegionLimitedWorldAccess.java
 @@ -34,7 +34,7 @@ public class RegionLimitedWorldAccess implements GeneratorAccess {
@@ -1905,7 +1905,7 @@ index de6dd4fed7..da6df06d84 100644
          this.m = world.getChunkProvider().getChunkGenerator().getSettings();
          this.i = world.getSeaLevel();
 diff --git a/src/main/java/net/minecraft/server/SchedulerBatch.java b/src/main/java/net/minecraft/server/SchedulerBatch.java
-index 8e909d9caf..f214a74a29 100644
+index 8e909d9ca..f214a74a2 100644
 --- a/src/main/java/net/minecraft/server/SchedulerBatch.java
 +++ b/src/main/java/net/minecraft/server/SchedulerBatch.java
 @@ -10,6 +10,7 @@ public class SchedulerBatch<K, T extends SchedulerTask<K, T>, R> {
@@ -1960,7 +1960,7 @@ index 8e909d9caf..f214a74a29 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/StructurePiece.java b/src/main/java/net/minecraft/server/StructurePiece.java
-index d9def71353..945a005e90 100644
+index d9def7135..945a005e9 100644
 --- a/src/main/java/net/minecraft/server/StructurePiece.java
 +++ b/src/main/java/net/minecraft/server/StructurePiece.java
 @@ -16,7 +16,7 @@ public abstract class StructurePiece {
@@ -1995,7 +1995,7 @@ index d9def71353..945a005e90 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/StructureStart.java b/src/main/java/net/minecraft/server/StructureStart.java
-index 284e96710a..8b08efe1f4 100644
+index 284e96710..8b08efe1f 100644
 --- a/src/main/java/net/minecraft/server/StructureStart.java
 +++ b/src/main/java/net/minecraft/server/StructureStart.java
 @@ -7,7 +7,7 @@ import java.util.Random;
@@ -2056,7 +2056,7 @@ index 284e96710a..8b08efe1f4 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index bd0271aeb3..c771e657e8 100644
+index 1e030783b..a6176c805 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -41,7 +41,7 @@ import org.bukkit.event.entity.CreatureSpawnEvent.SpawnReason;
@@ -2153,7 +2153,7 @@ index bd0271aeb3..c771e657e8 100644
          if (entity.valid) { MinecraftServer.LOGGER.error("Attempted Double World add on " + entity, new Throwable()); return true; } // Paper
          if (!CraftEventFactory.doEntityAddEventCalling(this, entity, spawnReason)) {
 diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-index 69d8a25bdf..d0eaa9e9f8 100644
+index 69d8a25bd..d0eaa9e9f 100644
 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
 +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
 @@ -10,23 +10,28 @@ import javax.annotation.Nullable;
@@ -2306,7 +2306,7 @@ index 69d8a25bdf..d0eaa9e9f8 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index a9fffa544f..19ce77c4a3 100644
+index a9fffa544..19ce77c4a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -715,7 +715,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -2319,7 +2319,7 @@ index a9fffa544f..19ce77c4a3 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index fac42f8e5c..59b1628e5a 100644
+index fac42f8e5..59b1628e5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1021,8 +1021,12 @@ public final class CraftServer implements Server {
@@ -2347,7 +2347,7 @@ index fac42f8e5c..59b1628e5a 100644
              }
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 95fe3a91bf..b5a87cfaf6 100644
+index 95fe3a91b..b5a87cfaf 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -163,6 +163,16 @@ public class CraftWorld implements World {
@@ -2385,7 +2385,7 @@ index 95fe3a91bf..b5a87cfaf6 100644
                      if (isChunkLoaded(chunkCoordX + x, chunkCoordZ + z)) {
                          unloadChunk(chunkCoordX + x, chunkCoordZ + z);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 054ebc82bd..2e0b4de83b 100644
+index 054ebc82b..2e0b4de83 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -82,6 +82,7 @@ public class CraftEventFactory {
@@ -2447,7 +2447,7 @@ index 054ebc82bd..2e0b4de83b 100644
  
          if (!event.isCancelled()) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
-index 9c917370ae..a299092a58 100644
+index 9c917370a..a299092a5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomChunkGenerator.java
 @@ -21,6 +21,7 @@ public class CustomChunkGenerator extends InternalChunkGenerator<GeneratorSettin

Spigot-Server-Patches/0366-Ignore-Dimension-NBT-field-in-Entity-data.patch

@@ -1,4 +1,4 @@
-From 2189dac4ba9b3e11215c35546733756f9a635818 Mon Sep 17 00:00:00 2001
+From 3983e746ec445141b55bd3fc7d7d2cfa9d987b13 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Sep 2018 00:08:31 -0400
 Subject: [PATCH] Ignore Dimension NBT field in Entity data
@@ -14,7 +14,7 @@ DimensionManager set to the world it is being placed into.
 This fixes corrupt entities breaking chunk saving in custom worlds.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b572e535ac..66947e3071 100644
+index b572e535a..66947e307 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1735,7 +1735,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0367-Optimize-Light-Recalculations.patch

@@ -1,4 +1,4 @@
-From ae00e18aa67201e19223f874e8d473e5d3501961 Mon Sep 17 00:00:00 2001
+From 6c92d0caeef8704d497dde4e874735349fd2d7bc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 20:46:29 -0400
 Subject: [PATCH] Optimize Light Recalculations
@@ -14,7 +14,7 @@ Also optimizes to not repeatedly look up the same chunk for
 light lookups.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 6d3f5b651..9ac594dcb 100644
+index a002aabf3..cd7b6318f 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -353,7 +353,7 @@ public class Chunk implements IChunkAccess {
@@ -36,7 +36,7 @@ index 6d3f5b651..9ac594dcb 100644
                      int i1 = iblockdata.b(this.world, blockposition);
                      int j1 = iblockdata1.b(this.world, blockposition);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index c771e657e..2819a9094 100644
+index a6176c805..5dc32a6e5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -591,8 +591,9 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

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

@@ -1,4 +1,4 @@
-From 42df6398002eb3dd1fec24201046a74e1b49a08b Mon Sep 17 00:00:00 2001
+From de96d474f37638ea81fa17ffb7ee63afaa065a4a 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
@@ -18,7 +18,7 @@ This change ensures the chunks are always loaded when entities are
 added to the world, or a valid entity moves between chunks.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 2819a9094..1b7d8bbee 100644
+index 5dc32a6e5..21cfcb50d 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1081,7 +1081,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

Spigot-Server-Patches/0369-Don-t-recheck-type-after-setting-a-block.patch

@@ -1,4 +1,4 @@
-From 00cf97b8886cef4dec433b623e49396b58cd9ce3 Mon Sep 17 00:00:00 2001
+From a111fb20c93bfda239f9d016af976be54578c4cb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 28 Sep 2018 22:27:33 -0400
 Subject: [PATCH] Don't recheck type after setting a block
@@ -16,7 +16,7 @@ be having data corruption issues anyways.
 This provides a small boost to all setType calls.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 9ac594dcbe..d9eb3e51be 100644
+index cd7b6318f..52e2b9db5 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -558,7 +558,7 @@ public class Chunk implements IChunkAccess {

Spigot-Server-Patches/0370-Fix-Sending-Chunks-to-Client.patch

@@ -1,4 +1,4 @@
-From c8ee9bd0790aa5289010a437427f87ba778417b8 Mon Sep 17 00:00:00 2001
+From f77344fd44771590c6650a2a25d6187f899a1416 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 29 Sep 2018 01:18:16 -0400
 Subject: [PATCH] Fix Sending Chunks to Client
@@ -14,7 +14,7 @@ This fix always sends chunks to the client, and simply updates
 the client anytime post processing is triggered with the new chunk data.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 52e2b9db58..e61fefa4c8 100644
+index 52e2b9db5..e61fefa4c 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1189,7 +1189,7 @@ public class Chunk implements IChunkAccess {
@@ -41,7 +41,7 @@ index 52e2b9db58..e61fefa4c8 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index e4cf8548d3..ac5d158093 100644
+index e4cf8548d..ac5d15809 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -20,7 +20,7 @@ public class PlayerChunk {

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

@@ -1,11 +1,11 @@
-From 8d712d670119838b7892b314d5bede06b4f2f36e Mon Sep 17 00:00:00 2001
+From fd6d094c2c09f273ce9522b07d762e813f877e96 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 942520088e..7f9845d926 100644
+index 942520088..7f9845d92 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -296,6 +296,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 942520088e..7f9845d926 100644
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index e732d55f9f..2c594b4378 100644
+index e732d55f9..2c594b437 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -37,7 +37,7 @@ public class HandshakeListener implements PacketHandshakingInListener {

Spigot-Server-Patches/0372-Fix-FileIOThread-concurrency-issues.patch

@@ -1,4 +1,4 @@
-From 0e7e7d56ed8a092ac1cdc0eb91b5527c9f6aff27 Mon Sep 17 00:00:00 2001
+From 82543b7c5049dcf93e1fe54803a6d48590f196ea Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Wed, 3 Oct 2018 19:04:53 +0100
 Subject: [PATCH] Fix FileIOThread concurrency issues
@@ -9,7 +9,7 @@ issues when this counter is updated from multiple threads, potentially
 causing these counters to desync due to the unsafe volatile update
 
 diff --git a/src/main/java/net/minecraft/server/FileIOThread.java b/src/main/java/net/minecraft/server/FileIOThread.java
-index 3c688f546c..570624600d 100644
+index 3c688f546..570624600 100644
 --- a/src/main/java/net/minecraft/server/FileIOThread.java
 +++ b/src/main/java/net/minecraft/server/FileIOThread.java
 @@ -10,7 +10,7 @@ public class FileIOThread implements Runnable {

Spigot-Server-Patches/0373-Don-t-update-snapshot-blockstates.patch

@@ -1,11 +1,11 @@
-From 29383c04b5ff50986479c3217d4bebbed40aec29 Mon Sep 17 00:00:00 2001
+From 47b023d5aea541dfa645790eec0d9f951e47581f Mon Sep 17 00:00:00 2001
 From: Matthew Miller <mnmiller1@me.com>
 Date: Fri, 5 Oct 2018 15:46:46 +1000
 Subject: [PATCH] Don't update snapshot blockstates
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index 082a1b6e20..2b78fff9f5 100644
+index 082a1b6e2..2b78fff9f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -131,7 +131,11 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState

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

@@ -1,4 +1,4 @@
-From ba6c0b9c1fcab6a9a75d54773971d60644ecff98 Mon Sep 17 00:00:00 2001
+From c6878cc4de9af2d4e7e7e75046be44a9d674eab0 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

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

@@ -1,11 +1,11 @@
-From ebf7172071942ea275ccd10ee833d99f8eb39676 Mon Sep 17 00:00:00 2001
+From 0106ed8b48fc1e6916924db0b4fb09146441faab 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVex.java b/src/main/java/net/minecraft/server/EntityVex.java
-index c3864b869e..589b13f4ee 100644
+index c3864b869..589b13f4e 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -127,6 +127,7 @@ public class EntityVex extends EntityMonster {
@@ -17,7 +17,7 @@ index c3864b869e..589b13f4ee 100644
          this.b = entityinsentient;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
-index 927ed9a9a8..c23b1e9601 100644
+index 927ed9a9a..c23b1e960 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVex.java
 @@ -23,6 +23,10 @@ public class CraftVex extends CraftMonster implements Vex {

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

@@ -1,4 +1,4 @@
-From 41243acd91e5d2308878b9edf74b0b81d4808035 Mon Sep 17 00:00:00 2001
+From 746dd31d5b5a6c829094277c7d84c9885e7a53b5 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/0377-Add-sun-related-API.patch

@@ -1,4 +1,4 @@
-From 692747064da797b9af3c7b7b559c72d45953b477 Mon Sep 17 00:00:00 2001
+From 51a4262ce2049f9e801b2cef281f7685d90d9e12 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
@@ -17,7 +17,7 @@ index ee5078370..3059682a4 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 1b7d8bbee..868685e0b 100644
+index 21cfcb50d..5a447f8ef 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -829,6 +829,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

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

@@ -1,11 +1,11 @@
-From c55b5010e5dddf597b10af1f3ff6f917d4bf3e3c Mon Sep 17 00:00:00 2001
+From 68fc8e5d30c62ffd151f060f2e254290acbf5def 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityDrowned.java b/src/main/java/net/minecraft/server/EntityDrowned.java
-index b861c623cc..0e2b5ee743 100644
+index b861c623c..0e2b5ee74 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -28,7 +28,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {

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

@@ -1,11 +1,11 @@
-From 35825baa82a8299fad1d27c71fec87d7b7ad8d4c Mon Sep 17 00:00:00 2001
+From e739514008a416c57fecdd4af511f4e3cd94d3e1 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!
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityVindicator.java b/src/main/java/net/minecraft/server/EntityVindicator.java
-index 96d0651e9b..4bbb4817b1 100644
+index 96d0651e9..4bbb4817b 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@@ -18,7 +18,7 @@ index 96d0651e9b..4bbb4817b1 100644
          return entity instanceof EntityLiving && ((EntityLiving) entity).df();
      };
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
-index 951d479298..5ff957ced7 100644
+index 951d47929..5ff957ced 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftVindicator.java
 @@ -25,4 +25,14 @@ public class CraftVindicator extends CraftIllager implements Vindicator {

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

@@ -1,11 +1,11 @@
-From 90d7f580dd37ba586f779e7c9d303b31323ec063 Mon Sep 17 00:00:00 2001
+From 1a1e746ec859f87d4c53d2081b1488ea9edcc2da 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index b016e0ae7c..a533e0eb5b 100644
+index b016e0ae7..a533e0eb5 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -27,51 +27,63 @@ public class EntityTurtle extends EntityAnimal {
@@ -103,7 +103,7 @@ index b016e0ae7c..a533e0eb5b 100644
  
          public void c() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
-index 123a2c75ca..8edcf7af65 100644
+index 123a2c75c..8edcf7af6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftTurtle.java
 @@ -1,6 +1,8 @@

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

@@ -1,11 +1,11 @@
-From 7222856c42e6fbd8dcff0e0781d963ee1c8e0f34 Mon Sep 17 00:00:00 2001
+From c2829c83506f017fd6cd1f60c3a8c8a5b010f2e7 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 d8897e59fd..575281991c 100644
+index e04204055..30985cdfc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -237,6 +237,28 @@ public class PaperWorldConfig {
@@ -38,7 +38,7 @@ index d8897e59fd..575281991c 100644
      public boolean firePhysicsEventForRedstone = false;
      private void firePhysicsEventForRedstone() {
 diff --git a/src/main/java/net/minecraft/server/EntityLightning.java b/src/main/java/net/minecraft/server/EntityLightning.java
-index 7781babf51..50f6200095 100644
+index 7781babf5..50f620009 100644
 --- a/src/main/java/net/minecraft/server/EntityLightning.java
 +++ b/src/main/java/net/minecraft/server/EntityLightning.java
 @@ -60,6 +60,17 @@ public class EntityLightning extends EntityWeather {
@@ -69,7 +69,7 @@ index 7781babf51..50f6200095 100644
  
          --this.lifeTicks;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 19ce77c4a3..8e23d060d0 100644
+index 19ce77c4a..8e23d060d 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1065,7 +1065,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {

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

@@ -1,4 +1,4 @@
-From 6217bf933e43f4df501148c5fde5224fe5c34881 Mon Sep 17 00:00:00 2001
+From 93753cf16547eb0b8d4d091c7338758fbaaba0e3 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Implement getters and setters for EntityItem owner and
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index 6752d0b8cc..03fee65e45 100644
+index 6752d0b8c..03fee65e4 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
 @@ -411,20 +411,22 @@ public class EntityItem extends Entity {
@@ -37,7 +37,7 @@ index 6752d0b8cc..03fee65e45 100644
          this.f = uuid;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
-index 6036592f76..4128ba4c06 100644
+index 6036592f7..4128ba4c0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftItem.java
 @@ -9,6 +9,11 @@ import org.bukkit.inventory.ItemStack;

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

@@ -1,4 +1,4 @@
-From 2d1f359999cfd61731eabbdb81e857f0706a46ef Mon Sep 17 00:00:00 2001
+From 55a070d8173e719c8b55d416b73732e82f56419b 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
@@ -11,7 +11,7 @@ If the projectile fails to find the shooter in the current world, check
 other worlds.
 
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 62b5b6ecea..60ab1c7514 100644
+index 62b5b6ece..60ab1c751 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -250,11 +250,21 @@ public abstract class EntityProjectile extends Entity implements IProjectile {

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

@@ -1,4 +1,4 @@
-From 7be052b2cfea55de1ca7e46b37078ea4c7e62652 Mon Sep 17 00:00:00 2001
+From b4e93d51a30d7dcacf71488032d9c89f0efe82a4 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

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

@@ -1,4 +1,4 @@
-From 2bae06dc050935e5b7145e39eda4220b850b901b Mon Sep 17 00:00:00 2001
+From b026f4cbc07ecf81058a8212fc7edf3ef93968fa 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
@@ -14,7 +14,7 @@ forwarding, and is integrated into the Minecraft login process by using the 1.13
 login plugin message packet.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 7f9845d926..52ce8f89e5 100644
+index 7f9845d92..52ce8f89e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -8,6 +8,7 @@ import java.io.IOException;
@@ -55,7 +55,7 @@ index 7f9845d926..52ce8f89e5 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 new file mode 100644
-index 0000000000..fdd8708f97
+index 000000000..fdd8708f9
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/proxy/VelocityProxy.java
 @@ -0,0 +1,67 @@
@@ -127,7 +127,7 @@ index 0000000000..fdd8708f97
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index c5801122dd..ca76f2a380 100644
+index c5801122d..ca76f2a38 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -42,6 +42,7 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -203,7 +203,7 @@ index c5801122dd..ca76f2a380 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 4c1110479c..c536979140 100644
+index 4c1110479..c53697914 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -46,7 +46,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -216,7 +216,7 @@ index 4c1110479c..c536979140 100644
      public java.util.UUID spoofedUUID;
      public com.mojang.authlib.properties.Property[] spoofedProfile;
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index b95836d443..621aad1503 100644
+index b95836d44..621aad150 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -140,6 +140,7 @@ public class PacketDataSerializer extends ByteBuf {
@@ -244,7 +244,7 @@ index b95836d443..621aad1503 100644
          int j = this.g();
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
-index bdac03da43..430445cc6d 100644
+index bdac03da4..430445cc6 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginInCustomPayload.java
 @@ -4,8 +4,8 @@ import java.io.IOException;
@@ -259,7 +259,7 @@ index bdac03da43..430445cc6d 100644
      public PacketLoginInCustomPayload() {}
  
 diff --git a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
-index 345843a7f2..23c96f44b3 100644
+index 345843a7f..23c96f44b 100644
 --- a/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 +++ b/src/main/java/net/minecraft/server/PacketLoginOutCustomPayload.java
 @@ -10,6 +10,14 @@ public class PacketLoginOutCustomPayload implements Packet<PacketLoginOutListene

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

@@ -1,11 +1,11 @@
-From 0e18567bbaac7e3b7bee3434dd287060bf827153 Mon Sep 17 00:00:00 2001
+From 6a93cf23a2c050edf22ed799f82ff9958edee6f3 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityWitch.java b/src/main/java/net/minecraft/server/EntityWitch.java
-index feedfc9d9c..955e0e19b9 100644
+index feedfc9d9..955e0e19b 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -1,5 +1,11 @@
@@ -94,7 +94,7 @@ index feedfc9d9c..955e0e19b9 100644
          f = super.applyMagicModifier(damagesource, f);
          if (damagesource.getEntity() == this) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
-index f25998eb6d..ac465bda2e 100644
+index f25998eb6..ac465bda2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftWitch.java
 @@ -6,6 +6,13 @@ import org.bukkit.craftbukkit.CraftServer;

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

@@ -1,11 +1,11 @@
-From 12903acd93062bd5c9b94e74d53a4c5c23035b10 Mon Sep 17 00:00:00 2001
+From 8574c345ade629d2b25b6369d12bba50d4ab14d0 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
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
-index 99191f09f0..4d692b7e05 100644
+index 99191f09f..4d692b7e0 100644
 --- a/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
 +++ b/src/main/java/net/minecraft/server/WorldProviderTheEnd.java
 @@ -27,7 +27,7 @@ public class WorldProviderTheEnd extends WorldProvider {

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

@@ -1,4 +1,4 @@
-From 716c9841e7095377b98c9f6d5116b31785b6c653 Mon Sep 17 00:00:00 2001
+From 18bff8057f2af7ec53c12333d0c9ae8d51fd8c41 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 30985cdfc..2add466ac 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 74975a138..853fc3149 100644
+index 7e285c629..0ee9e7095 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -341,6 +341,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

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

@@ -1,4 +1,4 @@
-From 9a0095b9042bcc51e91ae8a341ed3c7b12649bde Mon Sep 17 00:00:00 2001
+From dbe96c4f6ce97088dfc3b17ce7e2d8273d60bf5b 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

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

@@ -1,4 +1,4 @@
-From cca5d501331cc26b1cc60d69eb4ba2b5a3963d63 Mon Sep 17 00:00:00 2001
+From e00232050f4b33f08e4b0a067bf929d46f1deaae 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 458d1561d0..c2bcbbbab9 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 {

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

@@ -1,4 +1,4 @@
-From 930ec4dae01f4b88cd6bdf84585d229d1b215959 Mon Sep 17 00:00:00 2001
+From ca16808e99c365690366f3af724388bd936c7a7d 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

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

@@ -1,11 +1,11 @@
-From e7e7be9caf3f4b51a3053cce17d929f9e4235b16 Mon Sep 17 00:00:00 2001
+From 8b4b4b534f5f133ac6395cefc4a55816618c51b4 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
 
 
 diff --git a/src/main/java/net/minecraft/server/DataConverterRegistry.java b/src/main/java/net/minecraft/server/DataConverterRegistry.java
-index ee40bccf63..db9af361d6 100644
+index ee40bccf6..db9af361d 100644
 --- a/src/main/java/net/minecraft/server/DataConverterRegistry.java
 +++ b/src/main/java/net/minecraft/server/DataConverterRegistry.java
 @@ -21,7 +21,7 @@ public class DataConverterRegistry {

Spigot-Server-Patches/0393-Use-EntityTypes-for-living-entities.patch

@@ -1,11 +1,11 @@
-From 6c1086be992ef85a818bcc95d63fb3e0e460e6ff Mon Sep 17 00:00:00 2001
+From 8ef50e53eb21e4734663edd60681e84771c9b1a7 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
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockMonsterEggs.java b/src/main/java/net/minecraft/server/BlockMonsterEggs.java
-index 5a0cc6d058..d385f647e7 100644
+index 5a0cc6d05..d385f647e 100644
 --- a/src/main/java/net/minecraft/server/BlockMonsterEggs.java
 +++ b/src/main/java/net/minecraft/server/BlockMonsterEggs.java
 @@ -35,7 +35,7 @@ public class BlockMonsterEggs extends Block {
@@ -18,7 +18,7 @@ index 5a0cc6d058..d385f647e7 100644
              entitysilverfish.setPositionRotation((double) blockposition.getX() + 0.5D, (double) blockposition.getY(), (double) blockposition.getZ() + 0.5D, 0.0F, 0.0F);
              world.addEntity(entitysilverfish, SpawnReason.SILVERFISH_BLOCK); // CraftBukkit - add SpawnReason
 diff --git a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
-index 75622fbdf8..2653699840 100644
+index 75622fbdf..265369984 100644
 --- a/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
 +++ b/src/main/java/net/minecraft/server/BlockPumpkinCarved.java
 @@ -52,7 +52,7 @@ public class BlockPumpkinCarved extends BlockFacingHorizontal {
@@ -40,7 +40,7 @@ index 75622fbdf8..2653699840 100644
                  entityirongolem.setPlayerCreated(true);
                  entityirongolem.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.05D, (double) blockposition2.getZ() + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/BlockTurtleEgg.java b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
-index 0f0872c1e0..1c1bf85a0e 100644
+index 0f0872c1e..1c1bf85a0 100644
 --- a/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 +++ b/src/main/java/net/minecraft/server/BlockTurtleEgg.java
 @@ -94,7 +94,7 @@ public class BlockTurtleEgg extends Block {
@@ -53,7 +53,7 @@ index 0f0872c1e0..1c1bf85a0e 100644
                          entityturtle.setAgeRaw(-24000);
                          entityturtle.g(blockposition);
 diff --git a/src/main/java/net/minecraft/server/BlockWitherSkull.java b/src/main/java/net/minecraft/server/BlockWitherSkull.java
-index 93bf32dc1a..e6063bb462 100644
+index 93bf32dc1..e6063bb46 100644
 --- a/src/main/java/net/minecraft/server/BlockWitherSkull.java
 +++ b/src/main/java/net/minecraft/server/BlockWitherSkull.java
 @@ -52,7 +52,7 @@ public class BlockWitherSkull extends BlockSkull {
@@ -66,7 +66,7 @@ index 93bf32dc1a..e6063bb462 100644
  
                  entitywither.setPositionRotation((double) blockposition2.getX() + 0.5D, (double) blockposition2.getY() + 0.55D, (double) blockposition2.getZ() + 0.5D, shapedetector_shapedetectorcollection.getFacing().k() == EnumDirection.EnumAxis.X ? 0.0F : 90.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/EnderDragonBattle.java b/src/main/java/net/minecraft/server/EnderDragonBattle.java
-index aad7ce93f6..09eabf1235 100644
+index aad7ce93f..09eabf123 100644
 --- a/src/main/java/net/minecraft/server/EnderDragonBattle.java
 +++ b/src/main/java/net/minecraft/server/EnderDragonBattle.java
 @@ -412,7 +412,7 @@ public class EnderDragonBattle {
@@ -79,7 +79,7 @@ index aad7ce93f6..09eabf1235 100644
          entityenderdragon.getDragonControllerManager().setControllerPhase(DragonControllerPhase.HOLDING_PATTERN);
          entityenderdragon.setPositionRotation(0.0D, 128.0D, 0.0D, this.d.random.nextFloat() * 360.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/EntityChicken.java b/src/main/java/net/minecraft/server/EntityChicken.java
-index ee159e0a81..070a9e7b14 100644
+index ee159e0a8..070a9e7b1 100644
 --- a/src/main/java/net/minecraft/server/EntityChicken.java
 +++ b/src/main/java/net/minecraft/server/EntityChicken.java
 @@ -96,7 +96,7 @@ public class EntityChicken extends EntityAnimal {
@@ -92,7 +92,7 @@ index ee159e0a81..070a9e7b14 100644
  
      public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index 5874d2993c..cc53e915d7 100644
+index 5874d2993..cc53e915d 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -88,7 +88,7 @@ public class EntityCow extends EntityAnimal {
@@ -105,7 +105,7 @@ index 5874d2993c..cc53e915d7 100644
  
      public float getHeadHeight() {
 diff --git a/src/main/java/net/minecraft/server/EntityEnderPearl.java b/src/main/java/net/minecraft/server/EntityEnderPearl.java
-index 961afa5c42..a372f6508f 100644
+index 961afa5c4..a372f6508 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderPearl.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderPearl.java
 @@ -74,7 +74,7 @@ public class EntityEnderPearl extends EntityProjectile {
@@ -118,7 +118,7 @@ index 961afa5c42..a372f6508f 100644
                              entityendermite.setPlayerSpawned(true);
                              entityendermite.setPositionRotation(entityliving.locX, entityliving.locY, entityliving.locZ, entityliving.yaw, entityliving.pitch);
 diff --git a/src/main/java/net/minecraft/server/EntityEvoker.java b/src/main/java/net/minecraft/server/EntityEvoker.java
-index 963b6fbb9c..fc20bbe272 100644
+index 963b6fbb9..fc20bbe27 100644
 --- a/src/main/java/net/minecraft/server/EntityEvoker.java
 +++ b/src/main/java/net/minecraft/server/EntityEvoker.java
 @@ -188,8 +188,7 @@ public class EntityEvoker extends EntityIllagerWizard {
@@ -132,7 +132,7 @@ index 963b6fbb9c..fc20bbe272 100644
                  entityvex.prepare(EntityEvoker.this.world.getDamageScaler(blockposition), (GroupDataEntity) null, (NBTTagCompound) null);
                  entityvex.a((EntityInsentient) EntityEvoker.this);
 diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
-index 4e8a97c557..1b9425f3e6 100644
+index 4e8a97c55..1b9425f3e 100644
 --- a/src/main/java/net/minecraft/server/EntityHorse.java
 +++ b/src/main/java/net/minecraft/server/EntityHorse.java
 @@ -208,11 +208,11 @@ public class EntityHorse extends EntityHorseAbstract {
@@ -150,7 +150,7 @@ index 4e8a97c557..1b9425f3e6 100644
              int j;
  
 diff --git a/src/main/java/net/minecraft/server/EntityHorseDonkey.java b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
-index 72eed22eb9..65c40e72bf 100644
+index 72eed22eb..65c40e72b 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseDonkey.java
 @@ -33,7 +33,7 @@ public class EntityHorseDonkey extends EntityHorseChestedAbstract {
@@ -163,7 +163,7 @@ index 72eed22eb9..65c40e72bf 100644
          this.a(entityageable, (EntityHorseAbstract) object);
          return (EntityAgeable) object;
 diff --git a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
-index eae2b26655..0a092acdfe 100644
+index eae2b2665..0a092acdf 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseSkeleton.java
 @@ -134,7 +134,7 @@ public class EntityHorseSkeleton extends EntityHorseAbstract {
@@ -176,7 +176,7 @@ index eae2b26655..0a092acdfe 100644
  
      public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
 diff --git a/src/main/java/net/minecraft/server/EntityHorseZombie.java b/src/main/java/net/minecraft/server/EntityHorseZombie.java
-index c23bc72fc8..a1873f557c 100644
+index c23bc72fc..a1873f557 100644
 --- a/src/main/java/net/minecraft/server/EntityHorseZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityHorseZombie.java
 @@ -41,7 +41,7 @@ public class EntityHorseZombie extends EntityHorseAbstract {
@@ -189,7 +189,7 @@ index c23bc72fc8..a1873f557c 100644
  
      public boolean a(EntityHuman entityhuman, EnumHand enumhand) {
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 5e19768710..82a32c61ed 100644
+index 5e1976871..82a32c61e 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -285,7 +285,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -202,7 +202,7 @@ index 5e19768710..82a32c61ed 100644
          this.a(entityageable, (EntityHorseAbstract) entityllama);
          EntityLlama entityllama1 = (EntityLlama) entityageable;
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index dde9f1e61e..638dbe978d 100644
+index dde9f1e61..638dbe978 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -40,7 +40,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -224,7 +224,7 @@ index dde9f1e61e..638dbe978d 100644
  
      @Nullable
 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index ba074c10c6..13c84bda84 100644
+index ba074c10c..13c84bda8 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
 @@ -154,7 +154,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@@ -246,7 +246,7 @@ index ba074c10c6..13c84bda84 100644
                  entityocelot.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
                  entityocelot.setAgeRaw(-24000);
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 9dc2d8be27..d1689dc33a 100644
+index 9dc2d8be2..d1689dc33 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -153,7 +153,7 @@ public class EntityPig extends EntityAnimal {
@@ -268,7 +268,7 @@ index 9dc2d8be27..d1689dc33a 100644
  
      public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityPolarBear.java b/src/main/java/net/minecraft/server/EntityPolarBear.java
-index a02020d5fc..dbb534c9cd 100644
+index a02020d5f..dbb534c9c 100644
 --- a/src/main/java/net/minecraft/server/EntityPolarBear.java
 +++ b/src/main/java/net/minecraft/server/EntityPolarBear.java
 @@ -18,7 +18,7 @@ public class EntityPolarBear extends EntityAnimal {
@@ -281,7 +281,7 @@ index a02020d5fc..dbb534c9cd 100644
  
      public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityRabbit.java b/src/main/java/net/minecraft/server/EntityRabbit.java
-index e545b1c9b3..d6bac06a7a 100644
+index e545b1c9b..d6bac06a7 100644
 --- a/src/main/java/net/minecraft/server/EntityRabbit.java
 +++ b/src/main/java/net/minecraft/server/EntityRabbit.java
 @@ -251,7 +251,7 @@ public class EntityRabbit extends EntityAnimal {
@@ -294,7 +294,7 @@ index e545b1c9b3..d6bac06a7a 100644
  
          if (this.random.nextInt(20) != 0) {
 diff --git a/src/main/java/net/minecraft/server/EntitySheep.java b/src/main/java/net/minecraft/server/EntitySheep.java
-index f7a25c1483..c35d1eef43 100644
+index f7a25c148..c35d1eef4 100644
 --- a/src/main/java/net/minecraft/server/EntitySheep.java
 +++ b/src/main/java/net/minecraft/server/EntitySheep.java
 @@ -247,7 +247,7 @@ public class EntitySheep extends EntityAnimal {
@@ -307,7 +307,7 @@ index f7a25c1483..c35d1eef43 100644
          entitysheep1.setColor(this.a((EntityAnimal) this, (EntityAnimal) entitysheep));
          return entitysheep1;
 diff --git a/src/main/java/net/minecraft/server/EntitySpider.java b/src/main/java/net/minecraft/server/EntitySpider.java
-index a42b8d554f..9ef1c9baf2 100644
+index a42b8d554..9ef1c9baf 100644
 --- a/src/main/java/net/minecraft/server/EntitySpider.java
 +++ b/src/main/java/net/minecraft/server/EntitySpider.java
 @@ -111,7 +111,7 @@ public class EntitySpider extends EntityMonster {
@@ -320,7 +320,7 @@ index a42b8d554f..9ef1c9baf2 100644
              entityskeleton.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
              entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/EntityTurtle.java b/src/main/java/net/minecraft/server/EntityTurtle.java
-index a533e0eb5b..270b950820 100644
+index a533e0eb5..270b95082 100644
 --- a/src/main/java/net/minecraft/server/EntityTurtle.java
 +++ b/src/main/java/net/minecraft/server/EntityTurtle.java
 @@ -218,7 +218,7 @@ public class EntityTurtle extends EntityAnimal {
@@ -333,7 +333,7 @@ index a533e0eb5b..270b950820 100644
  
      public boolean f(ItemStack itemstack) {
 diff --git a/src/main/java/net/minecraft/server/EntityTypes.java b/src/main/java/net/minecraft/server/EntityTypes.java
-index d74bfa1201..24ca351194 100644
+index d74bfa120..24ca35119 100644
 --- a/src/main/java/net/minecraft/server/EntityTypes.java
 +++ b/src/main/java/net/minecraft/server/EntityTypes.java
 @@ -269,6 +269,7 @@ public class EntityTypes<T extends Entity> {
@@ -345,7 +345,7 @@ index d74bfa1201..24ca351194 100644
      public T a(World world) {
          return this.aT.apply(world); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index f01e776fe5..40b3ffd8ca 100644
+index f01e776fe..40b3ffd8c 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -592,7 +592,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -367,7 +367,7 @@ index f01e776fe5..40b3ffd8ca 100644
              // Paper start
              if (org.bukkit.craftbukkit.event.CraftEventFactory.callEntityZapEvent(this, entitylightning, entitywitch).isCancelled()) {
 diff --git a/src/main/java/net/minecraft/server/EntityWolf.java b/src/main/java/net/minecraft/server/EntityWolf.java
-index 4f1696d018..46d8e0a1f4 100644
+index 4f1696d01..46d8e0a1f 100644
 --- a/src/main/java/net/minecraft/server/EntityWolf.java
 +++ b/src/main/java/net/minecraft/server/EntityWolf.java
 @@ -342,7 +342,7 @@ public class EntityWolf extends EntityTameableAnimal {
@@ -380,7 +380,7 @@ index 4f1696d018..46d8e0a1f4 100644
  
          if (uuid != null) {
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 7998b80c17..81cc0c3b33 100644
+index 7998b80c1..81cc0c3b3 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -208,7 +208,7 @@ public class EntityZombie extends EntityMonster {
@@ -420,7 +420,7 @@ index 7998b80c17..81cc0c3b33 100644
                      entitychicken1.setPositionRotation(this.locX, this.locY, this.locZ, this.yaw, 0.0F);
                      entitychicken1.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/EntityZombieHusk.java b/src/main/java/net/minecraft/server/EntityZombieHusk.java
-index 85d402965b..0cca7b6d51 100644
+index 85d402965..0cca7b6d5 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieHusk.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieHusk.java
 @@ -54,7 +54,7 @@ public class EntityZombieHusk extends EntityZombie {
@@ -433,7 +433,7 @@ index 85d402965b..0cca7b6d51 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index 86e5fbcdab..fb96743af2 100644
+index 86e5fbcda..fb96743af 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -118,7 +118,7 @@ public class EntityZombieVillager extends EntityZombie {
@@ -446,7 +446,7 @@ index 86e5fbcdab..fb96743af2 100644
          entityvillager.u(this);
          entityvillager.setProfession(this.getProfession());
 diff --git a/src/main/java/net/minecraft/server/ItemArmorStand.java b/src/main/java/net/minecraft/server/ItemArmorStand.java
-index 576b3c5650..4dd0e39ec3 100644
+index 576b3c565..4dd0e39ec 100644
 --- a/src/main/java/net/minecraft/server/ItemArmorStand.java
 +++ b/src/main/java/net/minecraft/server/ItemArmorStand.java
 @@ -34,7 +34,7 @@ public class ItemArmorStand extends Item {
@@ -459,7 +459,7 @@ index 576b3c5650..4dd0e39ec3 100644
  
                          entityarmorstand.setPositionRotation(d0 + 0.5D, d1, d2 + 0.5D, f, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
-index 5ddf66eef5..bb7e072ee1 100644
+index 5ddf66eef..bb7e072ee 100644
 --- a/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 +++ b/src/main/java/net/minecraft/server/MobSpawnerPhantom.java
 @@ -59,7 +59,7 @@ public class MobSpawnerPhantom {
@@ -472,7 +472,7 @@ index 5ddf66eef5..bb7e072ee1 100644
                                                  entityphantom.setPositionRotation(blockposition1, 0.0F, 0.0F);
                                                  groupdataentity = entityphantom.prepare(difficultydamagescaler, groupdataentity, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
-index d4fdcbdfd6..887e4461f3 100644
+index d4fdcbdfd..887e4461f 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalHorseTrap.java
 @@ -36,7 +36,7 @@ public class PathfinderGoalHorseTrap extends PathfinderGoal {
@@ -494,7 +494,7 @@ index d4fdcbdfd6..887e4461f3 100644
          entityskeleton.prepare(difficultydamagescaler, (GroupDataEntity) null, (NBTTagCompound) null);
          entityskeleton.setPosition(entityhorseabstract.locX, entityhorseabstract.locY, entityhorseabstract.locZ);
 diff --git a/src/main/java/net/minecraft/server/VillageSiege.java b/src/main/java/net/minecraft/server/VillageSiege.java
-index 0ac1fb53a4..509d62f6b6 100644
+index 0ac1fb53a..509d62f6b 100644
 --- a/src/main/java/net/minecraft/server/VillageSiege.java
 +++ b/src/main/java/net/minecraft/server/VillageSiege.java
 @@ -134,7 +134,7 @@ public class VillageSiege {
@@ -507,7 +507,7 @@ index 0ac1fb53a4..509d62f6b6 100644
              } catch (Exception exception) {
                  exception.printStackTrace();
 diff --git a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
-index 94b21693e2..0a223cfe5a 100644
+index 94b21693e..0a223cfe5 100644
 --- a/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenEndCityPieces.java
 @@ -270,7 +270,7 @@ public class WorldGenEndCityPieces {
@@ -520,7 +520,7 @@ index 94b21693e2..0a223cfe5a 100644
                  entityshulker.setPosition((double) blockposition.getX() + 0.5D, (double) blockposition.getY() + 0.5D, (double) blockposition.getZ() + 0.5D);
                  entityshulker.g(blockposition);
 diff --git a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
-index 2def56b067..abeb4aa025 100644
+index 2def56b06..abeb4aa02 100644
 --- a/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenFeatureOceanRuinPieces.java
 @@ -154,8 +154,7 @@ public class WorldGenFeatureOceanRuinPieces {
@@ -534,7 +534,7 @@ index 2def56b067..abeb4aa025 100644
                  entitydrowned.setPositionRotation(blockposition, 0.0F, 0.0F);
                  entitydrowned.prepare(generatoraccess.getDamageScaler(blockposition), (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
-index 0e7aed09d1..493a86e1bf 100644
+index 0e7aed09d..493a86e1b 100644
 --- a/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenMonumentPieces.java
 @@ -1800,7 +1800,7 @@ public class WorldGenMonumentPieces {
@@ -556,7 +556,7 @@ index 0e7aed09d1..493a86e1bf 100644
                  entityguardianelder.heal(entityguardianelder.getMaxHealth());
                  entityguardianelder.setPositionRotation((double) l + 0.5D, (double) i1, (double) j1 + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
-index 5fa2987d2a..967e33b3d7 100644
+index 5fa2987d2..967e33b3d 100644
 --- a/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenVillagePieces.java
 @@ -1640,7 +1640,7 @@ public class WorldGenVillagePieces {
@@ -578,7 +578,7 @@ index 5fa2987d2a..967e33b3d7 100644
                          entityvillager.setPositionRotation((double) j1 + 0.5D, (double) k1, (double) l1 + 0.5D, 0.0F, 0.0F);
                          entityvillager.setProfession(this.c(i1, generatoraccess.m().nextInt(6)));
 diff --git a/src/main/java/net/minecraft/server/WorldGenWitchHut.java b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
-index efb0379ce3..3d8193c477 100644
+index efb0379ce..3d8193c47 100644
 --- a/src/main/java/net/minecraft/server/WorldGenWitchHut.java
 +++ b/src/main/java/net/minecraft/server/WorldGenWitchHut.java
 @@ -81,7 +81,7 @@ public class WorldGenWitchHut extends WorldGenScatteredPiece {
@@ -591,7 +591,7 @@ index efb0379ce3..3d8193c477 100644
                      entitywitch.di();
                      entitywitch.setPositionRotation((double) j + 0.5D, (double) i, (double) k + 0.5D, 0.0F, 0.0F);
 diff --git a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
-index 11010d8e12..4eb746ebb0 100644
+index 11010d8e1..4eb746ebb 100644
 --- a/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
 +++ b/src/main/java/net/minecraft/server/WorldGenWoodlandMansionPieces.java
 @@ -23,14 +23,14 @@ public class WorldGenWoodlandMansionPieces {
@@ -639,7 +639,7 @@ index 11010d8e12..4eb746ebb0 100644
                  entityvindicator.setPositionRotation(blockposition, 0.0F, 0.0F);
                  entityvindicator.prepare(generatoraccess.getDamageScaler(new BlockPosition(entityvindicator)), (GroupDataEntity) null, (NBTTagCompound) null);
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 8e23d060d0..6671d71802 100644
+index 8e23d060d..6671d7180 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -494,7 +494,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -652,7 +652,7 @@ index 8e23d060d0..6671d71802 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 e33135adaa..6ed7c93550 100644
+index e33135ada..6ed7c9355 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1181,153 +1181,153 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0394-MC-136865-Use-valid-item-for-enchantment-checks-on-b.patch

@@ -1,4 +1,4 @@
-From f8492ff97954e2f4b15a9c3df7658245044f1ede Mon Sep 17 00:00:00 2001
+From efa04bb617b4d92081d8c2d9642d11458647e178 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
@@ -13,7 +13,7 @@ keep the clone of the item used to a non empty value so it represents
 the item used.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerInteractManager.java b/src/main/java/net/minecraft/server/PlayerInteractManager.java
-index 22378b6bc8..5e595b62e5 100644
+index 22378b6bc..5e595b62e 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -380,10 +380,11 @@ public class PlayerInteractManager {

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

@@ -1,4 +1,4 @@
-From 5bbabe146bc2b65fcc2abc22861b7c75e30ce2c0 Mon Sep 17 00:00:00 2001
+From d24eb7446c41e7ece2a912698e2e1c1ef0621d79 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 1dbb03a9a0..4e648ee735 100644
+index 1dbb03a9a..4e648ee73 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1033,12 +1033,24 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati

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

@@ -1,4 +1,4 @@
-From 2e6ee11e2dd1eba9daab627edaae558cf375956d Mon Sep 17 00:00:00 2001
+From 1bfc074d3d5ff315ef835d271dd27b223a18967f 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
@@ -17,7 +17,7 @@ will always work as intended in the past, those without will create implementati
 based inventories.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
-index 23389743d5..d25928e094 100644
+index 23389743d..d25928e09 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/util/CraftInventoryCreator.java
 @@ -31,10 +31,20 @@ public final class CraftInventoryCreator {

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

@@ -1,4 +1,4 @@
-From de7bc131c980b3a3971cfc2fb04268f95ae24a7a Mon Sep 17 00:00:00 2001
+From b5e3542e353018c1dfc49d14f26cc6cf98638882 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 a8a64d054c..41e8a4b507 100644
+index a8a64d054..41e8a4b50 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -37,9 +37,9 @@ public abstract class EntityMinecartAbstract extends Entity implements INamableT

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

@@ -1,4 +1,4 @@
-From c8b481c1cbefd8df47f43036630d918772939dc7 Mon Sep 17 00:00:00 2001
+From 716d9cfd127b8f01a427c2e7bece28fdb4f6434b 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 cbc8e8d139..cda6f2b732 100644
+index cbc8e8d13..cda6f2b73 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 {
@@ -28,7 +28,7 @@ index cbc8e8d139..cda6f2b732 100644
  }
 +
 diff --git a/src/main/java/net/minecraft/server/IBlockData.java b/src/main/java/net/minecraft/server/IBlockData.java
-index 08a5acb0ac..aa3547690a 100644
+index 08a5acb0a..aa3547690 100644
 --- a/src/main/java/net/minecraft/server/IBlockData.java
 +++ b/src/main/java/net/minecraft/server/IBlockData.java
 @@ -236,6 +236,7 @@ public interface IBlockData extends IBlockDataHolder<IBlockData> {

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

@@ -1,11 +1,11 @@
-From 47f595ca18d5fb0a77009453183880356daebedf Mon Sep 17 00:00:00 2001
+From 09c0177d5e3e06e433091505e5246915926b92c5 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 853fc3149..93d2766d5 100644
+index 0ee9e7095..1d6f70a72 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 {

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

@@ -1,4 +1,4 @@
-From 356ac9a81cbeaeba16995f4dcd7db259c821e02f Mon Sep 17 00:00:00 2001
+From da8c71b49ad62be5a61d3bcfdd585d790dcff2eb 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
@@ -1122,7 +1122,7 @@ index 48c79568f..a09aa6944 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 868685e0b..9e19984a2 100644
+index 5a447f8ef..9338618f8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -648,6 +648,7 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

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

@@ -1,4 +1,4 @@
-From b3f1693c2f1fb4764ed75a1c33f9dbe1f8e980d2 Mon Sep 17 00:00:00 2001
+From 53d0acc26fc4de7b3c54f6d6afd00c169b14d201 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/0402-Book-Size-Limits.patch

@@ -1,4 +1,4 @@
-From 40c15924cd11892e91ca103a60a577beb3e53437 Mon Sep 17 00:00:00 2001
+From 0677ab1e9fd939ed9551aea120cfa0152952a3ad 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 52ce8f89e..07f0b4529 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 93d2766d5..4987acbf5 100644
+index 1d6f70a72..391ecc9db 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -12,6 +12,8 @@ import java.util.Collections;

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

@@ -1,11 +1,11 @@
-From 37565a2797d88b37577049d2ba7abaa802476d9a Mon Sep 17 00:00:00 2001
+From 3c9cf589e4a9df0cc5c1f79c48b268730a07d39e 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 07f0b45295..a7673dd49d 100644
+index 07f0b4529..a7673dd49 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -21,6 +21,7 @@ import java.util.regex.Pattern;
@@ -29,7 +29,7 @@ index 07f0b45295..a7673dd49d 100644
      private static void savePlayerData() {
          savePlayerData = getBoolean("settings.save-player-data", savePlayerData);
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 59b1628e5a..8d26f8d525 100644
+index 59b1628e5..8d26f8d52 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2187,6 +2187,10 @@ public final class CraftServer implements Server {

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

@@ -1,11 +1,11 @@
-From b45a2758308482ba290664aabc22d75c76463826 Mon Sep 17 00:00:00 2001
+From f696805bc0e5fdf6a470b3e55ae17ec7915db1f9 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 81cc0c3b33..24bc3e0f08 100644
+index 81cc0c3b3..24bc3e0f0 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -21,8 +21,8 @@ public class EntityZombie extends EntityMonster {
@@ -105,7 +105,7 @@ index 81cc0c3b33..24bc3e0f08 100644
  
      public void b(EntityLiving entityliving) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
-index e93ecb076b..c516d34759 100644
+index e93ecb076..c516d3475 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftZombie.java
 @@ -77,4 +77,34 @@ public class CraftZombie extends CraftMonster implements Zombie {

Spigot-Server-Patches/0405-limit-the-range-at-which-we-ll-consider-an-attackabl.patch

@@ -1,4 +1,4 @@
-From 34cffb3d7e0f3639f280c11dbc952f3677d253a7 Mon Sep 17 00:00:00 2001
+From be7214eca617bb458824f6fc67ef1e264bd5a024 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 9e19984a2..c412cceff 100644
+index 9338618f8..0c9fad1c8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2729,8 +2729,13 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

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

@@ -1,4 +1,4 @@
-From 096328c61aa430d20c20f4834554c9cf8d4986b6 Mon Sep 17 00:00:00 2001
+From 03ee4bd78ad91dfa2bdf87aac1d08530b8da8857 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 c412cceff..7e2d8d4c5 100644
+index 0c9fad1c8..d21e6c5cb 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -860,7 +860,8 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

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

@@ -1,4 +1,4 @@
-From 6765831d65aae314abbf094443dd288bc186c030 Mon Sep 17 00:00:00 2001
+From 5157a6d0c9f5e3c927840ef757e326c9eb7f1d6f 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
@@ -7,7 +7,7 @@ If a players inventory is too big to send in a single packet,
 split the inventory set into multiple packets instead.
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index c536979140..0b8796d0ae 100644
+index c53697914..0b8796d0a 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -99,6 +99,15 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -27,7 +27,7 @@ index c536979140..0b8796d0ae 100644
              NetworkManager.g.debug("Skipping packet due to errors", throwable.getCause());
          } else {
 diff --git a/src/main/java/net/minecraft/server/Packet.java b/src/main/java/net/minecraft/server/Packet.java
-index 601d4d0fa2..2d8e6a2f4a 100644
+index 601d4d0fa..2d8e6a2f4 100644
 --- a/src/main/java/net/minecraft/server/Packet.java
 +++ b/src/main/java/net/minecraft/server/Packet.java
 @@ -10,6 +10,12 @@ public interface Packet<T extends PacketListener> {
@@ -44,7 +44,7 @@ index 601d4d0fa2..2d8e6a2f4a 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/PacketEncoder.java b/src/main/java/net/minecraft/server/PacketEncoder.java
-index 2aa805eef1..4f7bc186aa 100644
+index 2aa805eef..4f7bc186a 100644
 --- a/src/main/java/net/minecraft/server/PacketEncoder.java
 +++ b/src/main/java/net/minecraft/server/PacketEncoder.java
 @@ -49,7 +49,31 @@ public class PacketEncoder extends MessageToByteEncoder<Packet<?>> {
@@ -80,7 +80,7 @@ index 2aa805eef1..4f7bc186aa 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
-index 8e35d14f97..4a57e8a3ec 100644
+index 8e35d14f9..4a57e8a3e 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutMapChunk.java
 @@ -76,7 +76,7 @@ public class PacketPlayOutMapChunk implements Packet<PacketListenerPlayOut> {
@@ -93,7 +93,7 @@ index 8e35d14f97..4a57e8a3ec 100644
          } else {
              this.d = new byte[i];
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
-index 706d843859..c0d8f8b428 100644
+index 706d84385..c0d8f8b42 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutWindowItems.java
 @@ -9,6 +9,15 @@ public class PacketPlayOutWindowItems implements Packet<PacketListenerPlayOut> {

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

@@ -1,4 +1,4 @@
-From ca392b8044ca9a2fb975734fd34720f5510cc320 Mon Sep 17 00:00:00 2001
+From 3ec4b65bf97a98fc118806e2101ddd43cb34add7 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
@@ -8,7 +8,7 @@ worlds loaded. This is typically a rare occurrence but probably one that
 should be covered as best we can.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index 698cfb918b..fbdb2df27d 100644
+index 698cfb918..fbdb2df27 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -27,12 +27,12 @@ import org.bukkit.plugin.Plugin;

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

@@ -1,4 +1,4 @@
-From 9455b937b60f78aebec39fbaaa4d8bef03833ed2 Mon Sep 17 00:00:00 2001
+From 1dbb8069e6628806c9f2160deb850b2376a98fe3 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
@@ -34,7 +34,7 @@ how PlayerPreLoginEvent interacts with PlayerConnectionCloseEvent
 is undefined.
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index ca76f2a380..dfe7a029f8 100644
+index ca76f2a38..dfe7a029f 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -35,9 +35,9 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -50,7 +50,7 @@ index ca76f2a380..dfe7a029f8 100644
      private SecretKey loginKey;
      private EntityPlayer l;
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 0b8796d0ae..553637239c 100644
+index 0b8796d0a..553637239 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -16,6 +16,7 @@ import io.netty.handler.timeout.TimeoutException;

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

@@ -1,11 +1,11 @@
-From b9473a7a4eb705ca27b7bd74f199acf1a7be504f Mon Sep 17 00:00:00 2001
+From 1f85c94b67c1f5600c9a46632b73dd0ab06531c7 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index e4aba0e0a8..9450404428 100644
+index e4aba0e0a..945040442 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -297,7 +297,8 @@ public class EntityEnderman extends EntityMonster {

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

@@ -1,4 +1,4 @@
-From 8e19d3e0cfde60d13993fa5ea2f70208c345014d Mon Sep 17 00:00:00 2001
+From c8341f62f784ce2f97a7f007cfc73f4a8b9d80ac 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 1c90f2f85a..32557caf2b 100644
+index 0ea31156b..de17da992 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -72,6 +72,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -28,7 +28,7 @@ index 1c90f2f85a..32557caf2b 100644
      public boolean queueHealthUpdatePacket = false;
      public net.minecraft.server.PacketPlayOutUpdateHealth queuedHealthUpdatePacket;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index ec760325ba..135d25abd2 100644
+index ec760325b..135d25abd 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -95,6 +95,7 @@ public abstract class PlayerList {
@@ -40,7 +40,7 @@ index ec760325ba..135d25abd2 100644
          UserCache usercache = this.server.getUserCache();
          GameProfile gameprofile1 = usercache.a(gameprofile.getId());
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
-index fbdb2df27d..e1973c5d67 100644
+index fbdb2df27..e1973c5d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftOfflinePlayer.java
 @@ -245,6 +245,61 @@ public class CraftOfflinePlayer implements OfflinePlayer, ConfigurationSerializa
@@ -106,7 +106,7 @@ index fbdb2df27d..e1973c5d67 100644
          NBTTagCompound data = getData();
          if (data == null) return null;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index a2eae5d10c..36a3871371 100644
+index a2eae5d10..36a387137 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -132,6 +132,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,4 +1,4 @@
-From 1f58488cda8caceda4a60a543157035e4cee37dc Mon Sep 17 00:00:00 2001
+From a72c697a8c700ec3a3b540245003d12540516a6f 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
@@ -10,7 +10,7 @@ it impossible to properly cancel the event or modify the book meta
 cancelled writing
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4987acbf5..3bb285439 100644
+index 391ecc9db..04344a371 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -823,10 +823,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

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

@@ -1,4 +1,4 @@
-From 71f36b2308ade6e4c0080d5b910a2db325f56659 Mon Sep 17 00:00:00 2001
+From e262239a6dbe5860f2a3172d3eeb5ec57b629941 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

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

@@ -1,4 +1,4 @@
-From 823c5e876e5dc00680950023057a21894c12011c Mon Sep 17 00:00:00 2001
+From 8a4f6f47e16c1dd17d89711f15d63fe893b6e6d5 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/0415-Block-Entity-remove-from-being-called-on-Players.patch

@@ -1,4 +1,4 @@
-From 0ccfc3c7b8ddd8ba3b7e3ac5e6d9d107ce7d15ff Mon Sep 17 00:00:00 2001
+From b1fbe65e97c9915976a702ee7ec2690cf20a5f55 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 36a38713..fbe34290 100644
+index 36a387137..fbe342902 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1937,6 +1937,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -32,5 +32,5 @@ index 36a38713..fbe34290 100644
  
      // Spigot start
 -- 
-2.20.1.windows.1
+2.20.1
 

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

@@ -1,4 +1,4 @@
-From 4a27b93bf977cc8e7bf1a89887fd72b78273a851 Mon Sep 17 00:00:00 2001
+From bcbc92e8794aa43fefd2c9b0eb52cd2cee2b2cb2 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
@@ -31,7 +31,7 @@ this fix, as the data will remain in the oversized file. Once the server returns
 to a jar with this fix, the data will be restored.
 
 diff --git a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
-index 12268f87b9..e1f7e06ab2 100644
+index 12268f87b..e1f7e06ab 100644
 --- a/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 +++ b/src/main/java/net/minecraft/server/NBTCompressedStreamTools.java
 @@ -39,6 +39,7 @@ public class NBTCompressedStreamTools {
@@ -51,7 +51,7 @@ index 12268f87b9..e1f7e06ab2 100644
          a((NBTBase) nbttagcompound, dataoutput);
      }
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index c20511588d..d148ce4976 100644
+index c20511588..d148ce497 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -78,6 +78,7 @@ public class RegionFile {
@@ -256,7 +256,7 @@ index c20511588d..d148ce4976 100644
      }
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 8c8b7cbab5..a17e76d839 100644
+index 8c8b7cbab..a17e76d83 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -16,6 +16,7 @@ public class RegionFileCache {

work/Bukkit

@@ -1 +1 @@
-Subproject commit 217dc08dff6ff9d0482f7952b9555ff66d31800a
+Subproject commit d13fdf8c293a3d0535d9d6fa0d8a1a24e46c5ce2

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit acbba8badd83c5a66f60f5a608b052a89287425e
+Subproject commit cb98c6eaef4b85259660e289353b871d3c206f29

work/Spigot

@@ -1 +1 @@
-Subproject commit 75ee78a0c3b06f34a3b7e2f481223cfcfebd5d0d
+Subproject commit 4165cd8f453f050e18a891297e2f00704e0b379d