Allow proto chunks to be saved again

Appear to be used more extensively in 1.14. Subject to further review.

Spigot-Server-Patches/0262-Don-t-save-Proto-Chunks.patch

@@ -1,24 +0,0 @@
-From d44eea0a0f82fd4a03370687e427b516e5f03835 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Sun, 22 Jul 2018 21:21:41 -0400
-Subject: [PATCH] Don't save Proto Chunks
-
-These chunks are unfinished, and waste cpu time saving these unfinished chunks.
-the loadChunk method refuses to acknoledge they exists, and will restart
-a new chunk generation process to begin with, so saving them serves no benefit.
-
-diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 9a65c98b9f..85e9db8f4b 100644
---- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
-+++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-@@ -638,6 +638,7 @@ public class PlayerChunkMap extends IChunkLoader implements PlayerChunk.d {
-     }
- 
-     public boolean saveChunk(IChunkAccess ichunkaccess) {
-+        if (ichunkaccess.getChunkStatus().getType() == ChunkStatus.Type.PROTOCHUNK) { return true; } // Paper - don't save proto chunks
-         this.n.a(ichunkaccess.getPos());
-         if (!ichunkaccess.isNeedsSaving()) {
-             return false;
--- 
-2.21.0
-

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

@@ -1,4 +1,4 @@
-From db1163c8e5d2121e3ae5b048a1d68a66290344a4 Mon Sep 17 00:00:00 2001
+From b23159e3fa9188ca186874d1ae2cabe634d0afc6 Mon Sep 17 00:00:00 2001
 From: Andrew Steinborn <git@steinborn.me>
 Date: Mon, 23 Jul 2018 13:08:19 -0400
 Subject: [PATCH] Optimize RegistryID.c()

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

@@ -1,4 +1,4 @@
-From dc6e06893ec22da27116d0a1bc7a7b0d6bff1835 Mon Sep 17 00:00:00 2001
+From 66c6d3bb58b2f815702c40910b739e16abea61b3 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 12:57:39 +0200
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
@@ -21,7 +21,7 @@ index 83e54cb90..f06bb3ae1 100644
      private void maxEntityCollision() {
          maxCollisionsPerEntity = getInt( "max-entity-collisions", this.spigotConfig.getInt("max-entity-collisions", 8) );
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f93e3faae..1f2e2cd87 100644
+index 5cf3aea4f..dbb4eb0a8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -877,6 +877,14 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

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

@@ -1,11 +1,11 @@
-From 5fb4cc4d83df1236d12cbbacbabd01eed3a62d2d Mon Sep 17 00:00:00 2001
+From d59b99142a6d7e1f721e59f1fd59187de89c8b81 Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Mon, 23 Jul 2018 14:22:26 +0200
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 41559d3baf..7f6e20e4b9 100644
+index 15315a43e..7927b69ae 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -97,7 +97,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 41559d3baf..7f6e20e4b9 100644
      protected int j;
      private Entity vehicle;
 diff --git a/src/main/java/net/minecraft/server/IEntityAccess.java b/src/main/java/net/minecraft/server/IEntityAccess.java
-index ee22bb0387..e5a013ffd2 100644
+index ee22bb038..e5a013ffd 100644
 --- a/src/main/java/net/minecraft/server/IEntityAccess.java
 +++ b/src/main/java/net/minecraft/server/IEntityAccess.java
 @@ -22,9 +22,18 @@ public interface IEntityAccess {
@@ -41,7 +41,7 @@ index ee22bb0387..e5a013ffd2 100644
              return VoxelShapes.c(voxelshape, VoxelShapes.a(entity1.getBoundingBox()), OperatorBoolean.AND);
          });
 diff --git a/src/main/java/net/minecraft/server/IWorldReader.java b/src/main/java/net/minecraft/server/IWorldReader.java
-index 17dac8dfa4..5b422eaa2d 100644
+index 7308c0c31..ed3f793f2 100644
 --- a/src/main/java/net/minecraft/server/IWorldReader.java
 +++ b/src/main/java/net/minecraft/server/IWorldReader.java
 @@ -84,7 +84,12 @@ public interface IWorldReader extends IIBlockAccess {
@@ -58,7 +58,7 @@ index 17dac8dfa4..5b422eaa2d 100644
  
          return voxelshape.isEmpty() || this.a((Entity) null, voxelshape.a((double) blockposition.getX(), (double) blockposition.getY(), (double) blockposition.getZ()));
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index 59b1e6ce2e..b90cc6652b 100644
+index 59b1e6ce2..b90cc6652 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -126,7 +126,8 @@ public class ItemBlock extends Item {
@@ -72,7 +72,7 @@ index 59b1e6ce2e..b90cc6652b 100644
  
          BlockCanBuildEvent event = new BlockCanBuildEvent(CraftBlock.at(blockactioncontext.getWorld(), blockactioncontext.getClickPosition()), player, CraftBlockData.fromData(iblockdata), defaultReturn);
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 309cbd0dc6..78baaf6253 100644
+index 309cbd0dc..78baaf625 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -1136,6 +1136,14 @@ public class CraftEventFactory {

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

@@ -1,4 +1,4 @@
-From 98faf4aceec854a6ea132d828ca8dd1a0c7c0707 Mon Sep 17 00:00:00 2001
+From 8eb04eaaa71a87f84ab918a1cb3bdda831e01c6f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 22:18:31 -0400
 Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
@@ -6,7 +6,7 @@ Subject: [PATCH] Mark chunk dirty anytime entities change to guarantee it
 
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 7bd5a0a8c..f2ca391bf 100644
+index 98c2de550..4409a6ec8 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -416,6 +416,7 @@ public class Chunk implements IChunkAccess {

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

@@ -1,4 +1,4 @@
-From 094bd1612b657efc827a240c88378f6a1948db2d Mon Sep 17 00:00:00 2001
+From 9c5c011680364f77ecf616fb62a3f2308e557656 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 23 Jul 2018 22:44:23 -0400
 Subject: [PATCH] Add some Debug to Chunk Entity slices
@@ -9,7 +9,7 @@ This should hopefully avoid duplicate entities ever being created
 if the entity was to end up in 2 different chunk slices
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index f2ca391bf..2cb3e3696 100644
+index 4409a6ec8..5d1947f82 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -408,6 +408,25 @@ public class Chunk implements IChunkAccess {
@@ -57,7 +57,7 @@ index f2ca391bf..2cb3e3696 100644
              return;
          }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 7f6e20e4b..a273bec56 100644
+index 7927b69ae..ba40c2be6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -67,6 +67,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0267-EntityTransformedEvent.patch

@@ -1,11 +1,11 @@
-From 62121c08bd2fd851919d90f62ca0528319b3beb8 Mon Sep 17 00:00:00 2001
+From d37ef40bb457ef9f6e47f4410a750f0c62addb95 Mon Sep 17 00:00:00 2001
 From: Anthony MacAllister <anthonymmacallister@gmail.com>
 Date: Thu, 26 Jul 2018 15:30:03 -0400
 Subject: [PATCH] EntityTransformedEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityMushroomCow.java b/src/main/java/net/minecraft/server/EntityMushroomCow.java
-index bb3493c14f..de787d8614 100644
+index bb3493c14..de787d861 100644
 --- a/src/main/java/net/minecraft/server/EntityMushroomCow.java
 +++ b/src/main/java/net/minecraft/server/EntityMushroomCow.java
 @@ -101,6 +101,7 @@ public class EntityMushroomCow extends EntityCow {
@@ -17,7 +17,7 @@ index bb3493c14f..de787d8614 100644
  
                      this.die(); // CraftBukkit - from above
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index b25f3d1592..fe9efa9da1 100644
+index b25f3d159..fe9efa9da 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -602,6 +602,7 @@ public class EntityVillager extends EntityVillagerAbstract implements Reputation
@@ -29,7 +29,7 @@ index b25f3d1592..fe9efa9da1 100644
          // CraftBukkit end
          this.die();
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 4cb305ff28..171c1ae4ad 100644
+index 4cb305ff2..171c1ae4a 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -247,6 +247,7 @@ public class EntityZombie extends EntityMonster {
@@ -49,7 +49,7 @@ index 4cb305ff28..171c1ae4ad 100644
              this.world.addEntity(entityzombievillager, CreatureSpawnEvent.SpawnReason.INFECTION); // CraftBukkit - add SpawnReason
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/EntityZombieVillager.java b/src/main/java/net/minecraft/server/EntityZombieVillager.java
-index 2fe7fb7889..5cfda3160b 100644
+index 2fe7fb788..5cfda3160 100644
 --- a/src/main/java/net/minecraft/server/EntityZombieVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityZombieVillager.java
 @@ -157,6 +157,7 @@ public class EntityZombieVillager extends EntityZombie implements VillagerDataHo

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

@@ -1,4 +1,4 @@
-From a9f9d0460f6d51811ea8adfc2398eb8613575f0c Mon Sep 17 00:00:00 2001
+From a641ca430909c6497abe48673d4f735dd149d853 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 27 Jul 2018 22:36:31 -0500
 Subject: [PATCH] SkeletonHorse Additions

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

@@ -1,4 +1,4 @@
-From c6d56145f34a4fbdc515cff02a11e053b63ed3a5 Mon Sep 17 00:00:00 2001
+From a21ebf5a16f3393e1f025643e143ba81142506f2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 26 Jul 2018 00:11:12 -0400
 Subject: [PATCH] Prevent Saving Bad entities to chunks
@@ -18,7 +18,7 @@ an invalid entity.
 This should reduce log occurrences of dupe uuid messages.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 1ebb16f0f6..2f749fe26a 100644
+index 1ebb16f0f..2f749fe26 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -318,6 +318,7 @@ public class ChunkRegionLoader {

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

@@ -1,4 +1,4 @@
-From a9a10de78a820a47f07c2b62a31bc46ee49d0350 Mon Sep 17 00:00:00 2001
+From 3baa0dd9a62fd3e8c3823e6cb8f4c9f12b3c0fec Mon Sep 17 00:00:00 2001
 From: Hugo Manrique <hugmanrique@gmail.com>
 Date: Thu, 26 Jul 2018 14:10:23 +0200
 Subject: [PATCH] Don't call getItemMeta on hasItemMeta

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

@@ -1,4 +1,4 @@
-From 91fa68cb564b61ee67ef1cc3b0c2b79f5833aa3d Mon Sep 17 00:00:00 2001
+From 644a0a58a1a0e6e63e44fe1a7e7d5b61e1398c0f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 28 Jul 2018 12:18:27 -0400
 Subject: [PATCH] Ignore Dead Entities in entityList iteration
@@ -11,7 +11,7 @@ This will ensure that dead entities are skipped from iteration since
 they shouldn't of been in the list in the first place.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperCommand.java b/src/main/java/com/destroystokyo/paper/PaperCommand.java
-index ce190d88d6..352a39dcb3 100644
+index ce190d88d..352a39dcb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperCommand.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperCommand.java
 @@ -176,6 +176,7 @@ public class PaperCommand extends Command {
@@ -23,7 +23,7 @@ index ce190d88d6..352a39dcb3 100644
                      MutablePair<Integer, Map<ChunkCoordIntPair, Integer>> info = list.computeIfAbsent(key, k -> MutablePair.of(0, Maps.newHashMap()));
                      ChunkCoordIntPair chunk = new ChunkCoordIntPair(e.getChunkX(), e.getChunkZ());
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 5d1947f826..197c0fe169 100644
+index 5d1947f82..197c0fe16 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -678,6 +678,7 @@ public class Chunk implements IChunkAccess {
@@ -51,7 +51,7 @@ index 5d1947f826..197c0fe169 100644
                  if (oclass.isInstance(t0) && t0.getBoundingBox().c(axisalignedbb) && (predicate == null || predicate.test(t0))) { // Spigot - instance check
                      list.add(t0);
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index ba40c2be61..6011935dd9 100644
+index ba40c2be6..6011935dd 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -126,6 +126,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -63,7 +63,7 @@ index ba40c2be61..6011935dd9 100644
      private float av;
      private float aw;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f6ba51d14a..168e19b206 100644
+index f6ba51d14..168e19b20 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -836,6 +836,7 @@ public class WorldServer extends World {
@@ -91,7 +91,7 @@ index f6ba51d14a..168e19b206 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 4c67f071b1..1adced482b 100644
+index 4c67f071b..1adced482 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -846,6 +846,7 @@ public class CraftWorld implements World {

Spigot-Server-Patches/0272-Provide-option-to-use-a-versioned-world-folder-for-t.patch

@@ -1,4 +1,4 @@
-From d7b88cefa760decb99ba9b5e7f6fb8d9c28edf3f Mon Sep 17 00:00:00 2001
+From 0f69541ea1d4ba682b39102807528e7169e84704 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 15:48:50 -0400
 Subject: [PATCH] Provide option to use a versioned world folder for testing
@@ -59,7 +59,7 @@ index a9b71c85d..8c3880c83 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 6425b14f2..74f102adf 100644
+index 21b3b06f5..871881165 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -10,13 +10,41 @@ import java.io.IOException;

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

@@ -1,4 +1,4 @@
-From 3d192f6936af9c31f5f49a0ed85d84d303a2d9c8 Mon Sep 17 00:00:00 2001
+From 2535e1b20b096933aa3d2616866008b8a9e0ef08 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 29 Jul 2018 22:58:47 -0400
 Subject: [PATCH] MC-111480: Start Entity ID's at 1
@@ -7,7 +7,7 @@ DataWatchers that store Entity ID's treat 0 as special,
 and can break things such as Elytra Fireworks.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 1d8b42027..69087c7ef 100644
+index 6011935dd..4af1482e2 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -92,7 +92,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

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

@@ -1,4 +1,4 @@
-From d69d7ed327962ee55ab7648aa1a1f9fb8fc3b179 Mon Sep 17 00:00:00 2001
+From d35ccc712e7ad1dc95f744fcf1b6cb1946d1d956 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Thu, 26 Jul 2018 02:25:46 -0400
 Subject: [PATCH] Implement Expanded ArmorStand API
@@ -8,7 +8,7 @@ Add the following:
 - Enable/Disable slot interactions
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 06b274a71..96d9e8da8 100644
+index 81226d604..b5b763191 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -36,7 +36,7 @@ public class EntityArmorStand extends EntityLiving {

Spigot-Server-Patches/0275-AnvilDamageEvent.patch

@@ -1,11 +1,11 @@
-From ec6b054f08dae92ee154bd9759944984f1f7eeef Mon Sep 17 00:00:00 2001
+From 6a0cb1efaaa31bd6bcc605e91f6725d5dcb9d6ee Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 20 Jul 2018 23:37:03 -0500
 Subject: [PATCH] AnvilDamageEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index ada5cf982..9e73e731b 100644
+index 88e706f07..abdcd52c4 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
 @@ -85,6 +85,16 @@ public class ContainerAnvil extends Container {

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

@@ -1,4 +1,4 @@
-From 64f11268880afe697165bd8a80ad96496559374f Mon Sep 17 00:00:00 2001
+From 68f3115edf18da7b0dbf53bac1281e14de163a0c Mon Sep 17 00:00:00 2001
 From: Mark Vainomaa <mikroskeem@mikroskeem.eu>
 Date: Mon, 16 Jul 2018 00:05:05 +0300
 Subject: [PATCH] Add TNTPrimeEvent
@@ -114,7 +114,7 @@ index 013fa3524..7e534417b 100644
                  world.a(blockposition, false);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityEnderDragon.java b/src/main/java/net/minecraft/server/EntityEnderDragon.java
-index d42d4e83e..9ada10cc7 100644
+index 0baec5e11..2b39115c9 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderDragon.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderDragon.java
 @@ -11,6 +11,7 @@ import org.bukkit.craftbukkit.block.CraftBlock;

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

@@ -1,4 +1,4 @@
-From 857d9e53fdaa40d9764c085983bfb7eb59bfb4f6 Mon Sep 17 00:00:00 2001
+From c53466a7b3a976448deb0eeb54673b964d4e662a Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 29 Jul 2018 05:02:15 +0100
 Subject: [PATCH] Break up and make tab spam limits configurable
@@ -45,7 +45,7 @@ index 8c3880c83..d773ef5b0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 4c99a321b..07e9abda9 100644
+index b8cd93302..f30fec7eb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -76,6 +76,7 @@ public class PlayerConnection implements PacketListenerPlayIn {

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

@@ -1,11 +1,11 @@
-From 170f96ced5ac8e6de154574d7815b300cad56b84 Mon Sep 17 00:00:00 2001
+From a6d1b9d71c34b9a778e7db3fdfa04c66ce0e6c9a Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 2 Aug 2018 08:44:35 -0500
 Subject: [PATCH] Add hand to bucket events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityCow.java b/src/main/java/net/minecraft/server/EntityCow.java
-index a17738f9ff..d2c2e3cc33 100644
+index a17738f9f..d2c2e3cc3 100644
 --- a/src/main/java/net/minecraft/server/EntityCow.java
 +++ b/src/main/java/net/minecraft/server/EntityCow.java
 @@ -62,7 +62,7 @@ public class EntityCow extends EntityAnimal {
@@ -18,7 +18,7 @@ index a17738f9ff..d2c2e3cc33 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/ItemBucket.java b/src/main/java/net/minecraft/server/ItemBucket.java
-index cb28914118..5dc967f8ba 100644
+index cb2891411..5dc967f8b 100644
 --- a/src/main/java/net/minecraft/server/ItemBucket.java
 +++ b/src/main/java/net/minecraft/server/ItemBucket.java
 @@ -39,7 +39,7 @@ public class ItemBucket extends Item {
@@ -67,7 +67,7 @@ index cb28914118..5dc967f8ba 100644
                          ((EntityPlayer) entityhuman).playerConnection.sendPacket(new PacketPlayOutBlockChange(world, blockposition)); // SPIGOT-4238: needed when looking through entity
                          ((EntityPlayer) entityhuman).getBukkitEntity().updateInventory(); // SPIGOT-4541
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 78baaf6253..eec3effef7 100644
+index 78baaf625..eec3effef 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -360,6 +360,20 @@ public class CraftEventFactory {

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

@@ -1,4 +1,4 @@
-From 56b6b14c85f4b13bb2b415d2fa32ad4f7cb54b36 Mon Sep 17 00:00:00 2001
+From 3cd82b2c86f45d91488088da69309381fd6afcea Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 3 Aug 2018 00:04:54 -0400
 Subject: [PATCH] MC-135506: Experience should save as Integers

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

@@ -1,4 +1,4 @@
-From 4d50c898cf30fab7f58def127feab7a6ed89ae3c Mon Sep 17 00:00:00 2001
+From 88d3ebcebfa24aee9f674c8519cf2b4884b96856 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Nov 2016 00:40:42 -0500
 Subject: [PATCH] Fix client rendering skulls from same user
@@ -74,7 +74,7 @@ index 363ab5da1..d19a30ad8 100644
                  this.f.add(nbttagcompound);
              }
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index f6a80a00f..5306574e5 100644
+index 177cceb77..0882d82ce 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -142,9 +142,37 @@ public class TileEntitySkull extends TileEntity /*implements ITickable*/ { // Pa

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

@@ -1,4 +1,4 @@
-From 328ceba36730635c7fc487f90944d51dae4dc398 Mon Sep 17 00:00:00 2001
+From ac2ff8e0612d4e9c9d6f57fe2ff083dd5da5307c Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Wed, 8 Aug 2018 15:30:52 -0400
 Subject: [PATCH] Add Early Warning Feature to WatchDog

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

@@ -1,4 +1,4 @@
-From dae24cf43533a4882d0a2e5e0240145da6600f47 Mon Sep 17 00:00:00 2001
+From 8e5983ad147531a95e995f704d85a110cef0f1ac Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 10 Aug 2018 22:11:49 -0400
 Subject: [PATCH] Make EnderDragon implement Mob

Spigot-Server-Patches/0283-Detect-and-repair-corrupt-Region-Files.patch

@@ -1,4 +1,4 @@
-From 3691197a487e286eaecab0599fed5036d95629b5 Mon Sep 17 00:00:00 2001
+From 14b0e6d38cebae27d8e291c4c0ee396d6155ed48 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 11 Aug 2018 00:49:20 -0400
 Subject: [PATCH] Detect and repair corrupt Region Files

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

@@ -1,4 +1,4 @@
-From 898bb04554739891efabfcbe7ea02aa267c9ad72 Mon Sep 17 00:00:00 2001
+From fab9440f915a6421a712bf28952ac20a7734157c Mon Sep 17 00:00:00 2001
 From: egg82 <phantom_zero@ymail.com>
 Date: Tue, 7 Aug 2018 01:24:23 -0600
 Subject: [PATCH] Use ConcurrentHashMap in JsonList
@@ -25,7 +25,7 @@ The point of this is readability, but does have a side-benefit of a small microp
 Finally, added a couple obfhelpers for the modified code
 
 diff --git a/src/main/java/net/minecraft/server/JsonList.java b/src/main/java/net/minecraft/server/JsonList.java
-index 04f98167d..c169d0176 100644
+index 734e7ecf6..8570e38f4 100644
 --- a/src/main/java/net/minecraft/server/JsonList.java
 +++ b/src/main/java/net/minecraft/server/JsonList.java
 @@ -35,7 +35,8 @@ public class JsonList<K, V extends JsonListEntry<K>> {

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

@@ -1,4 +1,4 @@
-From 0e16e3ccb3e277055b24f23ecca8699c275896d5 Mon Sep 17 00:00:00 2001
+From 009051337e6ed3b398fa30636a60c85c48067943 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 12 Aug 2018 02:33:39 -0400
 Subject: [PATCH] Use a Queue for Queueing Commands

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

@@ -1,4 +1,4 @@
-From f3b0557217bb8565f2d1f21b6c8163f278dfc238 Mon Sep 17 00:00:00 2001
+From e148a7b56bc3d1103f0fc73a8a71179206ef08ad Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 15 Aug 2018 01:16:34 -0400
 Subject: [PATCH] Ability to get Tile Entities from a chunk without snapshots

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

@@ -1,11 +1,11 @@
-From 674e0e4d8b6537c06fda0d8d883be32443c5a656 Mon Sep 17 00:00:00 2001
+From 4b8bf06f1a563ca1dc940e356e0d7c3430b69aaa Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 15 Aug 2018 01:26:09 -0700
 Subject: [PATCH] Allow disabling armour stand ticking
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index f06bb3ae19..a5b4f99901 100644
+index f06bb3ae1..a5b4f9990 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -391,4 +391,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index f06bb3ae19..a5b4f99901 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index b5b7631919..9157dace14 100644
+index b5b763191..9157dace1 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -44,6 +44,11 @@ public class EntityArmorStand extends EntityLiving {
@@ -140,7 +140,7 @@ index b5b7631919..9157dace14 100644
  
      public Vector3f r() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 38ca6d6ba5..bcbfffb6e0 100644
+index 38ca6d6ba..bcbfffb6e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2265,52 +2265,7 @@ public abstract class EntityLiving extends Entity {
@@ -256,7 +256,7 @@ index 38ca6d6ba5..bcbfffb6e0 100644
          float f2 = MathHelper.g(f - this.aK);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 9f5c3b92e3..07ce93f17c 100644
+index 9f5c3b92e..07ce93f17 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -297,5 +297,15 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {

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

@@ -1,4 +1,4 @@
-From 05d907ca0562ea18473f54ccae9bb776b1f4a951 Mon Sep 17 00:00:00 2001
+From cc8bbf05ab6429cb758dfa601f879eaa5cd4524f Mon Sep 17 00:00:00 2001
 From: Spottedleaf <Spottedleaf@users.noreply.github.com>
 Date: Wed, 15 Aug 2018 12:05:12 -0700
 Subject: [PATCH] Optimize BlockPosition helper methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize BlockPosition helper methods
 Resolves #1338
 
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index a5e5a4eba..6ed584f8d 100644
+index 93c3fa78f..07b0cc7b1 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -134,55 +134,72 @@ public class BlockPosition extends BaseBlockPosition implements MinecraftSeriali

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

@@ -1,11 +1,11 @@
-From ae46a33de0bf185f7e6f2a8887e509e0ea6a30cc Mon Sep 17 00:00:00 2001
+From ba09cb8ea6fab09a58a9b4bc23747b715934a83b Mon Sep 17 00:00:00 2001
 From: Mystiflow <mystiflow@gmail.com>
 Date: Fri, 6 Jul 2018 13:21:30 +0100
 Subject: [PATCH] Send nearby packets from world player list not server list
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 006f7b8b9..af437120e 100644
+index e940b4b27..0db1e8334 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -922,8 +922,25 @@ public abstract class PlayerList {
@@ -46,7 +46,7 @@ index 006f7b8b9..af437120e 100644
                  double d5 = d1 - entityplayer.locY;
                  double d6 = d2 - entityplayer.locZ;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 364f26b55..9860175ec 100644
+index 168e19b20..d11d01d73 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1179,7 +1179,7 @@ public class WorldServer extends World {

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

@@ -1,4 +1,4 @@
-From 4a07c43a0a2b9d10c75fc3dfa8d91ea53182977c Mon Sep 17 00:00:00 2001
+From bfb75849b0f55973e8bdb2dcc3bc10360cfa7ac6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Aug 2018 12:43:16 -0400
 Subject: [PATCH] Restore vanlla default mob-spawn-range

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

@@ -1,4 +1,4 @@
-From e69b8fcf2fafef8f35f21569b2d0f4ae67f12c67 Mon Sep 17 00:00:00 2001
+From 5db80511dbe36446e31010a6151a4d1ba74881e1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Optimize Hoppers
@@ -11,7 +11,7 @@ Subject: [PATCH] Optimize Hoppers
 * Skip subsequent InventoryMoveItemEvents if a plugin does not use the item after first event fire for an iteration
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a5b4f99901..2b5402b009 100644
+index a5b4f9990..2b5402b00 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -360,6 +360,15 @@ public class PaperWorldConfig {
@@ -31,7 +31,7 @@ index a5b4f99901..2b5402b009 100644
      private void disableSprintInterruptionOnAttack() {
          disableSprintInterruptionOnAttack = getBoolean("game-mechanics.disable-sprint-interruption-on-attack", false);
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index ca1bd02995..2d83c9e79c 100644
+index ca1bd0299..2d83c9e79 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -482,8 +482,9 @@ public final class ItemStack {
@@ -47,7 +47,7 @@ index ca1bd02995..2d83c9e79c 100644
          itemstack.d(this.C());
          if (this.tag != null) {
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 3f2a3dd178..e5c148c481 100644
+index 3f2a3dd17..e5c148c48 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1126,6 +1126,7 @@ public abstract class MinecraftServer extends IAsyncTaskHandlerReentrant<TickTas
@@ -59,7 +59,7 @@ index 3f2a3dd178..e5c148c481 100644
              if (true || worldserver.worldProvider.getDimensionManager() == DimensionManager.OVERWORLD || this.getAllowNether()) { // CraftBukkit
                  this.methodProfiler.a(() -> {
 diff --git a/src/main/java/net/minecraft/server/TileEntity.java b/src/main/java/net/minecraft/server/TileEntity.java
-index acce1788db..5188689fbb 100644
+index acce1788d..5188689fb 100644
 --- a/src/main/java/net/minecraft/server/TileEntity.java
 +++ b/src/main/java/net/minecraft/server/TileEntity.java
 @@ -62,6 +62,7 @@ public abstract class TileEntity implements KeyedObject { // Paper
@@ -79,7 +79,7 @@ index acce1788db..5188689fbb 100644
              this.world.b(this.position, this);
              if (!this.c.isAir()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index d2833f8842..72b4b19d7a 100644
+index d2833f884..72b4b19d7 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -189,6 +189,154 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi

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

@@ -1,4 +1,4 @@
-From b41062570d02f4c230d59ec9b4a7eebab57e19b8 Mon Sep 17 00:00:00 2001
+From c0a6c61d510621d9ac41e4e2be1be35f02ae6b1c Mon Sep 17 00:00:00 2001
 From: miclebrick <miclebrick@outlook.com>
 Date: Thu, 23 Aug 2018 11:45:32 -0400
 Subject: [PATCH] Optimize CraftBlockData Creation

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

@@ -1,11 +1,11 @@
-From f081911f8008b0d305a83122cbeed1868a4eccfd Mon Sep 17 00:00:00 2001
+From 15d570e40fb66d7068ada15a00b9230d8a484c09 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Thu, 23 Aug 2018 09:25:30 -0500
 Subject: [PATCH] Fix MC-124320
 
 
 diff --git a/src/main/java/net/minecraft/server/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 03d3090b3f..0bddca623e 100644
+index 03d3090b3..0bddca623 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -167,6 +167,7 @@ public class Block implements IMaterial {
@@ -17,7 +17,7 @@ index 03d3090b3f..0bddca623e 100644
          IBlockData iblockdata1 = iblockdata;
          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 diff --git a/src/main/java/net/minecraft/server/EntityEnderman.java b/src/main/java/net/minecraft/server/EntityEnderman.java
-index 6db334cb59..5e850db327 100644
+index 6db334cb5..5e850db32 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -335,8 +335,9 @@ public class EntityEnderman extends EntityMonster {

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

@@ -1,4 +1,4 @@
-From d8e8c0739a9ccbfe94ad583c56067f59493d9055 Mon Sep 17 00:00:00 2001
+From 6b1aeaa32956a74aca60a99dd331de59130561cc Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 24 Aug 2018 08:18:42 -0500
 Subject: [PATCH] Slime Pathfinder Events

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

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

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

@@ -1,4 +1,4 @@
-From 84528f3c4f2ba7346c3a5066dea2c584a92bd51c Mon Sep 17 00:00:00 2001
+From 32bfb272a008220c31db88ee42df185263cdbd10 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/0297-Add-PhantomPreSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 7f3a15f4c5ca98d157c99ed50dcadd31ee55f8ca Mon Sep 17 00:00:00 2001
+From 9a8d8a8a98df2922bfcc24f9b967c36f7625881a 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/0298-Add-More-Creeper-API.patch

@@ -1,4 +1,4 @@
-From a64875c5420b62df4ca8f1362501bb5e7a93b2b9 Mon Sep 17 00:00:00 2001
+From 8019f8f65473194da8cafb6252780a2e47ab043a 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/0299-Inventory-removeItemAnySlot.patch

@@ -1,4 +1,4 @@
-From 06b562c471e8a68cd53db34d91f007e7dbe0a3d0 Mon Sep 17 00:00:00 2001
+From fe90e35388bd795eec603c54e5b9f03504ab4d65 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/0300-Make-CraftWorld-loadChunk-int-int-false-load-unconve.patch

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

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

@@ -1,11 +1,11 @@
-From 346c270bd25de866799bc1f8e856ef5542322ee7 Mon Sep 17 00:00:00 2001
+From 9481e0e03256d681a474de867b071241d538e0da Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 3 Sep 2018 18:20:03 -0500
 Subject: [PATCH] Add ray tracing methods to LivingEntity
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index bcbfffb6e0..75285a7b81 100644
+index bcbfffb6e..75285a7b8 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -3176,6 +3176,23 @@ public abstract class EntityLiving extends Entity {
@@ -33,7 +33,7 @@ index bcbfffb6e0..75285a7b81 100644
  
      public int getShieldBlockingDelay() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 8dea7d36b6..d5c4115a85 100644
+index 8dea7d36b..d5c4115a8 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -182,6 +182,28 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {

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

@@ -1,11 +1,11 @@
-From edf5208ca4bb1be36b24db9a856c07d1f6472c7b Mon Sep 17 00:00:00 2001
+From 476c879a9677f166df6e8ee4e2988ce21e2e0482 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 d1a7a873b..2f614dfb6 100644
+index a00b9b209..7d8885ce8 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -2003,14 +2003,17 @@ public abstract class EntityHuman extends EntityLiving {

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

@@ -1,4 +1,4 @@
-From e1a07bd3cae5cbdc032e884251d2282f31173c4b Mon Sep 17 00:00:00 2001
+From 969ea3882a7eda13cf410f1a5aeafd39a41b6920 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 21 Aug 2018 01:39:35 +0100
 Subject: [PATCH] Improve death events
@@ -15,7 +15,7 @@ items and experience which is otherwise only properly possible by using
 internal code.
 
 diff --git a/src/main/java/net/minecraft/server/CombatTracker.java b/src/main/java/net/minecraft/server/CombatTracker.java
-index 84c3ea9d00..f563a7b630 100644
+index 84c3ea9d0..f563a7b63 100644
 --- a/src/main/java/net/minecraft/server/CombatTracker.java
 +++ b/src/main/java/net/minecraft/server/CombatTracker.java
 @@ -175,6 +175,7 @@ public class CombatTracker {
@@ -27,7 +27,7 @@ index 84c3ea9d00..f563a7b630 100644
          int i = this.f ? 300 : 100;
  
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4af1482e29..a8a3f48385 100644
+index 4af1482e2..a8a3f4838 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1467,6 +1467,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -47,7 +47,7 @@ index 4af1482e29..a8a3f48385 100644
  
      protected void i(double d0, double d1, double d2) {
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 9157dace14..235ca47e16 100644
+index 9157dace1..235ca47e1 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -676,7 +676,8 @@ public class EntityArmorStand extends EntityLiving {
@@ -61,7 +61,7 @@ index 9157dace14..235ca47e16 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityFox.java b/src/main/java/net/minecraft/server/EntityFox.java
-index 85b32a8ac9..14046c98db 100644
+index 85b32a8ac..14046c98d 100644
 --- a/src/main/java/net/minecraft/server/EntityFox.java
 +++ b/src/main/java/net/minecraft/server/EntityFox.java
 @@ -597,15 +597,25 @@ public class EntityFox extends EntityAnimal {
@@ -94,7 +94,7 @@ index 85b32a8ac9..14046c98db 100644
  
      public static boolean a(EntityFox entityfox, EntityLiving entityliving) {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 75285a7b81..dd6e80c6fd 100644
+index 75285a7b8..dd6e80c6f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -85,7 +85,7 @@ public abstract class EntityLiving extends Entity {
@@ -249,7 +249,7 @@ index 75285a7b81..dd6e80c6fd 100644
          return this.isBaby() ? (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.5F : (this.random.nextFloat() - this.random.nextFloat()) * 0.2F + 1.0F;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 30b684b043..343680e3ba 100644
+index 30b684b04..343680e3b 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,10 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -300,7 +300,7 @@ index 30b684b043..343680e3ba 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftSound.java b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
-index 73cb64e09d..9f317ff2e8 100644
+index 73cb64e09..9f317ff2e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftSound.java
 @@ -806,6 +806,22 @@ public enum CraftSound {
@@ -327,7 +327,7 @@ index 73cb64e09d..9f317ff2e8 100644
          this.minecraftKey = minecraftKey;
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0386452a8d..deacc21873 100644
+index 0386452a8..deacc2187 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1712,7 +1712,15 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -348,7 +348,7 @@ index 0386452a8d..deacc21873 100644
  
      public void injectScaledMaxHealth(Collection<AttributeInstance> collection, boolean force) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index eec3effef7..0d66765591 100644
+index eec3effef..0d6676559 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -736,9 +736,16 @@ public class CraftEventFactory {

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

@@ -1,4 +1,4 @@
-From 93f8bc143c52867231425ae8a296a420305d5c4c Mon Sep 17 00:00:00 2001
+From 9772ae9495bfe35580ea06f7f72c1a782f1d0d51 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

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

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

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

@@ -1,4 +1,4 @@
-From 11644ed0883c8d95df9351037c9808358b246d17 Mon Sep 17 00:00:00 2001
+From 302dc659498a5c22ff5ec29c4d7fc463bca2ea0d 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

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

@@ -1,11 +1,11 @@
-From 845d0f511164ef67e365f79a2cf62af979e1cd33 Mon Sep 17 00:00:00 2001
+From f696adb8ba9ed229973586dbc852ddbf7143e4a2 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 3a215dea4..ea93452e6 100644
+index 2574c36d3..1c9edeb31 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 {

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

@@ -1,11 +1,11 @@
-From 23e5c5c52e717b8471c06e9dac8784dc8e27d313 Mon Sep 17 00:00:00 2001
+From afd115967cece46e05e18a441f4b02d292255a15 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
-index 706be9a736..b1457526ec 100644
+index 706be9a73..b1457526e 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalRemoveBlock.java
 @@ -12,11 +12,13 @@ public class PathfinderGoalRemoveBlock extends PathfinderGoalGotoTarget {
@@ -53,7 +53,7 @@ index 706be9a736..b1457526ec 100644
          return block == this.g && iworldreader.getType(blockposition.up()).isAir() && iworldreader.getType(blockposition.up(2)).isAir();
      }
 diff --git a/src/main/java/net/minecraft/server/RandomPositionGenerator.java b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
-index b286934aa8..c7e25e2be8 100644
+index b286934aa..c7e25e2be 100644
 --- a/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 +++ b/src/main/java/net/minecraft/server/RandomPositionGenerator.java
 @@ -93,6 +93,7 @@ public class RandomPositionGenerator {

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

@@ -1,4 +1,4 @@
-From a84f6f7e85fd4ac90b5869c6d71bc7d65342ae89 Mon Sep 17 00:00:00 2001
+From a8cf4013da68d6afc7433f20db3fe7fa20f95d45 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 14e2f3ca7..5824cbba6 100644
+index 5da0f2211..94d7bca09 100644
 --- a/src/main/java/net/minecraft/server/SpawnerCreature.java
 +++ b/src/main/java/net/minecraft/server/SpawnerCreature.java
 @@ -25,9 +25,9 @@ public final class SpawnerCreature {

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

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

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

@@ -1,4 +1,4 @@
-From 37db6150821f83e9fa58b97186ee816fa587f87e Mon Sep 17 00:00:00 2001
+From 51befe7b8aa9a8f663b23ab86883303efa797235 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 be16fe9a9..b9f3a952e 100644
+index 0f6cd246a..c983d260a 100644
 --- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
 +++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
 @@ -8,6 +8,7 @@ import java.util.Map;

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

@@ -1,4 +1,4 @@
-From 260f1e88e76a4d59213381b18cb34739ffba07df Mon Sep 17 00:00:00 2001
+From e04c7c105982729b3b5fff8537083a3053e86136 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
@@ -72,7 +72,7 @@ index e5c148c48..74cdf4945 100644
  
              if (j == 0) {
 diff --git a/src/main/java/net/minecraft/server/WorldData.java b/src/main/java/net/minecraft/server/WorldData.java
-index 9ecd412ae..eb1464983 100644
+index ace2643be..d4b0cca23 100644
 --- a/src/main/java/net/minecraft/server/WorldData.java
 +++ b/src/main/java/net/minecraft/server/WorldData.java
 @@ -116,7 +116,7 @@ public class WorldData {

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

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

Spigot-Server-Patches/0314-PreSpawnerSpawnEvent.patch

@@ -1,4 +1,4 @@
-From 63ba073d09459ccd57076cbfd0883d504ad21cd3 Mon Sep 17 00:00:00 2001
+From 2347d3c387c5bddedf2cdb34abaa8f0a348f47d4 Mon Sep 17 00:00:00 2001
 From: Phoenix616 <mail@moep.tv>
 Date: Tue, 18 Sep 2018 23:53:23 +0100
 Subject: [PATCH] PreSpawnerSpawnEvent

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

@@ -1,4 +1,4 @@
-From fd55b0f55604e74068b6bc19e6fedf2f7141b2c7 Mon Sep 17 00:00:00 2001
+From a8903af3349e74919c220b0049b8eb55d8c9fb8e 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
@@ -26,7 +26,7 @@ index 4b7aefb7a..9e568d5d1 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 efda90f6e..b63a8ad98 100644
+index a8a3f4838..bcfc5318f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1651,7 +1651,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -76,7 +76,7 @@ index 1f26d8a02..12264c4d0 100644
  
          if (this.hasWorld()) {
 diff --git a/src/main/java/net/minecraft/server/TileEntityContainer.java b/src/main/java/net/minecraft/server/TileEntityContainer.java
-index 3590b4e31..ea7d5a430 100644
+index 473ec2cbd..ab6b86e4e 100644
 --- a/src/main/java/net/minecraft/server/TileEntityContainer.java
 +++ b/src/main/java/net/minecraft/server/TileEntityContainer.java
 @@ -17,7 +17,7 @@ public abstract class TileEntityContainer extends TileEntity implements IInvento

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

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

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

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

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

@@ -1,11 +1,11 @@
-From 546a69c886e34f2e28b7332b8ab25e7a5bbe92a4 Mon Sep 17 00:00:00 2001
+From fd4a9d23a2336f7f47eda81a25c0ad427b709208 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 ffb18902ff..2d3861c184 100644
+index ffb18902f..2d3861c18 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -275,6 +275,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index ffb18902ff..2d3861c184 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 07d85e5353..4b76c2d14f 100644
+index 07d85e535..4b76c2d14 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -38,7 +38,7 @@ public class HandshakeListener implements PacketHandshakingInListener {

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

@@ -1,4 +1,4 @@
-From 71bea266bdba742adeac29964e9738d67cbba8b8 Mon Sep 17 00:00:00 2001
+From 4394d1444555825bd83735c3e7da973347f6cc81 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/0320-Allow-setting-the-vex-s-summoner.patch

@@ -1,11 +1,11 @@
-From e40b050f7de5fdf2cf4eeef058651ad9929b9992 Mon Sep 17 00:00:00 2001
+From 68ce300145fc5bf4befd75f734db692b0beac2aa 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 83e022c91..c56933068 100644
+index d7bea8389..bcda21ba7 100644
 --- a/src/main/java/net/minecraft/server/EntityVex.java
 +++ b/src/main/java/net/minecraft/server/EntityVex.java
 @@ -133,6 +133,7 @@ public class EntityVex extends EntityMonster {

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

@@ -1,11 +1,11 @@
-From a531f99a0c6b8b2236658d2b56d3ad8775b73819 Mon Sep 17 00:00:00 2001
+From 1289a5cb120dc44faac5278e9f2b44a74b5827b7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 Oct 2018 00:54:21 -0500
 Subject: [PATCH] Add sun related API
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 11652628b..90923c753 100644
+index c2771c5d9..c81e53090 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1326,6 +1326,7 @@ public abstract class EntityInsentient extends EntityLiving {
@@ -17,7 +17,7 @@ index 11652628b..90923c753 100644
          if (this.world.J() && !this.world.isClientSide) {
              float f = this.aE();
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1f2e2cd87..163d7f37c 100644
+index dbb4eb0a8..d13e4cf73 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -667,6 +667,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

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

@@ -1,11 +1,11 @@
-From b46e7409a7f9b1d8104cdddf882ed638af593647 Mon Sep 17 00:00:00 2001
+From c7e72a3128b0943ff4c8bdd0bc1da9c94f5a45e7 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 0deb51427e..7f34cdbc34 100644
+index 0deb51427..7f34cdbc3 100644
 --- a/src/main/java/net/minecraft/server/EntityDrowned.java
 +++ b/src/main/java/net/minecraft/server/EntityDrowned.java
 @@ -29,7 +29,7 @@ public class EntityDrowned extends EntityZombie implements IRangedEntity {

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

@@ -1,11 +1,11 @@
-From 67311c301581a2b14d9aa52fe8fa4445be839709 Mon Sep 17 00:00:00 2001
+From 5f88da5b478b5a6ae133d917a144eb7926672ba3 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 dbd189afe..9d3c37dce 100644
+index 54c1b7c87..130a2e4ff 100644
 --- a/src/main/java/net/minecraft/server/EntityVindicator.java
 +++ b/src/main/java/net/minecraft/server/EntityVindicator.java
 @@ -11,7 +11,7 @@ public class EntityVindicator extends EntityIllagerAbstract {

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

@@ -1,11 +1,11 @@
-From 5bb24023575ad2d99db5d967a7d5f05069c2cb60 Mon Sep 17 00:00:00 2001
+From c4109fc8bcaf80d55d8cfc864876486343e91065 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 1b4933c07..b7929c5c4 100644
+index 89792eec4..e4eecf568 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 {

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

@@ -1,4 +1,4 @@
-From d7357332195bb4df6bacf96931c384251fa361f9 Mon Sep 17 00:00:00 2001
+From 14e40ff94b5e6404b743ab0977730c7bed4f0d30 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
@@ -69,7 +69,7 @@ index adf68d165..fbcda86b3 100644
  
          --this.lifeTicks;
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 9860175ec..9c4ef2e00 100644
+index d11d01d73..3c986857b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1179,7 +1179,7 @@ public class WorldServer extends World {

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

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

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

@@ -1,11 +1,11 @@
-From d65a9afe62205e6f3a61a443a5220039640c27c7 Mon Sep 17 00:00:00 2001
+From 0879e89d98fed7cc3db36eb1635b98439082a06f Mon Sep 17 00:00:00 2001
 From: Caleb Bassham <caleb.bassham@gmail.com>
 Date: Fri, 28 Sep 2018 02:32:19 -0500
 Subject: [PATCH] Call player spectator target events
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 251166c4f..bf1a38eb9 100644
+index 343680e3b..0e35f6dc2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -60,7 +60,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

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

@@ -1,4 +1,4 @@
-From 6511b39d67f36e19eb4c9ada89e8930652b35761 Mon Sep 17 00:00:00 2001
+From 11e86765bb25800e0b6c6a030e4f9f5d14000f2f 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
@@ -203,7 +203,7 @@ index d4d752ddb..5d46a975e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 6c5544807..38386d588 100644
+index efd02bd67..c073b04aa 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<?>> {

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

@@ -1,11 +1,11 @@
-From 393284c65e13b67068ff9340f6f7ff9f25333f5c Mon Sep 17 00:00:00 2001
+From f5f6105f7f6e969a7a5a952a52cd97d4605f048c 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 ae9efb72c..3cbb34a0c 100644
+index 8b95ec3a8..f30ce9568 100644
 --- a/src/main/java/net/minecraft/server/EntityWitch.java
 +++ b/src/main/java/net/minecraft/server/EntityWitch.java
 @@ -1,5 +1,11 @@

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

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

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

@@ -1,4 +1,4 @@
-From 9433377ed63c501082a19eeb78b3270eeb8a80c3 Mon Sep 17 00:00:00 2001
+From 7650a917ee76c8944347ae6c41b7a1d541f0dc3d 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 fb44fccc9..ad793ffa3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 07e9abda9..4ba13da1a 100644
+index f30fec7eb..ff45290b8 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -347,6 +347,13 @@ public class PlayerConnection implements PacketListenerPlayIn {

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

@@ -1,11 +1,11 @@
-From d8cf0ed68f026f58597ce1a0ffccf4767f2743e1 Mon Sep 17 00:00:00 2001
+From 036e3fb87860644ac6b6163383cf314adc2a9753 Mon Sep 17 00:00:00 2001
 From: GreenMeanie <GreenMeanieMC@gmail.com>
 Date: Sat, 20 Oct 2018 22:34:02 -0400
 Subject: [PATCH] Reset players airTicks on respawn
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index b63a8ad98..e58c68275 100644
+index bcfc5318f..9395f3e10 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2273,7 +2273,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index b63a8ad98..e58c68275 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index bf1a38eb9..2e068ec2d 100644
+index 0e35f6dc2..2f605365f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1857,6 +1857,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

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

@@ -1,4 +1,4 @@
-From 7b6141329b843781e3a5df023fb2229632de5327 Mon Sep 17 00:00:00 2001
+From e44f34d3173d7a9e16a6e7a74ef205dd935cfd4e 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 626ba9b17..7b5d534f4 100644
+index 2c6ce5bae..15b3add9e 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -14,6 +14,11 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //

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

@@ -1,4 +1,4 @@
-From 61e56a4fe07e8c62743d11128e7cfdf299c9ffe7 Mon Sep 17 00:00:00 2001
+From 7c00d87b4b56b7a22f9f1059cf76bce5db04c6cb 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/0335-Use-more-reasonable-thread-count-default-for-bootstr.patch

@@ -1,4 +1,4 @@
-From 751ed975c22f7fd9c400d0c038fddd3f23c5d158 Mon Sep 17 00:00:00 2001
+From 8ad28b03aad516f1544943f0ffa495f4f25bbab3 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

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

@@ -1,4 +1,4 @@
-From 78cc77a1b623ffb5f63d6495d5490313e5689200 Mon Sep 17 00:00:00 2001
+From 28470a8e6dfd253aa55dba3784e1755692c748d1 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 f692da609..5bc8bd7cd 100644
+index 06ea3899a..7f90a617f 100644
 --- a/src/main/java/net/minecraft/server/PlayerInteractManager.java
 +++ b/src/main/java/net/minecraft/server/PlayerInteractManager.java
 @@ -354,10 +354,11 @@ public class PlayerInteractManager {

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

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

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

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

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

@@ -1,4 +1,4 @@
-From c00cc02a372fb4d9749a8bb8f696b6b36190dc7b Mon Sep 17 00:00:00 2001
+From 98b3efce4e247621f027b7fe7fb2c43c1b8fcc97 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 6fc332dbf..828a8711d 100644
+index 2a2105cbc..3a3ed039a 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartAbstract.java
 @@ -35,9 +35,9 @@ public abstract class EntityMinecartAbstract extends Entity {

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

@@ -1,4 +1,4 @@
-From d60d046b6fd9ee91cf1d1e4e731a2065074563b6 Mon Sep 17 00:00:00 2001
+From 65f5e94d73159dcc1333e28f1219af0c1bfc28d8 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/Block.java b/src/main/java/net/minecraft/server/Block.java
-index 0bddca623e..8f809a4ee4 100644
+index 0bddca623..8f809a4ee 100644
 --- a/src/main/java/net/minecraft/server/Block.java
 +++ b/src/main/java/net/minecraft/server/Block.java
 @@ -472,7 +472,7 @@ public class Block implements IMaterial {
@@ -19,7 +19,7 @@ index 0bddca623e..8f809a4ee4 100644
          if (world instanceof WorldServer) {
              a(iblockdata, (WorldServer) world, blockposition, tileentity).forEach((itemstack) -> {
 diff --git a/src/main/java/net/minecraft/server/BlockSponge.java b/src/main/java/net/minecraft/server/BlockSponge.java
-index 4e281ce6dd..6a64af71b9 100644
+index 4e281ce6d..6a64af71b 100644
 --- a/src/main/java/net/minecraft/server/BlockSponge.java
 +++ b/src/main/java/net/minecraft/server/BlockSponge.java
 @@ -113,8 +113,11 @@ public class BlockSponge extends Block {

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

@@ -1,11 +1,11 @@
-From f084a78d2b9eeae3ab154d6127c396066291ca48 Mon Sep 17 00:00:00 2001
+From a84756c0cc7249d163464d530d8bf99764a8593f 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 ff45290b84..293e5d819c 100644
+index ff45290b8..293e5d819 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1250,6 +1250,11 @@ public class PlayerConnection implements PacketListenerPlayIn {

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

@@ -1,4 +1,4 @@
-From 87c87ad160f47b7171bab823ade46d9be9a2310a Mon Sep 17 00:00:00 2001
+From 1785bdbd71be84d3988751c7ed8950ca66e03af1 Mon Sep 17 00:00:00 2001
 From: theosib <millerti@172.16.221.1>
 Date: Thu, 27 Sep 2018 01:43:35 -0600
 Subject: [PATCH] Optimize redstone algorithm
@@ -19,7 +19,7 @@ Aside from making the obvious class/function renames and obfhelpers I didn't nee
 Just added Bukkit's event system and took a few liberties with dead code and comment misspellings.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index ad793ffa38..ef882b897f 100644
+index ad793ffa3..ef882b897 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -439,4 +439,14 @@ public class PaperWorldConfig {
@@ -39,7 +39,7 @@ index ad793ffa38..ef882b897f 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 new file mode 100644
-index 0000000000..cf5661f1c5
+index 000000000..cf5661f1c
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/util/RedstoneWireTurbo.java
 @@ -0,0 +1,912 @@
@@ -956,7 +956,7 @@ index 0000000000..cf5661f1c5
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneWire.java b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
-index 7ce9cdb853..6b5015ce5f 100644
+index 7ce9cdb85..6b5015ce5 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneWire.java
 @@ -1,5 +1,7 @@
@@ -1124,7 +1124,7 @@ index 7ce9cdb853..6b5015ce5f 100644
                  c(iblockdata, world, blockposition);
                  world.a(blockposition, false);
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d13e4cf735..f811ef8cc8 100644
+index d13e4cf73..f811ef8cc 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -556,6 +556,7 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

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

@@ -1,4 +1,4 @@
-From a7402d36cdb5dcb94e31ff2117f0623e8d1daf39 Mon Sep 17 00:00:00 2001
+From 680f38471891cd541474b9b0eade52bb3ccabcaf Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Thu, 15 Nov 2018 13:38:37 +0000
 Subject: [PATCH] force entity dismount during teleportation
@@ -20,7 +20,7 @@ this is going to be the best soultion all around.
 Improvements/suggestions welcome!
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 9395f3e106..ea4442d76d 100644
+index 9395f3e10..ea4442d76 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1995,12 +1995,15 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -72,7 +72,7 @@ index 9395f3e106..ea4442d76d 100644
              if (event.isCancelled()) {
                  return false;
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index 7d8885ce81..318c2b0dcf 100644
+index 7d8885ce8..318c2b0dc 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -937,9 +937,11 @@ public abstract class EntityHuman extends EntityLiving {
@@ -91,7 +91,7 @@ index 7d8885ce81..318c2b0dcf 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index dd6e80c6fd..ae1cda49aa 100644
+index dd6e80c6f..ae1cda49a 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2667,11 +2667,13 @@ public abstract class EntityLiving extends Entity {
@@ -112,7 +112,7 @@ index dd6e80c6fd..ae1cda49aa 100644
              this.B(entity);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 2f605365f7..7f89d45ed2 100644
+index 2f605365f..7f89d45ed 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -997,11 +997,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

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

@@ -1,4 +1,4 @@
-From a4a3be2e676fd159d16b7497205c1a5749a393f9 Mon Sep 17 00:00:00 2001
+From 36654b61426aecd3fda14002e023730f5c453cd7 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 a79cba50e..e5e41c662 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index a887be15c..baab1a88a 100644
+index 293e5d819..f68693525 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -14,6 +14,7 @@ import java.util.Iterator;

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

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

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

@@ -1,11 +1,11 @@
-From 738ad01b1c3aedf48337837713706ce5d488893c Mon Sep 17 00:00:00 2001
+From 211899db841918fe476f6dac60b11d89df32a80c 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/EntityInsentient.java b/src/main/java/net/minecraft/server/EntityInsentient.java
-index 90923c753..5cc08ca7c 100644
+index c81e53090..48ce15484 100644
 --- a/src/main/java/net/minecraft/server/EntityInsentient.java
 +++ b/src/main/java/net/minecraft/server/EntityInsentient.java
 @@ -1246,6 +1246,8 @@ public abstract class EntityInsentient extends EntityLiving {

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

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

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

@@ -1,4 +1,4 @@
-From 43963caa455961da93ac4e202a2afbddf3b6f15f Mon Sep 17 00:00:00 2001
+From d654882c23645a74bcaf783541d0b5f59df0bbba 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 38386d588..2c28b97d8 100644
+index c073b04aa..1652662ae 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<?>> {

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

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

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

@@ -1,4 +1,4 @@
-From 120808b9ed9305c487d75470dadd345c67c0cc19 Mon Sep 17 00:00:00 2001
+From 0cd2b1da42e4771f25d792ad9387acfcc765b2eb 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
@@ -50,7 +50,7 @@ index 5d46a975e..9e4bc2405 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 2c28b97d8..1b0643c27 100644
+index 1652662ae..23fcdea17 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -346,6 +346,26 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {

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

@@ -1,11 +1,11 @@
-From fc6ba51276935a15372f60dd20880fcd5c2a1c57 Mon Sep 17 00:00:00 2001
+From ef680ce19df7c5e78efe920d3a6f015aa1a80cea 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 ad1553f6e..c6a2e0839 100644
+index 5e850db32..d4c4dc2fd 100644
 --- a/src/main/java/net/minecraft/server/EntityEnderman.java
 +++ b/src/main/java/net/minecraft/server/EntityEnderman.java
 @@ -325,7 +325,8 @@ public class EntityEnderman extends EntityMonster {

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

@@ -1,4 +1,4 @@
-From a906f9dff899ba0376b820d012236439d968674e Mon Sep 17 00:00:00 2001
+From 3ce57cf192543240a80794ce558716f8e3f0e15a 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 a05b31f73..79139be38 100644
+index 7f89d45ed..64d1b72a8 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -75,6 +75,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -28,7 +28,7 @@ index a05b31f73..79139be38 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 af437120e..1eae8057d 100644
+index 0db1e8334..0aafa1b60 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -94,6 +94,7 @@ public abstract class PlayerList {

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

@@ -1,4 +1,4 @@
-From 4d0a37f46e4edd5bd6438eb4c6ae0a7e5214064d Mon Sep 17 00:00:00 2001
+From c1de41cf5f2ec6108306d37dfbf1385081ae2e15 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 baab1a88a..f007290ff 100644
+index f68693525..98d1138cb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -860,9 +860,11 @@ public class PlayerConnection implements PacketListenerPlayIn {

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

@@ -1,11 +1,11 @@
-From 0b348726ba58833452b50fc0d6e5ac8ce349c5a9 Mon Sep 17 00:00:00 2001
+From bbeecf1f284a7d540827e4b609de84052fb4bfce Mon Sep 17 00:00:00 2001
 From: connorhartley <vectrixu+gh@gmail.com>
 Date: Mon, 7 Jan 2019 14:43:48 -0600
 Subject: [PATCH] Workaround for vehicle tracking issue on disconnect
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 79139be38..c7f22870b 100644
+index 64d1b72a8..0a67f48f6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1280,6 +1280,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

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

@@ -1,4 +1,4 @@
-From 526e77b1d53264548589704961c8e62942ffc0f0 Mon Sep 17 00:00:00 2001
+From 0110b90cf96f902c4271a0582869f179e6833b81 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
@@ -24,7 +24,7 @@ Instead we opt to remove the check entirely so that the event fires for
 all piston types.
 
 diff --git a/src/main/java/net/minecraft/server/BlockPiston.java b/src/main/java/net/minecraft/server/BlockPiston.java
-index 141006e36..78603d2cb 100644
+index b41750f22..d548b27b8 100644
 --- a/src/main/java/net/minecraft/server/BlockPiston.java
 +++ b/src/main/java/net/minecraft/server/BlockPiston.java
 @@ -121,7 +121,7 @@ public class BlockPiston extends BlockDirectional {

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

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

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

@@ -1,4 +1,4 @@
-From 9d6f89ebd925e3ceb8114f517c4827d0bc344b46 Mon Sep 17 00:00:00 2001
+From b1daf825933dfebf17b7701c40dbe983feeb35a3 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
@@ -286,7 +286,7 @@ index e68f90194..ed2ccebb2 100644
 +
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index 74f102adf..3f7190b6a 100644
+index 871881165..c53518a47 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -47,6 +47,7 @@ public abstract class RegionFileCache implements AutoCloseable {

Spigot-Server-Patches/0358-BlockDestroyEvent.patch

@@ -1,4 +1,4 @@
-From 1413bae6de96ea8e6d20801ec5e5505e23e09f9c Mon Sep 17 00:00:00 2001
+From e4e8eb871eb4c2e2ee8f9752ed648055a988f592 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 6 Feb 2019 00:20:33 -0500
 Subject: [PATCH] BlockDestroyEvent
@@ -11,7 +11,7 @@ floating in the air.
 This can replace many uses of BlockPhysicsEvent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 3425f034c..4280fdf80 100644
+index f811ef8cc..032419155 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -486,8 +486,20 @@ public abstract class World implements IIBlockAccess, GeneratorAccess, AutoClose

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

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

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

@@ -1,4 +1,4 @@
-From 2324c30717edbe9602a8ab535b018ff43d7f27ac Mon Sep 17 00:00:00 2001
+From e776f5ab14aa0c2cf5e54dee68753ae4d7f1cf13 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Feb 2019 00:15:28 -0500
 Subject: [PATCH] Fix sign edit memory leak
@@ -6,7 +6,7 @@ Subject: [PATCH] Fix sign edit memory leak
 when a player edits a sign, a reference to their Entity is never cleand up.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 98d1138cbd..b3f1fb9eb2 100644
+index 98d1138cb..b3f1fb9eb 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2565,7 +2565,7 @@ public class PlayerConnection implements PacketListenerPlayIn {
@@ -19,7 +19,7 @@ index 98d1138cbd..b3f1fb9eb2 100644
                  this.sendPacket(tileentity.getUpdatePacket()); // CraftBukkit
                  return;
 diff --git a/src/main/java/net/minecraft/server/TileEntitySign.java b/src/main/java/net/minecraft/server/TileEntitySign.java
-index 15b3add9ed..caeaca4c7a 100644
+index 15b3add9e..caeaca4c7 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySign.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySign.java
 @@ -17,6 +17,7 @@ public class TileEntitySign extends TileEntity implements ICommandListener { //