Updated Upstream (Bukkit/CraftBukkit)

Upstream has released updates that appears to apply and compile correctly.
This update has not been tested by PaperMC and as with ANY update, please do your own testing

Bukkit Changes:
39ce5d3a SPIGOT-4399: ItemMeta.equals broken with AttributeModifiers

CraftBukkit Changes:
1cf8b5dc SPIGOT-4400: Populators running on existing chunks
116cb9a1 SPIGOT-4399: Add attribute modifier equality test
5ee1c18a SPIGOT-4398: Set ASM7_EXPERIMENTAL flag

Spigot-API-Patches/0156-Remove-Precondition-on-name-for-AttributeModifier.patch

@@ -1,4 +1,4 @@
-From 02ea14d151acf44e283dee55d8ed2daf733704ef Mon Sep 17 00:00:00 2001
+From 7a42dca8e149969ed13cdae48a9cdf98262a3319 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 22 Sep 2018 18:41:01 -0400
 Subject: [PATCH] Remove Precondition on name for AttributeModifier
@@ -6,10 +6,10 @@ Subject: [PATCH] Remove Precondition on name for AttributeModifier
 Vanilla allows empty names
 
 diff --git a/src/main/java/org/bukkit/attribute/AttributeModifier.java b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-index a3a69ffa4..4d1691be0 100644
+index 2bc9878ff..0943eee46 100644
 --- a/src/main/java/org/bukkit/attribute/AttributeModifier.java
 +++ b/src/main/java/org/bukkit/attribute/AttributeModifier.java
-@@ -29,10 +29,10 @@ public class AttributeModifier implements ConfigurationSerializable {
+@@ -30,10 +30,10 @@ public class AttributeModifier implements ConfigurationSerializable {
  
      public AttributeModifier(UUID uuid, String name, double amount, Operation operation, EquipmentSlot slot) {
          Validate.notNull(uuid, "UUID cannot be null");

Spigot-Server-Patches/0007-Store-reference-to-current-Chunk-for-Entity-and-Bloc.patch

@@ -1,4 +1,4 @@
-From ec579a0138fdc32c33ab4b1eef277e559a592b23 Mon Sep 17 00:00:00 2001
+From 70f95e0e0ad11ed2007a83c24d855cbb800f764b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 Jul 2018 02:10:36 -0400
 Subject: [PATCH] Store reference to current Chunk for Entity and Block
@@ -8,7 +8,7 @@ This enables us a fast reference to the entities current chunk instead
 of having to look it up by hashmap lookups.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index f64bfa1b95..16aa7f8f79 100644
+index bc43af7243..0a55ad6212 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -33,7 +33,7 @@ public class Chunk implements IChunkAccess {
@@ -85,7 +85,7 @@ index f64bfa1b95..16aa7f8f79 100644
      }
  
      public boolean c(BlockPosition blockposition) {
-@@ -849,6 +879,7 @@ public class Chunk implements IChunkAccess {
+@@ -872,6 +902,7 @@ public class Chunk implements IChunkAccess {
                      }
                  }
                  // Spigot End

Spigot-Server-Patches/0009-Timings-v2.patch

@@ -1,4 +1,4 @@
-From d4b39b8ec7ba1b81f51e9ace99e7e1e767976691 Mon Sep 17 00:00:00 2001
+From f8e6bf89950a7fef6a1f05d8e973eae16c41acc3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -316,8 +316,28 @@ index 8811dbc9b3..7818a3b6a7 100644
      protected final MaterialMapColor l;
      private final float frictionFactor;
      protected final BlockStateList<Block, IBlockData> blockStateList;
+diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
+index 6ec067be48..8ba8af2773 100644
+--- a/src/main/java/net/minecraft/server/Chunk.java
++++ b/src/main/java/net/minecraft/server/Chunk.java
+@@ -841,6 +841,7 @@ public class Chunk implements IChunkAccess {
+             server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkLoadEvent(this.bukkitChunk, this.needsDecoration));
+ 
+             if (this.needsDecoration) {
++                this.world.timings.syncChunkLoadPopulateTimer.startTiming(); // Paper
+                 BlockSand.instaFall = true;
+                 java.util.Random random = new java.util.Random();
+                 random.setSeed(world.getSeed());
+@@ -861,6 +862,7 @@ public class Chunk implements IChunkAccess {
+                 }
+                 BlockSand.instaFall = false;
+                 server.getPluginManager().callEvent(new org.bukkit.event.world.ChunkPopulateEvent(bukkitChunk));
++                this.world.timings.syncChunkLoadPopulateTimer.stopTiming(); // Paper
+             }
+         }
+         // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index e3d1761b49..fbebd4591c 100644
+index 85a065f039..4b8b77710b 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -14,6 +14,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -328,25 +348,14 @@ index e3d1761b49..fbebd4591c 100644
          Chunk chunk1 = (Chunk) super.put(i, chunk);
          ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i);
  
-@@ -46,8 +47,10 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
+@@ -46,6 +47,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
                  }
              }
          }
 +        chunk.world.timings.syncChunkLoadPostTimer.stopTiming(); // Paper
- 
-         if (chunk.newChunk) {
-+            chunk.world.timings.syncChunkLoadPopulateTimer.startTiming(); // Paper
-             BlockSand.instaFall = true;
-             java.util.Random random = new java.util.Random();
-             random.setSeed(chunk.world.getSeed());
-@@ -68,6 +71,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
-             }
-             BlockSand.instaFall = false;
-             chunk.world.getServer().getPluginManager().callEvent(new org.bukkit.event.world.ChunkPopulateEvent(chunk.bukkitChunk));
-+            chunk.world.timings.syncChunkLoadPopulateTimer.stopTiming(); // Paper
-         }
          // CraftBukkit end
  
+         return chunk1;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 index 0c8c10b7a7..31ed3e43a5 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -1554,19 +1563,21 @@ index 413dd35f06..52a8c48fa4 100644
  
      public void callStage3(QueuedChunk queuedChunk, Chunk chunk, Runnable runnable) throws RuntimeException {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 9f78f2c4ae..b8bdcb6b74 100644
+index 9f78f2c4ae..832d2de476 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-@@ -1715,6 +1715,12 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
+@@ -1715,6 +1715,14 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
              packet.components = components;
              getHandle().playerConnection.sendPacket(packet);
          }
 +
++        // Paper start
 +        @Override
 +        public int getPing()
 +        {
 +            return getHandle().ping;
 +        }
++        // Paper end
      };
  
      public Player.Spigot spigot()

Spigot-Server-Patches/0028-Lighting-Queue.patch

@@ -1,4 +1,4 @@
-From 98b1b56527d727395f8e97e6fcab6e533f54b9c0 Mon Sep 17 00:00:00 2001
+From c5fa856a9c824a188540888c0224415592fd8c0f Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -61,7 +61,7 @@ index 39d565db1f..8f6f0288be 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 2f33b4208c..8f2de5a327 100644
+index a97f0499cd..397798cf28 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -38,7 +38,7 @@ public class Chunk implements IChunkAccess {
@@ -118,7 +118,7 @@ index 2f33b4208c..8f2de5a327 100644
                  }
  
                  TileEntity tileentity;
-@@ -986,10 +990,16 @@ public class Chunk implements IChunkAccess {
+@@ -1011,10 +1015,16 @@ public class Chunk implements IChunkAccess {
          return false;
      }
  
@@ -138,7 +138,7 @@ index 2f33b4208c..8f2de5a327 100644
  
          this.u = true;
  
-@@ -1349,6 +1359,16 @@ public class Chunk implements IChunkAccess {
+@@ -1374,6 +1384,16 @@ public class Chunk implements IChunkAccess {
          return this.D == 8;
      }
  

Spigot-Server-Patches/0042-Add-PlayerInitialSpawnEvent.patch

@@ -1,4 +1,4 @@
-From c0e32dfbeb3b1371d3a0e9d3b5fcba34af4d2ff8 Mon Sep 17 00:00:00 2001
+From ccaf2d344c00e98b07e41c0e718e31193379fc11 Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Thu, 3 Mar 2016 00:09:38 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] Add PlayerInitialSpawnEvent
 For modifying a player's initial spawn location as they join the server
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 1e3dd22e5..23562388a 100644
+index 26df2ff32f..4320efaef5 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -110,6 +110,21 @@ public abstract class PlayerList {
@@ -32,5 +32,5 @@ index 1e3dd22e5..23562388a 100644
          entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
          String s1 = "local";
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0042-Configurable-Chunk-IO-Thread-Base-Count.patch

@@ -1,43 +0,0 @@
-From 3f3d6fcab054bb9d075535721e4dff0b5fb68b36 Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Wed, 2 Mar 2016 23:46:57 -0600
-Subject: [PATCH] Configurable Chunk IO Thread Base Count
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d0eb7c0fc2..12a56f6147 100644
---- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -208,4 +208,9 @@ public class PaperConfig {
-                 " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
-                 " - Length: " + timeSummary(Timings.getHistoryLength() / 20));
-     }
-+
-+    public static int minChunkLoadThreads = 2;
-+    private static void chunkLoadThreads() {
-+        minChunkLoadThreads = Math.min(6, getInt("settings.min-chunk-load-threads", 2)); // Keep people from doing stupid things with max of 6
-+    }
- }
-diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index e4fd9bc604..7b7a3d01b9 100644
---- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-+++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-@@ -1,5 +1,6 @@
- package org.bukkit.craftbukkit.chunkio;
- 
-+import com.destroystokyo.paper.PaperConfig;
- import net.minecraft.server.Chunk;
- import net.minecraft.server.ChunkProviderServer;
- import net.minecraft.server.ChunkRegionLoader;
-@@ -7,7 +8,7 @@ import net.minecraft.server.World;
- import org.bukkit.craftbukkit.util.AsynchronousExecutor;
- 
- public class ChunkIOExecutor {
--    static final int BASE_THREADS = 1;
-+    static final int BASE_THREADS = PaperConfig.minChunkLoadThreads; // Paper
-     static final int PLAYERS_PER_THREAD = 50;
- 
-     private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
--- 
-2.19.0
-

Spigot-Server-Patches/0043-Configurable-Disabling-Cat-Chest-Detection.patch

@@ -1,4 +1,4 @@
-From ccf869e8a33ffd31f1c7098cfff42a9fd7d2e743 Mon Sep 17 00:00:00 2001
+From 8405fca5dd7106f16174a4f33ebc7d50a4ec3a96 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Configurable Disabling Cat Chest Detection

Spigot-Server-Patches/0044-Ensure-commands-are-not-ran-async.patch

@@ -1,4 +1,4 @@
-From 320d0a1aa6bf90279d552231fde09b66da0ef1ca Mon Sep 17 00:00:00 2001
+From 1f4c8bf51994ff58179cc8e6ca23afac8890230f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async

Spigot-Server-Patches/0045-All-chunks-are-slime-spawn-chunks-toggle.patch

@@ -1,4 +1,4 @@
-From dfaa55f4e9b36525ab7f7157051499109b735547 Mon Sep 17 00:00:00 2001
+From 7772db378d231dfad0f3aff06c04b9e90407ec5f Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle

Spigot-Server-Patches/0046-Optimize-Pathfinding.patch

@@ -1,4 +1,4 @@
-From 715fb2ad02cc5da7554f941ec7d7958406f0bffb Mon Sep 17 00:00:00 2001
+From 4eb56052b0b279c261b87dc066fc9840888f694c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding
@@ -47,5 +47,5 @@ index d1d16b25d0..5d6f726d05 100644
      }
  
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0047-Avoid-hopper-searches-if-there-are-no-items.patch

@@ -1,4 +1,4 @@
-From 5a87db053c7f449bbf969d895202b3fb6ed82ed4 Mon Sep 17 00:00:00 2001
+From ada7db3a06c6a718dfb76ef7a52e15e1a165bdda Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
@@ -14,7 +14,7 @@ And since minecart hoppers are used _very_ rarely near we can avoid alot of sear
 Combined, this adds up a lot.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 8f2de5a327..3647d12ee2 100644
+index 397798cf28..3123c80db9 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -91,6 +91,10 @@ public class Chunk implements IChunkAccess {
@@ -52,7 +52,7 @@ index 8f2de5a327..3647d12ee2 100644
          entity.setCurrentChunk(null);
          entityCounts.decrement(entity.getMinecraftKeyString());
          // Paper end
-@@ -924,6 +938,15 @@ public class Chunk implements IChunkAccess {
+@@ -949,6 +963,15 @@ public class Chunk implements IChunkAccess {
              if (!this.entitySlices[k].isEmpty()) {
                  Iterator iterator = this.entitySlices[k].iterator();
  
@@ -68,7 +68,7 @@ index 8f2de5a327..3647d12ee2 100644
                  while (iterator.hasNext()) {
                      Entity entity1 = (Entity) iterator.next();
  
-@@ -960,7 +983,18 @@ public class Chunk implements IChunkAccess {
+@@ -985,7 +1008,18 @@ public class Chunk implements IChunkAccess {
          i = MathHelper.clamp(i, 0, this.entitySlices.length - 1);
          j = MathHelper.clamp(j, 0, this.entitySlices.length - 1);
  

Spigot-Server-Patches/0048-Expose-server-CommandMap.patch

@@ -1,11 +1,11 @@
-From 91efddcf73257353ca417fd45b8cf87ff994e49f Mon Sep 17 00:00:00 2001
+From 329d2e7e15e9a401aeab8a4c96fd32e738800d57 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7f711cd64..267224c69 100644
+index 7f711cd642..267224c69c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1638,6 +1638,7 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0049-Be-a-bit-more-informative-in-maxHealth-exception.patch

@@ -1,11 +1,11 @@
-From 159d7089d7b7173190d8b6453c0aea61acfc0ae5 Mon Sep 17 00:00:00 2001
+From 62e5eaac06b42adfec37d77a1e29dabfc855d7f3 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index ae402a2bf4..9079f5e903 100644
+index cc9e48d585..dff0dd2e9a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -98,7 +98,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -21,5 +21,5 @@ index ae402a2bf4..9079f5e903 100644
  
          getHandle().setHealth((float) health);
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0050-Player-Tab-List-and-Title-APIs.patch

@@ -1,4 +1,4 @@
-From 445bd2998dd5b384883f8ecc382ce11d980d5c66 Mon Sep 17 00:00:00 2001
+From 636e742ec2316e633fb571f41ef8e6e4a6fdb4c1 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
@@ -54,7 +54,7 @@ index 267b69de30..29cbe15a82 100644
  
          if (this.a == PacketPlayOutTitle.EnumTitleAction.TIMES) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3cc16b6923..f518e94fe9 100644
+index 2ab720d73a..9e51645c30 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1,5 +1,6 @@
@@ -162,5 +162,5 @@ index 3cc16b6923..f518e94fe9 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0051-Ensure-inv-drag-is-in-bounds.patch

@@ -1,11 +1,11 @@
-From 383cb078929132e57e648249639e8fc7cd507ea4 Mon Sep 17 00:00:00 2001
+From 57db0c39f7754d65592693b68263e83dbd7e6846 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
 
 
 diff --git a/src/main/java/net/minecraft/server/Container.java b/src/main/java/net/minecraft/server/Container.java
-index 0ae0b5ed8..1573c0559 100644
+index 0ae0b5ed82..1573c05594 100644
 --- a/src/main/java/net/minecraft/server/Container.java
 +++ b/src/main/java/net/minecraft/server/Container.java
 @@ -139,7 +139,7 @@ public abstract class Container {
@@ -18,5 +18,5 @@ index 0ae0b5ed8..1573c0559 100644
                  itemstack1 = playerinventory.getCarried();
                  if (slot != null && a(slot, itemstack1, true) && slot.isAllowed(itemstack1) && (this.dragType == 2 || itemstack1.getCount() > this.h.size()) && this.b(slot)) {
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0052-Change-implementation-of-tile-entity-removal-list.patch

@@ -1,11 +1,11 @@
-From 7c6c6994aef966b58c6c45848d922e469a53ec52 Mon Sep 17 00:00:00 2001
+From 2eeade3b60ffa9d2da91ae718e6c0ec98986f926 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4a457e3302..fbcdf9ecaf 100644
+index 352a7f25a7..65e84b666f 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -73,11 +73,11 @@ public abstract class World implements IEntityAccess, GeneratorAccess, IIBlockAc

Spigot-Server-Patches/0053-Add-configurable-portal-search-radius.patch

@@ -1,4 +1,4 @@
-From 46029afee41c28fb042bb48bab28a32a293bf7bd Mon Sep 17 00:00:00 2001
+From ee19b52c8f80ea7fb920ff6736e719a610659b9d Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius

Spigot-Server-Patches/0054-Add-velocity-warnings.patch

@@ -1,11 +1,11 @@
-From d58db3ae2af3c2a90f937dab47954651fcf9f873 Mon Sep 17 00:00:00 2001
+From 901aeed4b57279cd6901464e6643049fc57e2a5f Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 267224c69..17fdc58bd 100644
+index 267224c69c..17fdc58bd0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -196,6 +196,7 @@ public final class CraftServer implements Server {
@@ -17,7 +17,7 @@ index 267224c69..17fdc58bd 100644
      private final class BooleanWrapper {
          private boolean value = true;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 0c9b7276f..ae705e86f 100644
+index 0c9b7276fc..ae705e86f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 @@ -264,12 +264,44 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@@ -66,7 +66,7 @@ index 0c9b7276f..ae705e86f 100644
      public double getHeight() {
          return getHandle().length;
 diff --git a/src/main/java/org/spigotmc/WatchdogThread.java b/src/main/java/org/spigotmc/WatchdogThread.java
-index 91b8aa6a1..0c106ea9c 100644
+index 91b8aa6a16..0c106ea9c5 100644
 --- a/src/main/java/org/spigotmc/WatchdogThread.java
 +++ b/src/main/java/org/spigotmc/WatchdogThread.java
 @@ -66,7 +66,19 @@ public class WatchdogThread extends Thread

Spigot-Server-Patches/0055-Configurable-inter-world-teleportation-safety.patch

@@ -1,4 +1,4 @@
-From 59c58eda01136297cb0ecc512f42eeb3abeb6ba0 Mon Sep 17 00:00:00 2001
+From 96c325739ed00f1c7e01805d6c3fd11a457faac0 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Configurable inter-world teleportation safety
@@ -43,7 +43,7 @@ index 4320efaef5..9f2c7d3f45 100644
              entityplayer.getBukkitEntity().setVelocity(velocity);
          }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index f518e94fe9..42ee0efc1b 100644
+index 9e51645c30..15a99220ca 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -714,7 +714,8 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/0056-Add-exception-reporting-event.patch

@@ -1,4 +1,4 @@
-From 29d87f4766b15630691b1f4cfe68a506109bc545 Mon Sep 17 00:00:00 2001
+From 1974e5a1120239134abe1baa64fb13d61704831f Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -50,7 +50,7 @@ index 0000000000..93397188b7
 +}
 \ No newline at end of file
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 3647d12ee2..fc0f052c70 100644
+index 3123c80db9..968cf6ec65 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -1,5 +1,6 @@

Spigot-Server-Patches/0057-Don-t-nest-if-we-don-t-need-to-when-cerealising-text.patch

@@ -1,4 +1,4 @@
-From 7e5e4e0ac9f03e3ae15e7840536e99d085745778 Mon Sep 17 00:00:00 2001
+From 366c331315abcf82654e47d3faf4e192d5422e87 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text
@@ -6,7 +6,7 @@ Subject: [PATCH] Don't nest if we don't need to when cerealising text
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutChat.java b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
-index 28a262835..eba6aadad 100644
+index 28a2628350..eba6aadad7 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutChat.java
 @@ -27,7 +27,14 @@ public class PacketPlayOutChat implements Packet<PacketListenerPlayOut> {
@@ -26,5 +26,5 @@ index 28a262835..eba6aadad 100644
              packetdataserializer.a(this.a);
          }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0058-Disable-Scoreboards-for-non-players-by-default.patch

@@ -1,4 +1,4 @@
-From 24304ff50be7b3cf2f813bfaebc10574d2eb0e89 Mon Sep 17 00:00:00 2001
+From 8db6f7dff5c3f970e46f8f6bb6005c7067e235e0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default

Spigot-Server-Patches/0059-Add-methods-for-working-with-arrows-stuck-in-living-.patch

@@ -1,11 +1,11 @@
-From 1732eed30441f263fee9c251e84341f0c7fdebf9 Mon Sep 17 00:00:00 2001
+From 539dda3f9de6eb64b362b456ecc96d83ee05ee89 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 549205ecaa..ac301d379b 100644
+index dff0dd2e9a..09cf843d46 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 @@ -512,4 +512,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
@@ -26,5 +26,5 @@ index 549205ecaa..ac301d379b 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0060-Complete-resource-pack-API.patch

@@ -1,11 +1,11 @@
-From 22ccbf55c661d74d594b10f808239aff3eb18850 Mon Sep 17 00:00:00 2001
+From 5c95037bbbfbc205d23d3c492d634c31d69e9da8 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 42ee0efc1b..cd32239132 100644
+index 15a99220ca..33bbda62f2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -128,6 +128,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -53,5 +53,5 @@ index 42ee0efc1b..cd32239132 100644
      private final Player.Spigot spigot = new Player.Spigot()
      {
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0061-Chunk-save-queue-improvements.patch

@@ -1,4 +1,4 @@
-From 8614fe1a1f8fa80b14d30b1b9887a169ecff6e51 Mon Sep 17 00:00:00 2001
+From a9fa65bc8f28a373e04a504b000976a25c3ec2b7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
@@ -26,12 +26,12 @@ Then finally, Sleeping will by default be removed, but due to known issues with
 But if sleeps are to remain enabled, we at least lower the sleep interval so it doesn't have as much negative impact.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 12a56f6147..18296f1e1b 100644
+index d0eb7c0fc2..ad3433059d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -213,4 +213,10 @@ public class PaperConfig {
-     private static void chunkLoadThreads() {
-         minChunkLoadThreads = Math.min(6, getInt("settings.min-chunk-load-threads", 2)); // Keep people from doing stupid things with max of 6
+@@ -208,4 +208,10 @@ public class PaperConfig {
+                 " - Interval: " + timeSummary(Timings.getHistoryInterval() / 20) +
+                 " - Length: " + timeSummary(Timings.getHistoryLength() / 20));
      }
 +
 +    public static boolean enableFileIOThreadSleep;

Spigot-Server-Patches/0062-Chunk-Save-Reattempt.patch

@@ -1,4 +1,4 @@
-From 3cd840042adadf44252ecfc09aa287e8d531c74b Mon Sep 17 00:00:00 2001
+From 8b104aaf5b009efc9c04ac1839443575da074737 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt
@@ -54,5 +54,5 @@ index e5115863ec..2217adf99c 100644
  
      public static synchronized boolean chunkExists(File file, int i, int j) {
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0063-Default-loading-permissions.yml-before-plugins.patch

@@ -1,4 +1,4 @@
-From be0d1a10650fe1ca271d8f011029fc4f92ce24bf Mon Sep 17 00:00:00 2001
+From 03dc024bc7d536a6744622390a0bd01046d03cb9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -16,10 +16,10 @@ modify that. Under the previous logic, plugins were unable (cleanly) override pe
 A config option has been added for those who depend on the previous behavior, but I don't expect that.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 18296f1e1b..5ae78efdfe 100644
+index ad3433059d..88c465ef1c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -219,4 +219,9 @@ public class PaperConfig {
+@@ -214,4 +214,9 @@ public class PaperConfig {
          enableFileIOThreadSleep = getBoolean("settings.sleep-between-chunk-saves", false);
          if (enableFileIOThreadSleep) Bukkit.getLogger().info("Enabled sleeping between chunk saves, beware of memory issues");
      }

Spigot-Server-Patches/0064-Allow-Reloading-of-Custom-Permissions.patch

@@ -1,4 +1,4 @@
-From d7d0b571e979d10fc654c34ab1bea1c307b46e76 Mon Sep 17 00:00:00 2001
+From 34257015af334cb3e1e2f7f98ebf3085d24b5f13 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Custom Permissions
 https://github.com/PaperMC/Paper/issues/49
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 385063d8a..583e31d59 100644
+index 385063d8aa..583e31d59b 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -2003,5 +2003,23 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0065-Remove-Metadata-on-reload.patch

@@ -1,4 +1,4 @@
-From a374a3a2d5f52e956f9059f9698cc7f16eeb8b37 Mon Sep 17 00:00:00 2001
+From c89b7959440619afca8a6738df1e224d6efd61f4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
@@ -7,7 +7,7 @@ Metadata is not meant to persist reload as things break badly with non primitive
 This will remove metadata on reload so it does not crash everything if a plugin uses it.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 583e31d59..eb17d5e95 100644
+index 583e31d59b..eb17d5e957 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -794,8 +794,18 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0066-Undead-horse-leashing.patch

@@ -1,4 +1,4 @@
-From 31db0c295b6a7795af976ad47c1303ecb3b87f76 Mon Sep 17 00:00:00 2001
+From dffcbee647e4d7391d244401c9df2ff96d1a2e1c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing

Spigot-Server-Patches/0067-Handle-Item-Meta-Inconsistencies.patch

@@ -1,4 +1,4 @@
-From fe9f75e118fe7e2a336fbe522a55caf9ecdb5f74 Mon Sep 17 00:00:00 2001
+From 9abc8366e45aaefa1b77f49d19c02cd94c6accc6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 May 2015 23:00:19 -0400
 Subject: [PATCH] Handle Item Meta Inconsistencies
@@ -18,7 +18,7 @@ For consistency, the old API methods now forward to use the
 ItemMeta API equivalents, and should deprecate the old API's.
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 318c4204d..56787ed25 100644
+index 318c4204df..56787ed25c 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -7,6 +7,8 @@ import com.mojang.brigadier.StringReader;
@@ -78,7 +78,7 @@ index 318c4204d..56787ed25 100644
  
      public boolean hasEnchantments() {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
-index 1d0580ff7..2733cda40 100644
+index 1d0580ff7f..2733cda407 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftItemStack.java
 @@ -4,6 +4,7 @@ import static org.bukkit.craftbukkit.inventory.CraftMetaItem.ENCHANTMENTS;
@@ -201,7 +201,7 @@ index 1d0580ff7..2733cda40 100644
  
      static Map<Enchantment, Integer> getEnchantments(net.minecraft.server.ItemStack item) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
-index 99276f116..652866881 100644
+index 99276f1165..6528668816 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaItem.java
 @@ -8,6 +8,7 @@ import java.lang.reflect.Constructor;

Spigot-Server-Patches/0068-Configurable-Non-Player-Arrow-Despawn-Rate.patch

@@ -1,4 +1,4 @@
-From 378942b6c4acb8ba353194471f3e007ef24de4d4 Mon Sep 17 00:00:00 2001
+From 7b8d0f3c5d696a6fb1857fe8b1f6f1a94cca14ef Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 15:12:22 -0400
 Subject: [PATCH] Configurable Non Player Arrow Despawn Rate

Spigot-Server-Patches/0069-Add-World-Util-Methods.patch

@@ -1,4 +1,4 @@
-From 9b89ac214dad604784dbbe857ea7a1941f2a2fdc Mon Sep 17 00:00:00 2001
+From c4f46dc872cdc9d8a76ca4f785daa2cd89c1d1e7 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 20:16:03 -0400
 Subject: [PATCH] Add World Util Methods
@@ -6,7 +6,7 @@ Subject: [PATCH] Add World Util Methods
 Methods that can be used for other patches to help improve logic.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index ab579b9052..b006282f38 100644
+index 968cf6ec65..36def82bca 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -633,6 +633,7 @@ public class Chunk implements IChunkAccess {

Spigot-Server-Patches/0070-Optimized-Light-Level-Comparisons.patch

@@ -1,4 +1,4 @@
-From 75b8c8e24cd6b38751500103dee0b8add52379a5 Mon Sep 17 00:00:00 2001
+From d1ca33ace69f0cd276ba58742fe9ff06482f4473 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 21:22:56 -0400
 Subject: [PATCH] Optimized Light Level Comparisons
@@ -34,7 +34,7 @@ index 42478d1fed..7426d14cbf 100644
              world.captureTreeGeneration = true;
              // CraftBukkit end
 diff --git a/src/main/java/net/minecraft/server/BlockStem.java b/src/main/java/net/minecraft/server/BlockStem.java
-index 4fc8c5d3c6..0fc39bb9fb 100644
+index dd309030e5..7cddfc380c 100644
 --- a/src/main/java/net/minecraft/server/BlockStem.java
 +++ b/src/main/java/net/minecraft/server/BlockStem.java
 @@ -27,7 +27,7 @@ public class BlockStem extends BlockPlant implements IBlockFragilePlantElement {
@@ -85,5 +85,5 @@ index 1ab3072cc3..e5170bff5b 100644
                          if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a_(entityzombie, entityzombie.getBoundingBox()) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()) && !this.world.containsLiquid(entityzombie.getBoundingBox())) {
                              this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0071-Pass-world-to-Village-creation.patch

@@ -1,4 +1,4 @@
-From e1a7033e3c4af7eb6dae4c51bf3a2f02ea02654d Mon Sep 17 00:00:00 2001
+From 4794e17198632431883eba3787fdbbf99df2f43b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 19 Mar 2016 15:16:54 -0400
 Subject: [PATCH] Pass world to Village creation
@@ -32,5 +32,5 @@ index f87e8e05af..bda67faefe 100644
          this.d = BlockPosition.ZERO;
          this.j = Maps.newHashMap();
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0072-Custom-replacement-for-eaten-items.patch

@@ -1,11 +1,11 @@
-From 4182ffd42847bd0fdcfdedbdee5371e3b9a0b919 Mon Sep 17 00:00:00 2001
+From 8fb138862913c22188505f59838c6b2724b7d361 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 91baaa506..c3936c4e3 100644
+index 91baaa5062..c3936c4e36 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2602,12 +2602,13 @@ public abstract class EntityLiving extends Entity {

Spigot-Server-Patches/0073-handle-NaN-health-absorb-values-and-repair-bad-data.patch

@@ -1,11 +1,11 @@
-From ea2c2b6a9ec6632dc008eb223f2d825e77205144 Mon Sep 17 00:00:00 2001
+From 0e5ec8f1cd5d4e55e15adbbea9140341efdb7e6f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index c3936c4e3..d41a7fb08 100644
+index c3936c4e36..d41a7fb087 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -499,7 +499,13 @@ public abstract class EntityLiving extends Entity {
@@ -44,7 +44,7 @@ index c3936c4e3..d41a7fb08 100644
          }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index cd3223913..fed28ecd9 100644
+index 33bbda62f2..c575fb933c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1563,6 +1563,7 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/0074-Catch-Async-PlayerChunkMap-operations.patch

@@ -1,11 +1,11 @@
-From e67d8424ff946ac6c96671f0a2b1fd6843ec7320 Mon Sep 17 00:00:00 2001
+From 5f489d6f0d19763383fc223b8f8b1a0b3743ccf7 Mon Sep 17 00:00:00 2001
 From: Daniel Ennis <dennis@icontact.com>
 Date: Sun, 20 Mar 2016 15:22:42 -0400
 Subject: [PATCH] Catch Async PlayerChunkMap operations
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 44f1ad90..174389e8 100644
+index fb593529e1..a69d510dd1 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -442,10 +442,12 @@ public class PlayerChunkMap {
@@ -22,5 +22,5 @@ index 44f1ad90..174389e8 100644
          long i = d(chunkcoordintpair.x, chunkcoordintpair.z);
  
 -- 
-2.18.0.windows.1
+2.19.0
 

Spigot-Server-Patches/0075-Waving-banner-workaround.patch

@@ -1,4 +1,4 @@
-From be2605540c49de075459ddf5825d142b945c57eb Mon Sep 17 00:00:00 2001
+From 2a29c283343e48329376f2c90d533e7bdd3bd6d0 Mon Sep 17 00:00:00 2001
 From: Gabscap <git@gabscap.de>
 Date: Sat, 19 Mar 2016 22:25:11 +0100
 Subject: [PATCH] Waving banner workaround
@@ -34,5 +34,5 @@ index 731b96dea2..2a0fd2fbc0 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0076-Use-a-Shared-Random-for-Entities.patch

@@ -1,4 +1,4 @@
-From d9e146f01679a6389ff7838846ff6530b8333a55 Mon Sep 17 00:00:00 2001
+From 904838a83dcfe4d279996358ec02ff87a14ed35a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:33:47 -0400
 Subject: [PATCH] Use a Shared Random for Entities
@@ -6,7 +6,7 @@ Subject: [PATCH] Use a Shared Random for Entities
 Reduces memory usage and provides ensures more randomness, Especially since a lot of garbage entity objects get created.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 27020c7e29..07172d3dd8 100644
+index 43ceb2fb18..e31c97fb72 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -51,6 +51,20 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -40,5 +40,5 @@ index 27020c7e29..07172d3dd8 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0077-Don-t-teleport-dead-entities.patch

@@ -1,4 +1,4 @@
-From 9045b80f44943e175475fc97925e8b453f5f3e55 Mon Sep 17 00:00:00 2001
+From 6af064d807377a45c74cb75e73e28d775d252e27 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 00:55:23 -0400
 Subject: [PATCH] Don't teleport dead entities

Spigot-Server-Patches/0078-Optimize-Chunk-Access.patch

@@ -1,4 +1,4 @@
-From 886011f86b3e4c7e60676ac8d08977677187cafe Mon Sep 17 00:00:00 2001
+From 14e26ad623fc54b7f4e0c647f40b9cdcca79a88f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Aug 2015 01:15:02 -0400
 Subject: [PATCH] Optimize Chunk Access
@@ -9,7 +9,7 @@ getChunkAt is called for the same chunk multiple times in a row, often from getT
 Optimize this look up by using a Last Access cache.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkMap.java b/src/main/java/net/minecraft/server/ChunkMap.java
-index fbebd4591c..b941676829 100644
+index 4b8b77710b..df967ff07d 100644
 --- a/src/main/java/net/minecraft/server/ChunkMap.java
 +++ b/src/main/java/net/minecraft/server/ChunkMap.java
 @@ -15,6 +15,7 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
@@ -20,7 +20,7 @@ index fbebd4591c..b941676829 100644
          Chunk chunk1 = (Chunk) super.put(i, chunk);
          ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i);
  
-@@ -98,8 +99,22 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
+@@ -73,8 +74,22 @@ public class ChunkMap extends Long2ObjectOpenHashMap<Chunk> {
              }
          }
  
@@ -44,7 +44,7 @@ index fbebd4591c..b941676829 100644
      public Chunk a(Object object) {
          return this.a(((Long) object).longValue());
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index d73034f329..b1e6901090 100644
+index d16fc452e3..2d10f4aa37 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -78,15 +78,16 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -86,5 +86,5 @@ index d73034f329..b1e6901090 100644
          return true;
      }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0079-Configurable-spawn-chances-for-skeleton-horses.patch

@@ -1,4 +1,4 @@
-From ad6c8ae5dadadd8b7fb23d9c93f1aba50c6a4987 Mon Sep 17 00:00:00 2001
+From 78959508ddb0744bf1e6faed38c6b79c0a07775b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 22 Mar 2016 12:04:28 -0500
 Subject: [PATCH] Configurable spawn chances for skeleton horses

Spigot-Server-Patches/0080-Optimize-isValidLocation-getType-and-getBlockData-fo.patch

@@ -1,4 +1,4 @@
-From a13d2700664c3333e72da26c2ea598c4cad882f2 Mon Sep 17 00:00:00 2001
+From ddf05e292f18cdd911fd1360401b33e317016bd3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize isValidLocation, getType and getBlockData for inling
@@ -52,7 +52,7 @@ index 5ed34cf7e3..f4ed98d2d9 100644
          public MutableBlockPosition() {
              this(0, 0, 0);
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index b006282f38..a36034cc52 100644
+index 36def82bca..0e84fd283d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -421,12 +421,24 @@ public class Chunk implements IChunkAccess {

Spigot-Server-Patches/0081-Access-items-by-EquipmentSlot.patch

@@ -1,4 +1,4 @@
-From 0afff1632941d3adfb13808187d1578188c96c74 Mon Sep 17 00:00:00 2001
+From e39ea75f06d5a7f85143686fa4f1ebc0e8964f93 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
@@ -64,5 +64,5 @@ index 6cbe069562..7b62f26d7c 100644
 +    // Paper end
  }
 -- 
-2.18.0
+2.19.0
 

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

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

Spigot-Server-Patches/0083-Entity-AddTo-RemoveFrom-World-Events.patch

@@ -1,4 +1,4 @@
-From 782de7ab3e7d34f4181da096d22a103eb3078a7a Mon Sep 17 00:00:00 2001
+From d3b16edfb2a1998d0165e0c286da1ba9673eafe9 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:32:58 -0400
 Subject: [PATCH] Entity AddTo/RemoveFrom World Events

Spigot-Server-Patches/0084-Configurable-Chunk-Inhabited-Timer.patch

@@ -1,4 +1,4 @@
-From 813f611f2db93839add4f0664004ec2221717b9b Mon Sep 17 00:00:00 2001
+From ac97f8b532d4178a91324a72b5e3d51d26397d53 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:46:14 -0400
 Subject: [PATCH] Configurable Chunk Inhabited Timer
@@ -23,10 +23,10 @@ index deb4ec2543..dd23ea45e5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index b783cdf8ed..9214b50b1c 100644
+index 0e84fd283d..41d3aaa80b 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
-@@ -1258,7 +1258,7 @@ public class Chunk implements IChunkAccess {
+@@ -1283,7 +1283,7 @@ public class Chunk implements IChunkAccess {
      }
  
      public long m() {

Spigot-Server-Patches/0085-EntityPathfindEvent.patch

@@ -1,4 +1,4 @@
-From dcfdcaf5f2a8ecd65785d2c4b729e674bf262523 Mon Sep 17 00:00:00 2001
+From 662cf614a03e90feb9aaad1d22300aee82391b4c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -35,5 +35,5 @@ index 5d6f726d05..a8b070ed32 100644
                  float fx = this.j();
                  this.b.methodProfiler.a("pathfind");
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0086-Reduce-IO-ops-opening-a-new-region-file.patch

@@ -1,4 +1,4 @@
-From 7e1a19b733518affda90a116c3576335ae14f565 Mon Sep 17 00:00:00 2001
+From 3dcbb08c24ce42132cca1ad5df0ddddb756eae21 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 06:56:23 +0300
 Subject: [PATCH] Reduce IO ops opening a new region file.
@@ -49,5 +49,5 @@ index f4405be395..5d2853b9ce 100644
              }
          } catch (IOException ioexception) {
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0087-Sanitise-RegionFileCache-and-make-configurable.patch

@@ -1,4 +1,4 @@
-From 972dd99cdc558049c41b4e92ce7974b3ddefff8c Mon Sep 17 00:00:00 2001
+From 7d5b2bb1ce854b24a8ef1ec40574698774fb70f6 Mon Sep 17 00:00:00 2001
 From: Antony Riley <antony@cyberiantiger.org>
 Date: Tue, 29 Mar 2016 08:22:55 +0300
 Subject: [PATCH] Sanitise RegionFileCache and make configurable.
@@ -11,10 +11,10 @@ The implementation uses a LinkedHashMap as an LRU cache (modified from HashMap).
 The maximum size of the RegionFileCache is also made configurable.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 5ae78efdfe..94ba257c2d 100644
+index 88c465ef1c..121a87662c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -224,4 +224,9 @@ public class PaperConfig {
+@@ -219,4 +219,9 @@ public class PaperConfig {
      private static void loadPermsBeforePlugins() {
          loadPermsBeforePlugins = getBoolean("settings.load-permissions-yml-before-plugins", true);
      }

Spigot-Server-Patches/0088-Use-Optimized-Collections.patch

@@ -1,4 +1,4 @@
-From 7acdaa46de379b7d8fc5e33700adbbffdcae5816 Mon Sep 17 00:00:00 2001
+From 1ab2476a22758ca4105962280dde11b9464b8966 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 30 Mar 2016 02:13:24 -0400
 Subject: [PATCH] Use Optimized Collections
@@ -34,5 +34,5 @@ index 2b27ae7973..7191185ba7 100644
      private boolean f = true;
      private boolean g;
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0089-Do-not-load-chunks-for-light-checks.patch

@@ -1,4 +1,4 @@
-From 3ab90e2a7588d50861f13f319df4e6854c893d80 Mon Sep 17 00:00:00 2001
+From 06c4f9aff700a2985587ebb592453724eaf0852e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 31 Mar 2016 19:17:58 -0400
 Subject: [PATCH] Do not load chunks for light checks

Spigot-Server-Patches/0090-Add-PlayerUseUnknownEntityEvent.patch

@@ -1,4 +1,4 @@
-From 9555bec7234cbae0515c187301f36f774c8dee55 Mon Sep 17 00:00:00 2001
+From 43cd905fa897553b08251ada854025047bc63f6d Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 05:09:16 -0400
 Subject: [PATCH] Add PlayerUseUnknownEntityEvent

Spigot-Server-Patches/0091-Fix-reducedDebugInfo-not-initialized-on-client.patch

@@ -1,11 +1,11 @@
-From bf2f558773207bf9d83d115bb4a6edce244d4d30 Mon Sep 17 00:00:00 2001
+From a8396718f64ff043cf49da5e9056902cf50ce9d5 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 2 Apr 2016 20:37:03 -0400
 Subject: [PATCH] Fix reducedDebugInfo not initialized on client
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 8b3c2d2874..7f324a9c0f 100644
+index 9f2c7d3f45..8121f8e40a 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -162,6 +162,7 @@ public abstract class PlayerList {
@@ -17,5 +17,5 @@ index 8b3c2d2874..7f324a9c0f 100644
          entityplayer.getStatisticManager().c();
          entityplayer.B().a(entityplayer);
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0092-Configurable-Grass-Spread-Tick-Rate.patch

@@ -1,4 +1,4 @@
-From 92db70f012d7896c9da4fc6386c51e20df08d2a1 Mon Sep 17 00:00:00 2001
+From dc7aac4fbfb58430d712ad94f241daaab090468c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 16:28:17 -0400
 Subject: [PATCH] Configurable Grass Spread Tick Rate

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

@@ -1,4 +1,4 @@
-From 6a1c0d9780b2f6e6bfe3f23b76f594a7804aa0ee Mon Sep 17 00:00:00 2001
+From ba5a11cd178572ea41951140c92c56790a210921 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world

Spigot-Server-Patches/0094-Fix-Cancelling-BlockPlaceEvent-triggering-physics.patch

@@ -1,4 +1,4 @@
-From 9aa96ab2ab9656b172f1562f9fe6234b5426f009 Mon Sep 17 00:00:00 2001
+From 25a25007f6f5bd564e33ff440b2d81fbcc136649 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 3 Apr 2016 17:48:50 -0400
 Subject: [PATCH] Fix Cancelling BlockPlaceEvent triggering physics

Spigot-Server-Patches/0095-Don-t-spam-reload-spawn-chunks-in-nether-end.patch

@@ -1,4 +1,4 @@
-From 9c6d4121a51b48f1ec000fd2ad83947847a3cfcb Mon Sep 17 00:00:00 2001
+From dcc23b7c3d5bef992833093cc60898dee23f8662 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 19:42:22 -0400
 Subject: [PATCH] Don't spam reload spawn chunks in nether/end
@@ -25,7 +25,7 @@ index b4274cf0ec..796ce3103a 100644
          ForcedChunk forcedchunk = (ForcedChunk) this.a(this.worldProvider.getDimensionManager(), ForcedChunk::new, "chunks");
  
 diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
-index 517b1e7124..0e654ebf70 100644
+index 53ce7d5e11..e1fe195bf8 100644
 --- a/src/main/java/net/minecraft/server/WorldProvider.java
 +++ b/src/main/java/net/minecraft/server/WorldProvider.java
 @@ -72,7 +72,7 @@ public abstract class WorldProvider {

Spigot-Server-Patches/0096-Remove-Debug-checks-from-DataBits.patch

@@ -1,4 +1,4 @@
-From 15c0961341cb53d2ff8701e59812bd92a462b07e Mon Sep 17 00:00:00 2001
+From 369b5037160e7332a95789009a028599834eb2fb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Apr 2016 21:38:58 -0400
 Subject: [PATCH] Remove Debug checks from DataBits
@@ -42,5 +42,5 @@ index 0dc948a375..f4de7fcf4b 100644
          int k = j / 64;
          int l = ((i + 1) * this.b - 1) / 64;
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0097-Option-to-use-vanilla-per-world-scoreboard-coloring-.patch

@@ -1,4 +1,4 @@
-From 2f0129988321a32c8f6f02aebaf00ba68d9546aa Mon Sep 17 00:00:00 2001
+From be604d180094b2596fee95c693f438ff7c5f7f2d Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 6 Apr 2016 01:04:23 -0500
 Subject: [PATCH] Option to use vanilla per-world scoreboard coloring on names

Spigot-Server-Patches/0098-Workaround-for-setting-passengers-on-players.patch

@@ -1,4 +1,4 @@
-From 7bc3196c89fcd80331a6d656f015b0d782f77094 Mon Sep 17 00:00:00 2001
+From 0d433f35b10d9e6ee6a85e5f7bce2797096c5cc1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 10 Apr 2016 03:23:32 -0500
 Subject: [PATCH] Workaround for setting passengers on players
@@ -6,7 +6,7 @@ Subject: [PATCH] Workaround for setting passengers on players
 SPIGOT-1915 & GH-114
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index fed28ecd91..0c8cfd5fb9 100644
+index c575fb933c..3337d8c8e4 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -724,6 +724,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -28,5 +28,5 @@ index fed28ecd91..0c8cfd5fb9 100644
      public void setSneaking(boolean sneak) {
          getHandle().setSneaking(sneak);
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0099-Remove-unused-World-Tile-Entity-List.patch

@@ -1,4 +1,4 @@
-From cccb296c07e9a0e29a68c3b592277a3209d106de Mon Sep 17 00:00:00 2001
+From 46c4520fc8ce86b6c7406c19624ef3ac8aa02ba5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:25:28 -0400
 Subject: [PATCH] Remove unused World Tile Entity List

Spigot-Server-Patches/0100-Don-t-tick-Skulls-unused-code.patch

@@ -1,11 +1,11 @@
-From bc669d463febf4e1a5f4e4200fdedc4cf4b5ca00 Mon Sep 17 00:00:00 2001
+From 8039d15ff0deb8967a880ed84c71c85ad745e058 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 00:30:10 -0400
 Subject: [PATCH] Don't tick Skulls - unused code
 
 
 diff --git a/src/main/java/net/minecraft/server/TileEntitySkull.java b/src/main/java/net/minecraft/server/TileEntitySkull.java
-index af5e4093cc..85fd8dab60 100644
+index 3a54ebdb15..e59f3c21d7 100644
 --- a/src/main/java/net/minecraft/server/TileEntitySkull.java
 +++ b/src/main/java/net/minecraft/server/TileEntitySkull.java
 @@ -24,7 +24,7 @@ import com.mojang.authlib.ProfileLookupCallback;
@@ -18,5 +18,5 @@ index af5e4093cc..85fd8dab60 100644
      private GameProfile a;
      private int e;
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0101-Configurable-Player-Collision.patch

@@ -1,14 +1,14 @@
-From 0ad1c1c223f79070d9b2eb5da014f4eee0885730 Mon Sep 17 00:00:00 2001
+From 776221ada4181fe340fa35cdec74b65561f240b4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 13 Apr 2016 02:10:49 -0400
 Subject: [PATCH] Configurable Player Collision
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 94ba257c2d..24a3e94fc8 100644
+index 121a87662c..93c964d315 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -229,4 +229,9 @@ public class PaperConfig {
+@@ -224,4 +224,9 @@ public class PaperConfig {
      private static void regionFileCacheSize() {
          regionFileCacheSize = getInt("settings.region-file-cache-size", 256);
      }

Spigot-Server-Patches/0102-Add-handshake-event-to-allow-plugins-to-handle-clien.patch

@@ -1,4 +1,4 @@
-From fcaa96c04e21424f4853ee85135b726a78a3d2c9 Mon Sep 17 00:00:00 2001
+From 6bd2cb3f07f6001f2bb9a90878954079ed476ba9 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 13 Apr 2016 20:21:38 -0700
 Subject: [PATCH] Add handshake event to allow plugins to handle client
@@ -6,7 +6,7 @@ Subject: [PATCH] Add handshake event to allow plugins to handle client
 
 
 diff --git a/src/main/java/net/minecraft/server/HandshakeListener.java b/src/main/java/net/minecraft/server/HandshakeListener.java
-index 5b784002f5..2d57bdf40e 100644
+index 72d841af06..6aabdc2974 100644
 --- a/src/main/java/net/minecraft/server/HandshakeListener.java
 +++ b/src/main/java/net/minecraft/server/HandshakeListener.java
 @@ -72,8 +72,33 @@ public class HandshakeListener implements PacketHandshakingInListener {
@@ -45,5 +45,5 @@ index 5b784002f5..2d57bdf40e 100644
                      if ( split.length == 3 || split.length == 4 ) {
                          packethandshakinginsetprotocol.hostname = split[0];
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0103-Configurable-RCON-IP-address.patch

@@ -1,4 +1,4 @@
-From 6d27d1a5c0d2e8c63b6cc0e401a4a2bd8e6cf71f Mon Sep 17 00:00:00 2001
+From cb1af7a80ad9f9d6520c17f799c27b84242efbab Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 16 Apr 2016 00:39:33 -0400
 Subject: [PATCH] Configurable RCON IP address
@@ -19,5 +19,5 @@ index 32244b55a2..4bfd41af18 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0104-Prevent-Fire-from-loading-chunks.patch

@@ -1,4 +1,4 @@
-From 90bf2f4b99dcb11f07cb5152a27bc38d4e0e1118 Mon Sep 17 00:00:00 2001
+From 57322090640350505e3ab9d6e5950835a484c880 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 17 Apr 2016 17:27:09 -0400
 Subject: [PATCH] Prevent Fire from loading chunks
@@ -7,7 +7,7 @@ This causes the nether to spam unload/reload chunks, plus overall
 bad behavior.
 
 diff --git a/src/main/java/net/minecraft/server/BlockFire.java b/src/main/java/net/minecraft/server/BlockFire.java
-index 8339d6f056..25a8a1afdf 100644
+index ebf9d3510c..24573b4704 100644
 --- a/src/main/java/net/minecraft/server/BlockFire.java
 +++ b/src/main/java/net/minecraft/server/BlockFire.java
 @@ -162,6 +162,7 @@ public class BlockFire extends Block {
@@ -49,5 +49,5 @@ index 8339d6f056..25a8a1afdf 100644
  
              return i;
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0105-Implement-PlayerLocaleChangeEvent.patch

@@ -1,11 +1,11 @@
-From 27132f8d0653a6c8339c9bd68854275ed45e12f8 Mon Sep 17 00:00:00 2001
+From 5dd475cfe420792cb067c5c28ccfb0b2bb79c9e2 Mon Sep 17 00:00:00 2001
 From: Isaac Moore <rmsy@me.com>
 Date: Tue, 19 Apr 2016 14:09:31 -0500
 Subject: [PATCH] Implement PlayerLocaleChangeEvent
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a279bf93..a9fbb20f 100644
+index a279bf9383..a9fbb20f73 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -36,7 +36,7 @@ import org.bukkit.inventory.MainHand;
@@ -39,7 +39,7 @@ index a279bf93..a9fbb20f 100644
          this.ct = packetplayinsettings.e();
          this.getDataWatcher().set(EntityPlayer.bx, Byte.valueOf((byte) packetplayinsettings.f()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 0c8cfd5f..291b664b 100644
+index 3337d8c8e4..7c1444dff2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -1736,8 +1736,10 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -65,5 +65,5 @@ index 0c8cfd5f..291b664b 100644
  
          @Override
 -- 
-2.18.0.windows.1
+2.19.0
 

Spigot-Server-Patches/0106-EntityRegainHealthEvent-isFastRegen-API.patch

@@ -1,4 +1,4 @@
-From 65bc80f63ed83da9b191f3cd555cd6321aa482f9 Mon Sep 17 00:00:00 2001
+From 213af17f91d3ef8cb0685afe67ba8e45779e3bdf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 22 Apr 2016 01:43:11 -0500
 Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityRegainHealthEvent isFastRegen API
 Don't even get me started
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2d80f4e3e9..05546ff4db 100644
+index d41a7fb087..4fe91b5a2f 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -873,10 +873,16 @@ public abstract class EntityLiving extends Entity {
@@ -41,5 +41,5 @@ index 03dbd21ee8..aed3606bdc 100644
                  this.foodTickTimer = 0;
              }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0107-Add-ability-to-configure-frosted_ice-properties.patch

@@ -1,4 +1,4 @@
-From 3f001c5aae3187744325aec06a94e979bfcd335a Mon Sep 17 00:00:00 2001
+From 16527a0ec911199ac7ee943708d9997ca81b08ba Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 21 Apr 2016 23:51:55 -0700
 Subject: [PATCH] Add ability to configure frosted_ice properties

Spigot-Server-Patches/0108-remove-null-possibility-for-getServer-singleton.patch

@@ -1,4 +1,4 @@
-From e812bdd5c6d798f90b0f361e2c3c4c14c624e69c Mon Sep 17 00:00:00 2001
+From cfde7861f93d5d001dd84ec0490eb709c46e60dc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 28 Apr 2016 00:57:27 -0400
 Subject: [PATCH] remove null possibility for getServer singleton

Spigot-Server-Patches/0109-Improve-Maps-in-item-frames-performance-and-bug-fixe.patch

@@ -1,4 +1,4 @@
-From 99e93943b43879cdc1449e499a4aeb3e6529cb41 Mon Sep 17 00:00:00 2001
+From dc406506a9d9d30fd97e81991e7bd4974250223e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 29 Apr 2016 20:02:00 -0400
 Subject: [PATCH] Improve Maps (in item frames) performance and bug fixes

Spigot-Server-Patches/0110-LootTable-API-Replenishable-Lootables-Feature.patch

@@ -1,4 +1,4 @@
-From 1abf5eb6058a9e3eaeca3071d174db4d6336de67 Mon Sep 17 00:00:00 2001
+From f4c7b9955bc7319b2dcc07d7037ee8f860758a4c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature
@@ -520,7 +520,7 @@ index 0000000000..d50410532c
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 5e3a1094e8..eaec95bf54 100644
+index 83de2d63a5..1474209a1e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -69,6 +69,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke

Spigot-Server-Patches/0111-Do-not-load-chunks-for-pathfinding.patch

@@ -1,4 +1,4 @@
-From 4e72245ef416b9e944f5ab2db64458f4fde5c065 Mon Sep 17 00:00:00 2001
+From bc7f6e6e280068fc1cacb38f0fcca0902efe0597 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding
@@ -18,5 +18,5 @@ index ff740bc1a7..78adbf9062 100644
          }
  
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0112-Entity-Tracking-Improvements.patch

@@ -1,4 +1,4 @@
-From 60c4be3205cfad9d5c5253c083705fdfee0dd2be Mon Sep 17 00:00:00 2001
+From 72a1b85a6474a83316095da0c2cfe30cb1b365f5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Jun 2013 01:24:00 -0400
 Subject: [PATCH] Entity Tracking Improvements
@@ -7,7 +7,7 @@ If any part of a Vehicle/Passenger relationship is visible to a player,
 send all passenger/vehicles to the player in the chain.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index d070d68d..4d2e9788 100644
+index 1474209a1e..5e5c241669 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -72,6 +72,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,7 +19,7 @@ index d070d68d..4d2e9788 100644
          if (bukkitEntity == null) {
              bukkitEntity = CraftEntity.getEntity(world.getServer(), this);
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 6120c63a..a9d51641 100644
+index 6120c63a38..a9d51641c1 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -49,6 +49,7 @@ public class EntityTrackerEntry {
@@ -99,5 +99,5 @@ index 6120c63a..a9d51641 100644
  
      }
 -- 
-2.18.0.windows.1
+2.19.0
 

Spigot-Server-Patches/0113-Don-t-save-empty-scoreboard-teams-to-scoreboard.dat.patch

@@ -1,14 +1,14 @@
-From a307cfab4e99cd58eae334a625bd118d2cb6afda Mon Sep 17 00:00:00 2001
+From 188642430a7453eecdf6057b7fc60e4b4ffea7df Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 24a3e94fc8..369f503532 100644
+index 93c964d315..6743d59f28 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -234,4 +234,9 @@ public class PaperConfig {
+@@ -229,4 +229,9 @@ public class PaperConfig {
      private static void enablePlayerCollisions() {
          enablePlayerCollisions = getBoolean("settings.enable-player-collisions", true);
      }

Spigot-Server-Patches/0114-System-property-for-disabling-watchdoge.patch

@@ -1,4 +1,4 @@
-From 5fe9a031a9a71250a64c76d8f5e754b767ac2f19 Mon Sep 17 00:00:00 2001
+From eb5ad71f7aec293a9a071dfabcc1fa76d74230b3 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge
@@ -18,5 +18,5 @@ index 0c106ea9c5..57a4748a30 100644
                  Logger log = Bukkit.getServer().getLogger();
                  log.log( Level.SEVERE, "The server has stopped responding!" );
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0115-Optimize-EAR.patch

@@ -1,11 +1,11 @@
-From 1849db3a56ff8dff0d6eb4a6bd2825648e393a95 Mon Sep 17 00:00:00 2001
+From 985660e1b67c134bedf39833962111048d6d395a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Optimize EAR
 
 
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 27ec0f1d..454c1a58 100644
+index f52de10238..12040596df 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -2,6 +2,8 @@ package org.spigotmc;
@@ -66,5 +66,5 @@ index 27ec0f1d..454c1a58 100644
                  }
              }
 -- 
-2.18.0.windows.1
+2.19.0
 

Spigot-Server-Patches/0116-Optimize-UserCache-Thread-Safe.patch

@@ -1,4 +1,4 @@
-From a7a6e562a7b3335fd9550b0e14e1c02ca6da87fc Mon Sep 17 00:00:00 2001
+From 69dc8f855cc02a3f1b8016a9accd29960e48b796 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 20:47:41 -0400
 Subject: [PATCH] Optimize UserCache / Thread Safe
@@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ca5e4cd65a..13d3315b9c 100644
+index eb6ada935f..04d8c108b4 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -691,7 +691,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -98,5 +98,5 @@ index 0e168ad349..f8b7d695c6 100644
      }
  
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0117-Avoid-blocking-on-Network-Manager-creation.patch

@@ -1,4 +1,4 @@
-From 7df87e1be5fa99ab7bd6b364376e23073f72d41f Mon Sep 17 00:00:00 2001
+From 0e18207b7777c6f0c30703a5bf999b373c5e831e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 23:19:16 -0400
 Subject: [PATCH] Avoid blocking on Network Manager creation
@@ -43,5 +43,5 @@ index 9cff011dac..f04ce2fb03 100644
              if ( org.spigotmc.SpigotConfig.playerShuffle > 0 && MinecraftServer.currentTick % org.spigotmc.SpigotConfig.playerShuffle == 0 )
              {
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0118-Optional-TNT-doesn-t-move-in-water.patch

@@ -1,4 +1,4 @@
-From 611a1ded44d2d8ec46252f67a0ab9e57b0ea2681 Mon Sep 17 00:00:00 2001
+From fd33332cf965cc89f246b3a1007ebb534c13476c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional TNT doesn't move in water

Spigot-Server-Patches/0119-Faster-redstone-torch-rapid-clock-removal.patch

@@ -1,4 +1,4 @@
-From dff6889d61088dc838be37a573ddf1429ebc1157 Mon Sep 17 00:00:00 2001
+From b0b8145ed696c7f8761e5f48077eba9429a4a6a1 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Mon, 23 May 2016 12:12:37 +0200
 Subject: [PATCH] Faster redstone torch rapid clock removal
@@ -39,5 +39,5 @@ index 35abdee5e5..42cb2d47ca 100644
          public RedstoneUpdateInfo(BlockPosition blockposition, long i) {
              this.a = blockposition;
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0120-Ensure-Chunks-never-ever-load-async.patch

@@ -1,4 +1,4 @@
-From 2524c5992b465b4db1ccf20a94fd78e6decf5d53 Mon Sep 17 00:00:00 2001
+From b6cdf80b0353a657001aa33a1bf91d7c3f4a3cde Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 27 May 2016 21:41:26 -0400
 Subject: [PATCH] Ensure Chunks never ever load async
@@ -6,10 +6,10 @@ Subject: [PATCH] Ensure Chunks never ever load async
 Safely pushes the operation to main thread, then back to the posting thread
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-index 7b7a3d01b9..9aaca21a79 100644
+index e4fd9bc604..7ffb8f6172 100644
 --- a/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
 +++ b/src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
-@@ -4,6 +4,7 @@ import com.destroystokyo.paper.PaperConfig;
+@@ -3,6 +3,7 @@ package org.bukkit.craftbukkit.chunkio;
  import net.minecraft.server.Chunk;
  import net.minecraft.server.ChunkProviderServer;
  import net.minecraft.server.ChunkRegionLoader;
@@ -17,7 +17,7 @@ index 7b7a3d01b9..9aaca21a79 100644
  import net.minecraft.server.World;
  import org.bukkit.craftbukkit.util.AsynchronousExecutor;
  
-@@ -14,7 +15,7 @@ public class ChunkIOExecutor {
+@@ -13,7 +14,7 @@ public class ChunkIOExecutor {
      private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
  
      public static Chunk syncChunkLoad(World world, ChunkRegionLoader loader, ChunkProviderServer provider, int x, int z) {
@@ -43,5 +43,5 @@ index 52a8c48fa4..4cfe24df15 100644
          }
          try (Timing ignored = queuedChunk.provider.world.timings.chunkIOStage2.startTimingIfSync()) { // Paper
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0121-Add-server-name-parameter.patch

@@ -1,11 +1,11 @@
-From dcddb5eeb0da8166ae565f4c7b83edafdf57552b Mon Sep 17 00:00:00 2001
+From d44e4a028f3a138516a40480107df9594f91f41c Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index f7a4d53ede..5c26e78a71 100644
+index bbd5766a23..b726fe947a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -136,6 +136,14 @@ public class Main {
@@ -24,5 +24,5 @@ index f7a4d53ede..5c26e78a71 100644
          };
  
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0122-Only-send-Dragon-Wither-Death-sounds-to-same-world.patch

@@ -1,4 +1,4 @@
-From ac9156a326012ffc4bd53e63bed9531d22bb5005 Mon Sep 17 00:00:00 2001
+From ed13eb5bb8d20b48bf9b7000814258ed6b1dcc6f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 May 2016 22:53:50 -0400
 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world
@@ -44,5 +44,5 @@ index b84e5728a0..485cac3240 100644
                      double deltaZ = this.locZ - player.locZ;
                      double distanceSquared = deltaX * deltaX + deltaZ * deltaZ;
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0123-Delay-Chunk-Unloads-based-on-Player-Movement.patch

@@ -1,4 +1,4 @@
-From a341e096df2f6447ad537792fea5a00111150460 Mon Sep 17 00:00:00 2001
+From e46d08efd3f5e429c3d0cabb76bf8456bd03324b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 18 Jun 2016 23:22:12 -0400
 Subject: [PATCH] Delay Chunk Unloads based on Player Movement
@@ -40,7 +40,7 @@ index ff1a2046f6..0cd15c17e8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 9214b50b1c..2ec5b084fb 100644
+index 41d3aaa80b..824727ec66 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -37,6 +37,7 @@ public class Chunk implements IChunkAccess {

Spigot-Server-Patches/0124-Fix-Double-World-Add-issues.patch

@@ -1,4 +1,4 @@
-From e9a6944ae559c0a4a1bae5fae0dd0040cb11fc31 Mon Sep 17 00:00:00 2001
+From af3d6d625bbb57168b75bd1995f4135cf107c94e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 21 Jun 2016 22:54:34 -0400
 Subject: [PATCH] Fix Double World Add issues

Spigot-Server-Patches/0125-Fix-Old-Sign-Conversion.patch

@@ -1,4 +1,4 @@
-From f272cc446d703160be856e5630def2168f8f002e Mon Sep 17 00:00:00 2001
+From 01f61b9f5d052ed0b5129a941d189fafb8fefcf1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 17 Jun 2016 20:50:11 -0400
 Subject: [PATCH] Fix Old Sign Conversion
@@ -58,5 +58,5 @@ index 00b6a3c16d..20dc3f272c 100644
                  if (this.world instanceof WorldServer) {
                      try {
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0126-Don-t-lookup-game-profiles-that-have-no-UUID-and-no-.patch

@@ -1,4 +1,4 @@
-From ad0fc24067501dccade31099a1cd96f049c9b280 Mon Sep 17 00:00:00 2001
+From d3d680ce20a615960678a5de765cf2eff66bf3d1 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 16 Jul 2016 19:11:17 -0500
 Subject: [PATCH] Don't lookup game profiles that have no UUID and no name
@@ -18,5 +18,5 @@ index f8b7d695c6..a47a51a412 100644
              GameProfile gameprofile = new GameProfile(uuid, s);
  
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0127-More-informative-vehicle-moved-wrongly-message.patch

@@ -1,4 +1,4 @@
-From c6c82ca57a41053a7ef349c3677caff7c1a98c16 Mon Sep 17 00:00:00 2001
+From 6a0d67ee8558b708ee01c418fbcdefca8ee73638 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 28 Jul 2016 17:58:53 -0500
 Subject: [PATCH] More informative vehicle moved wrongly message

Spigot-Server-Patches/0128-Re-track-players-that-dismount-from-other-players.patch

@@ -1,11 +1,11 @@
-From 3002b444e87e300c27e8e24b59baeff172044525 Mon Sep 17 00:00:00 2001
+From c8a0ffe71fcbaa237aaeeaea6fbedf39bd7c2edf Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 31 Jul 2016 16:33:03 -0500
 Subject: [PATCH] Re-track players that dismount from other players
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a9fbb20f..3d839002 100644
+index a9fbb20f73..3d83900298 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -751,6 +751,13 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -23,5 +23,5 @@ index a9fbb20f..3d839002 100644
      }
  
 -- 
-2.18.0.windows.1
+2.19.0
 

Spigot-Server-Patches/0129-Add-setting-for-proxy-online-mode-status.patch

@@ -1,14 +1,14 @@
-From c3a424cad8d3dad452fbd4b1e95aea766635d36c Mon Sep 17 00:00:00 2001
+From f0eaf43ef1bb3c22eae2971fc6ab747d1d6d7e77 Mon Sep 17 00:00:00 2001
 From: Gabriele C <sgdc3.mail@gmail.com>
 Date: Fri, 5 Aug 2016 01:03:08 +0200
 Subject: [PATCH] Add setting for proxy online mode status
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 369f503532..2fc6585c0e 100644
+index 6743d59f28..296601f21b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -239,4 +239,9 @@ public class PaperConfig {
+@@ -234,4 +234,9 @@ public class PaperConfig {
      private static void saveEmptyScoreboardTeams() {
          saveEmptyScoreboardTeams = getBoolean("settings.save-empty-scoreboard-teams", false);
      }

Spigot-Server-Patches/0130-Optimise-BlockStateEnum-hashCode-and-equals.patch

@@ -1,4 +1,4 @@
-From 6d92bd624a75098dfeae5b99362e4fd0e13df989 Mon Sep 17 00:00:00 2001
+From 454a4b007f6acbd522312c5dec9cc03b81ed396c Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 19 Aug 2016 01:52:56 +0100
 Subject: [PATCH] Optimise BlockStateEnum hashCode and equals
@@ -63,5 +63,5 @@ index 73623a21c5..9d8a03be8d 100644
  
      public static <T extends Enum<T> & INamable> BlockStateEnum<T> of(String s, Class<T> oclass) {
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0131-Disable-ticking-of-snow-blocks.patch

@@ -1,4 +1,4 @@
-From 6617595e82a4ab827e58be697668323dbbeb3b46 Mon Sep 17 00:00:00 2001
+From 97d5b2ac6eb096f2e3dd9b51337b8abc5cdfb594 Mon Sep 17 00:00:00 2001
 From: killme <killme-git@ibts.me>
 Date: Tue, 30 Aug 2016 16:39:48 +0200
 Subject: [PATCH] Disable ticking of snow blocks
@@ -25,5 +25,5 @@ index 0c8f9d37fd..44ed656263 100644
 +    //Paper end
  }
 -- 
-2.18.0
+2.19.0
 

Spigot-Server-Patches/0132-Fix-AIOOBE-in-inventory-handling.patch

@@ -1,4 +1,4 @@
-From d1354d3543da02c852dd4a504a976e32ee17231d Mon Sep 17 00:00:00 2001
+From 11333f7c95d933a90522c37fa3579f2aee1fdaed Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Sun, 4 Sep 2016 16:35:43 -0500
 Subject: [PATCH] Fix AIOOBE in inventory handling

Spigot-Server-Patches/0133-Configurable-packet-in-spam-threshold.patch

@@ -1,14 +1,14 @@
-From 1e0f93b52900c0101dc51f4c99a768f9e5862a9b Mon Sep 17 00:00:00 2001
+From a3048a43d2a729ed7415b9b721a8d180855a4e4b Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 11 Sep 2016 14:30:57 -0500
 Subject: [PATCH] Configurable packet in spam threshold
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 2fc6585c0e..d78f6516e5 100644
+index 296601f21b..a702d1a286 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -244,4 +244,13 @@ public class PaperConfig {
+@@ -239,4 +239,13 @@ public class PaperConfig {
      private static void bungeeOnlineMode() {
          bungeeOnlineMode = getBoolean("settings.bungee-online-mode", true);
      }

Spigot-Server-Patches/0134-Configurable-flying-kick-messages.patch

@@ -1,14 +1,14 @@
-From 4d4d3ce5358fe23f03ffb70d320b1321c75e8c26 Mon Sep 17 00:00:00 2001
+From 9560a14dd040af52c535402e62eb8bfc19e83307 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 20 Sep 2016 00:58:01 +0000
 Subject: [PATCH] Configurable flying kick messages
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index d78f6516e5..1db8e1f97a 100644
+index a702d1a286..4a91a9972d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -253,4 +253,11 @@ public class PaperConfig {
+@@ -248,4 +248,11 @@ public class PaperConfig {
          }
          packetInSpamThreshold = getInt("settings.incoming-packet-spam-threshold", 300);
      }
@@ -21,7 +21,7 @@ index d78f6516e5..1db8e1f97a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index ef3c1260b0..37b3dd6971 100644
+index 598b747ec0..a1c878fb4a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -146,6 +146,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

Spigot-Server-Patches/0135-Auto-Save-Improvements.patch

@@ -1,4 +1,4 @@
-From c1069c1fee52e5843abcd569f7cd81038e813812 Mon Sep 17 00:00:00 2001
+From 9d367609530f4ba8a89957561f23040e39b6a265 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Sep 2016 23:16:39 -0400
 Subject: [PATCH] Auto Save Improvements
@@ -12,10 +12,10 @@ Re-introduce a cap per tick for auto save (Spigot disabled the vanilla cap) and
 Adds incremental player auto saving too
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 1db8e1f97a..cf31c4469a 100644
+index 4a91a9972d..ec2f0d269b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-@@ -260,4 +260,15 @@ public class PaperConfig {
+@@ -255,4 +255,15 @@ public class PaperConfig {
          flyingKickPlayerMessage = getString("messages.kick.flying-player", flyingKickPlayerMessage);
          flyingKickVehicleMessage = getString("messages.kick.flying-vehicle", flyingKickVehicleMessage);
      }
@@ -64,7 +64,7 @@ index 0cd15c17e8..c43152f456 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 2ec5b084fb..c76be9c668 100644
+index 824727ec66..5e6166cfe8 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -50,9 +50,9 @@ public class Chunk implements IChunkAccess {
@@ -79,7 +79,7 @@ index 2ec5b084fb..c76be9c668 100644
      private int y;
      private long z;
      private int A;
-@@ -1034,11 +1034,11 @@ public class Chunk implements IChunkAccess {
+@@ -1059,11 +1059,11 @@ public class Chunk implements IChunkAccess {
              if (this.v && this.world.getTime() != this.lastSaved || this.x) {
                  return true;
              }

Spigot-Server-Patches/0136-Chunk-registration-fixes.patch

@@ -1,4 +1,4 @@
-From 3e2bca5db612a593ee3a6319109f4c02b9193479 Mon Sep 17 00:00:00 2001
+From afbbf90dcb52b0a550cbeec5b56d0c5a793e0b9f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 22:54:28 -0400
 Subject: [PATCH] Chunk registration fixes