[Auto] Update Upstream

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

Bukkit Changes:
d2834556 SPIGOT-4219: Event for PigZombies angering.

CraftBukkit Changes:
a9c796f1 SPIGOT-4184: Fix furnaces not matching Vanilla smelt or animations
195f071e SPIGOT-4219: Event for PigZombies angering.
5e3082c7 SPIGOT-4230: Improve legacy block types

Spigot-Server-Patches/0068-Fix-Furnace-cook-time-bug.patch

@@ -1,26 +0,0 @@
-From db448a33d090f16e94422a122727963472d771a1 Mon Sep 17 00:00:00 2001
-From: Aikar <aikar@aikar.co>
-Date: Fri, 18 Mar 2016 14:24:53 -0400
-Subject: [PATCH] Fix Furnace cook time bug
-
-If the server lags out and skips multiple ticks, Furnace cooking behavior would not
-cook in the expected amount of time as the cook time was not decremented correctly.
-
-This patch ensures that furnaces cook to the correct wall time expectation.
-
-diff --git a/src/main/java/net/minecraft/server/TileEntityFurnace.java b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-index b484fc721..bc158b877 100644
---- a/src/main/java/net/minecraft/server/TileEntityFurnace.java
-+++ b/src/main/java/net/minecraft/server/TileEntityFurnace.java
-@@ -267,7 +267,7 @@ public class TileEntityFurnace extends TileEntityContainer implements IWorldInve
-         if (this.isBurning() && this.canBurn(irecipe)) {
-             this.cookTime += elapsedTicks;
-             if (this.cookTime >= this.cookTimeTotal) {
--                this.cookTime = 0;
-+                this.cookTime -= this.cookTimeTotal; // Paper
-                 this.cookTimeTotal = this.s();
-                 this.burn(irecipe);
-                 flag1 = true;
--- 
-2.18.0
-

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

@@ -1,4 +1,4 @@
-From 0e6cf5edaab921a3d54b27009c13a0a304e4db41 Mon Sep 17 00:00:00 2001
+From 21d32208d1330db3a24876d99358f248ae04eb52 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

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

@@ -1,4 +1,4 @@
-From e6a1c83e22ebf7b1ccff924966d57c88588796ae Mon Sep 17 00:00:00 2001
+From 97b7c45703828056ac98602df86d699dd14efa52 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Non Player Arrow Despawn Rate
 Can set a much shorter despawn rate for arrows that players can not pick up.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 6f96627a2..0de300739 100644
+index 6f96627a2e..0de3007392 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -203,4 +203,13 @@ public class PaperWorldConfig {
@@ -24,7 +24,7 @@ index 6f96627a2..0de300739 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index e16c8e8d9..75445b00d 100644
+index e16c8e8d98..75445b00dc 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -258,7 +258,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {

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

@@ -1,4 +1,4 @@
-From 9270fa048bd8ae7bcb97a9a0fa9c9b101772affc Mon Sep 17 00:00:00 2001
+From c896d823498f07c8b105f0f84936ff10cbf6736a 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 7ea4b9b5c..fb27dcac2 100644
+index eb6f900c39..ef6a54bcae 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -635,6 +635,7 @@ public class Chunk implements IChunkAccess {
@@ -18,7 +18,7 @@ index 7ea4b9b5c..fb27dcac2 100644
          return this.a(blockposition, i, this.world.o().g());
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index d51ed0f80..d3785f73b 100644
+index e0fe05a0b1..72c0c92ec1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -81,7 +81,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

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

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

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

@@ -1,4 +1,4 @@
-From fe8a705410d94b93222d61216dd2323ad85bc3f9 Mon Sep 17 00:00:00 2001
+From ea8fdac269a25dbe9984c82bbe321a61a079f16e 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Pass world to Village creation
 fixes NPE bug #95
 
 diff --git a/src/main/java/net/minecraft/server/PersistentVillage.java b/src/main/java/net/minecraft/server/PersistentVillage.java
-index c09326636..3219ccca4 100644
+index c09326636c..3219ccca40 100644
 --- a/src/main/java/net/minecraft/server/PersistentVillage.java
 +++ b/src/main/java/net/minecraft/server/PersistentVillage.java
 @@ -234,7 +234,7 @@ public class PersistentVillage extends PersistentBase {
@@ -19,7 +19,7 @@ index c09326636..3219ccca4 100644
              village.a(nbttagcompound1);
              this.villages.add(village);
 diff --git a/src/main/java/net/minecraft/server/Village.java b/src/main/java/net/minecraft/server/Village.java
-index e742cbe12..dfcabb83a 100644
+index e742cbe120..dfcabb83a1 100644
 --- a/src/main/java/net/minecraft/server/Village.java
 +++ b/src/main/java/net/minecraft/server/Village.java
 @@ -24,7 +24,7 @@ public class Village {

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

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

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

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

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

@@ -1,11 +1,11 @@
-From e6e8be0132a9f4e4c4b4b2fd92e6e3a18a8fd805 Mon Sep 17 00:00:00 2001
+From afaa481d091edf3f654b0f5aafa4f01ba92499b1 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 6ece565c5..4d888d6d4 100644
+index 6ece565c51..4d888d6d4f 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -443,10 +443,12 @@ public class PlayerChunkMap {

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

@@ -1,4 +1,4 @@
-From 5f67b25a27935227c89946213d7c1b9241b20cb9 Mon Sep 17 00:00:00 2001
+From 2a68d81ec369c7a193a9c0923daddb9f92db523d 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Waving banner workaround
 This patch is a workaround for MC-63720
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
-index c5c3f40ce..6413f76e7 100644
+index c5c3f40ce0..6413f76e78 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutUpdateTime.java
 @@ -4,7 +4,13 @@ import java.io.IOException;

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

@@ -1,4 +1,4 @@
-From 368053f43ba373d4b5c106fcd7390d8ea5fedfea Mon Sep 17 00:00:00 2001
+From d9e146f01679a6389ff7838846ff6530b8333a55 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 27020c7e2..07172d3dd 100644
+index 27020c7e29..07172d3dd8 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 27020c7e2..07172d3dd 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 910a0f2540abd19874fa2bff7109b5006b195846 Mon Sep 17 00:00:00 2001
+From 968690c2207317f77f0b933b4a12d4c712de3c20 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
@@ -7,7 +7,7 @@ Had some issue with this in past, and this is the vanilla logic.
 Potentially an old CB change that's no longer needed.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 07172d3dd..53ef6b0ed 100644
+index 07172d3dd8..53ef6b0ed6 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2565,7 +2565,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -20,5 +20,5 @@ index 07172d3dd..53ef6b0ed 100644
              WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
              int i = worldserver1.dimension;
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 44f37fdd16c122b143b05d4a1c0e6aaaa4b84e34 Mon Sep 17 00:00:00 2001
+From 4849096581eda2911fc4f3dd36f58e4678e5dc29 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

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

@@ -1,11 +1,11 @@
-From 67ea6458bbbc22760d99d38cf8f310c0be092846 Mon Sep 17 00:00:00 2001
+From c186b41eb75af263e81c093dc4bc3a7db435a8ab 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 0de300739..c2c33d75b 100644
+index 0de3007392..c2c33d75bf 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -212,4 +212,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 0de300739..c2c33d75b 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index dd09ab20e..ecee3b406 100644
+index dd09ab20e7..ecee3b4064 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -498,7 +498,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {

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

@@ -1,4 +1,4 @@
-From ed048596459f752d8eeca4eb1393acd137e0b0f9 Mon Sep 17 00:00:00 2001
+From 42f660596a1ac2e6830fb330b21147014495a687 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
@@ -12,7 +12,7 @@ Replace all calls to the new place to the unnecessary forward.
 Optimize getType and getBlockData to manually inline and optimize the calls
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index e2a7b4be2..58f8b4b72 100644
+index e2a7b4be2c..58f8b4b720 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -10,6 +10,14 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -31,7 +31,7 @@ index e2a7b4be2..58f8b4b72 100644
      public BaseBlockPosition(int i, int j, int k) {
          this.a = i;
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 7dbea9090..252e00e16 100644
+index 7dbea90902..252e00e166 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -341,6 +341,16 @@ public class BlockPosition extends BaseBlockPosition {
@@ -52,7 +52,7 @@ index 7dbea9090..252e00e16 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 7622e9afb..a832e3855 100644
+index ef6a54bcae..4b440c7077 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -430,12 +430,24 @@ public class Chunk implements IChunkAccess {
@@ -83,7 +83,7 @@ index 7622e9afb..a832e3855 100644
              IBlockData iblockdata = null;
  
 diff --git a/src/main/java/net/minecraft/server/ChunkSection.java b/src/main/java/net/minecraft/server/ChunkSection.java
-index 7c6308dbe..880058a9e 100644
+index 35aea4829f..233cbb6d60 100644
 --- a/src/main/java/net/minecraft/server/ChunkSection.java
 +++ b/src/main/java/net/minecraft/server/ChunkSection.java
 @@ -9,7 +9,7 @@ public class ChunkSection {
@@ -96,7 +96,7 @@ index 7c6308dbe..880058a9e 100644
      private NibbleArray skyLight;
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 72c0c92ec..1df752894 100644
+index 72c0c92ec1..1df7528949 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -262,11 +262,11 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

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

@@ -1,11 +1,11 @@
-From a3603d62b1e1066a3e8b4ef5d5d3fe9bec5911a3 Mon Sep 17 00:00:00 2001
+From 0afff1632941d3adfb13808187d1578188c96c74 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
-index 6cbe06956..7b62f26d7 100644
+index 6cbe069562..7b62f26d7c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftInventoryPlayer.java
 @@ -250,4 +250,54 @@ public class CraftInventoryPlayer extends CraftInventory implements org.bukkit.i

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

@@ -1,4 +1,4 @@
-From 1fc8618476847297afeb47f861ed17b738be465e Mon Sep 17 00:00:00 2001
+From 47b1de18f9769b9514bdfa76a274b617af51a8a8 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
@@ -11,7 +11,7 @@ Defaulting this to false will provide substantial performance improvement
 by saving millions of event calls on redstone heavy servers.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index c2c33d75b..b3b3baddc 100644
+index c2c33d75bf..b3b3baddc0 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -217,4 +217,9 @@ public class PaperWorldConfig {
@@ -25,7 +25,7 @@ index c2c33d75b..b3b3baddc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 1df752894..87fd23c7f 100644
+index 1df7528949..87fd23c7f8 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -593,7 +593,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -38,7 +38,7 @@ index 1df752894..87fd23c7f 100644
                      this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index ecee3b406..96002184b 100644
+index ecee3b4064..96002184bb 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -36,6 +36,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;

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

@@ -1,11 +1,11 @@
-From 5aafa835b8a924d393945a7795bf1ab0a7524cda Mon Sep 17 00:00:00 2001
+From 3c1a47e5259a7de1ea0fa2e0d6cfbdda0e3990ba 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
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 87fd23c7f..83955fdd8 100644
+index 87fd23c7f8..83955fdd81 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1048,6 +1048,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

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

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

Spigot-Server-Patches/0086-EntityPathfindEvent.patch

@@ -1,4 +1,4 @@
-From 6f900d976e49e29d9a3cfd377e94d7121ddb6e65 Mon Sep 17 00:00:00 2001
+From da0eaa98bb3f62b2ddc2b3c3b4a29719605594da Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] EntityPathfindEvent
 Fires when an Entity decides to start moving to a location.
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 8111317e3..76d1f4bd2 100644
+index 8111317e31..76d1f4bd21 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -4,7 +4,7 @@ import javax.annotation.Nullable;

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

@@ -1,11 +1,11 @@
-From d1b56fb71f1165a2f50706cef0f4676cc3a29a21 Mon Sep 17 00:00:00 2001
+From 37a926f3964c8a76bead6516f01cf84b75646f00 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.
 
 
 diff --git a/src/main/java/net/minecraft/server/RegionFile.java b/src/main/java/net/minecraft/server/RegionFile.java
-index 3f9aa5923..4acb6df5d 100644
+index b8b514c874..cba2373125 100644
 --- a/src/main/java/net/minecraft/server/RegionFile.java
 +++ b/src/main/java/net/minecraft/server/RegionFile.java
 @@ -8,9 +8,12 @@ import java.io.ByteArrayInputStream;

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

@@ -1,4 +1,4 @@
-From fd6ccdfc2049340dd24439852e20e25a9dd7c9bb Mon Sep 17 00:00:00 2001
+From 3c28cee211dd1246032623ac8b6c39a617213ad1 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,7 +11,7 @@ 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 40c5ea474..7d29ad369 100644
+index 620f23f4f0..a6042ca607 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 {
@@ -25,7 +25,7 @@ index 40c5ea474..7d29ad369 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/RegionFileCache.java b/src/main/java/net/minecraft/server/RegionFileCache.java
-index ff473a263..3b8d01ea1 100644
+index ff473a263f..3b8d01ea1a 100644
 --- a/src/main/java/net/minecraft/server/RegionFileCache.java
 +++ b/src/main/java/net/minecraft/server/RegionFileCache.java
 @@ -9,10 +9,12 @@ import java.io.IOException;

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

@@ -1,4 +1,4 @@
-From 577370cdcd50969b88062f39cf1dffb067264883 Mon Sep 17 00:00:00 2001
+From 7acdaa46de379b7d8fc5e33700adbbffdcae5816 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
@@ -13,7 +13,7 @@ These collections are super fast as seen
 http://java-performance.info/hashmap-overview-jdk-fastutil-goldman-sachs-hppc-koloboke-trove-january-2015/
 
 diff --git a/src/main/java/net/minecraft/server/DataWatcher.java b/src/main/java/net/minecraft/server/DataWatcher.java
-index 2b27ae797..7191185ba 100644
+index 2b27ae7973..7191185ba7 100644
 --- a/src/main/java/net/minecraft/server/DataWatcher.java
 +++ b/src/main/java/net/minecraft/server/DataWatcher.java
 @@ -12,6 +12,7 @@ import java.util.Map;

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

@@ -1,4 +1,4 @@
-From 565362b9c7429010d87432c451e51a1519029b88 Mon Sep 17 00:00:00 2001
+From a11649b5e8780aa5325a96eb2632b0b35d9156c0 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
@@ -7,7 +7,7 @@ Should only happen for blocks on the edge that uses neighbors light level
 (certain blocks). In that case, there will be 3-4 other neighbors to get a light level from.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 83955fdd8..dcc1d08b1 100644
+index 83955fdd81..dcc1d08b16 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -636,6 +636,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

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

@@ -1,11 +1,11 @@
-From 023266ca8f49d694c4e425ab6b7475b195ccb38e Mon Sep 17 00:00:00 2001
+From d5dc1be98794dc8986745880f7a6ab802fbf8e93 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
-index 77440ac81..8711462e1 100644
+index 77440ac81f..8711462e16 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInUseEntity.java
 @@ -5,7 +5,7 @@ import javax.annotation.Nullable;
@@ -18,7 +18,7 @@ index 77440ac81..8711462e1 100644
      private Vec3D c;
      private EnumHand d;
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 88b761d27..a3486bd46 100644
+index dc38e4e043..90ab7f065f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1893,6 +1893,16 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

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

@@ -1,11 +1,11 @@
-From 9ef42a2b51fae0e453e1184787bf985d2a1f8223 Mon Sep 17 00:00:00 2001
+From bf2f558773207bf9d83d115bb4a6edce244d4d30 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 23cab725d..8e1edde31 100644
+index 8b3c2d2874..7f324a9c0f 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 {

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

@@ -1,11 +1,11 @@
-From f5381978161686a8bc5c898c9a74cb4319bd7236 Mon Sep 17 00:00:00 2001
+From ccb7c36c3b7bec200c4a6d5182f1bc8d8bc9632a 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 613964ce0..bb1c1c57c 100644
+index 613964ce04..bb1c1c57cc 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -227,4 +227,10 @@ public class PaperWorldConfig {
@@ -20,7 +20,7 @@ index 613964ce0..bb1c1c57c 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java
-index 6343fb1e0..903e8241b 100644
+index 6343fb1e0d..903e8241b8 100644
 --- a/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java
 +++ b/src/main/java/net/minecraft/server/BlockDirtSnowSpreadable.java
 @@ -21,6 +21,7 @@ public abstract class BlockDirtSnowSpreadable extends BlockDirtSnow {

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

@@ -1,4 +1,4 @@
-From 3106868b36a4a6fa5a92ab7be64230e090d9a1a4 Mon Sep 17 00:00:00 2001
+From 057291c909254cc8c64bfb6e936fd0548b9f583f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 13 Sep 2014 23:14:43 -0400
 Subject: [PATCH] Configurable Keep Spawn Loaded range per world
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable Keep Spawn Loaded range per world
 This lets you disable it for some worlds and lower it for others.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index bb1c1c57c..667a0dde8 100644
+index bb1c1c57cc..667a0dde8c 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -233,4 +233,10 @@ public class PaperWorldConfig {
@@ -21,7 +21,7 @@ index bb1c1c57c..667a0dde8 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 9fcc8c782..204cf4f64 100644
+index 9fcc8c782d..204cf4f648 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -485,13 +485,21 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -63,7 +63,7 @@ index 9fcc8c782..204cf4f64 100644
          }
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index dcc1d08b1..4c33c331f 100644
+index dcc1d08b16..4c33c331f0 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2836,8 +2836,9 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -78,7 +78,7 @@ index dcc1d08b1..4c33c331f 100644
  
      public void a(Packet<?> packet) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 5634b1c85..6e3539ab8 100644
+index 5634b1c85e..6e3539ab8d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -991,7 +991,7 @@ public final class CraftServer implements Server {
@@ -91,7 +91,7 @@ index 5634b1c85..6e3539ab8 100644
              for (int j = -short1; j <= short1; j += 16) {
                  for (int k = -short1; k <= short1; k += 16) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 29a5ac639..e3e45ed48 100644
+index 29a5ac639e..e3e45ed48a 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1281,8 +1281,9 @@ public class CraftWorld implements World {

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

@@ -1,11 +1,11 @@
-From 15b2bd0be92109b6de6e36db8d778eacd65a1c72 Mon Sep 17 00:00:00 2001
+From 64e9589f1843077c2fa08b83ffe6b69e7941fed8 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
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 4c33c331f..e693b43a2 100644
+index 4c33c331f0..e693b43a23 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -551,6 +551,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

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

@@ -1,11 +1,11 @@
-From 66c1fe97c1459f56e2e9ddcb686fadd5430b0bdf Mon Sep 17 00:00:00 2001
+From dc943703d601afe8a65e5af90b9cac08fbbdf837 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
 
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e693b43a2..e75ce9b4f 100644
+index e693b43a23..e75ce9b4f5 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -2832,6 +2832,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -17,7 +17,7 @@ index e693b43a2..e75ce9b4f 100644
          BlockPosition blockposition = this.getSpawn();
          int k = i * 16 + 8 - blockposition.getX();
 diff --git a/src/main/java/net/minecraft/server/WorldProvider.java b/src/main/java/net/minecraft/server/WorldProvider.java
-index 6b62235e5..26ef3a41f 100644
+index 6b62235e54..26ef3a41f2 100644
 --- a/src/main/java/net/minecraft/server/WorldProvider.java
 +++ b/src/main/java/net/minecraft/server/WorldProvider.java
 @@ -69,7 +69,7 @@ public abstract class WorldProvider {

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

@@ -1,4 +1,4 @@
-From 815ec2a31b886837709faf3317b3016274f43606 Mon Sep 17 00:00:00 2001
+From ca661277ab0b0df75c267368ac65590de2561fff 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
@@ -9,7 +9,7 @@ Before: http://i.imgur.com/nQsMzAE.png
 After: http://i.imgur.com/nJ46crB.png
 
 diff --git a/src/main/java/net/minecraft/server/DataBits.java b/src/main/java/net/minecraft/server/DataBits.java
-index d24ec3d53..0fb3162e6 100644
+index d24ec3d53c..0fb3162e65 100644
 --- a/src/main/java/net/minecraft/server/DataBits.java
 +++ b/src/main/java/net/minecraft/server/DataBits.java
 @@ -14,7 +14,7 @@ public class DataBits {

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

@@ -1,11 +1,11 @@
-From 3123ef38d15374e24c3991a323acd6dda9c13ce9 Mon Sep 17 00:00:00 2001
+From 0196b87208cca641f06a4503905e9623833eb756 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 667a0dde8..b6ef1d437 100644
+index 667a0dde8c..b6ef1d4378 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -239,4 +239,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 667a0dde8..b6ef1d437 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 53ef6b0ed..da1254f5e 100644
+index 53ef6b0ed6..da1254f5e1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2260,6 +2260,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -31,7 +31,7 @@ index 53ef6b0ed..da1254f5e 100644
      public ScoreboardTeamBase be() {
          if (!this.world.paperConfig.nonPlayerEntitiesOnScoreboards && !(this instanceof EntityHuman)) { return null; } // Paper
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 90ab7f065..1ca3c87c7 100644
+index 90ab7f065f..1ca3c87c7a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1622,7 +1622,15 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -52,5 +52,5 @@ index 90ab7f065..1ca3c87c7 100644
                  if (((LazyPlayerSet) event.getRecipients()).isLazy()) {
                      for (Object recipient : minecraftServer.getPlayerList().players) {
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From aa7dad05c9aedd3421ebe601e2994f52b88a94b4 Mon Sep 17 00:00:00 2001
+From 7d20dbe3b794e0c62991f9f38a0d598c6201e567 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 be29f85a0..a84f1a055 100644
+index be29f85a05..a84f1a055c 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -713,6 +713,17 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

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

@@ -1,4 +1,4 @@
-From 2c55dcfe813664b984f3ffa0c5f4a3c6ed83554e Mon Sep 17 00:00:00 2001
+From 7b61d5fb71384b095cc802986071aca677e507cf 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Remove unused World Tile Entity List
 Massive hit to performance and it is completely unnecessary.
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index e75ce9b4f..f314925b6 100644
+index e75ce9b4f5..f314925b6b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -73,7 +73,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

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

@@ -1,11 +1,11 @@
-From 3577a2539471e163fd082cf8e5d277ce4a4dd71c Mon Sep 17 00:00:00 2001
+From bc669d463febf4e1a5f4e4200fdedc4cf4b5ca00 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 db4967f24..804236547 100644
+index af5e4093cc..85fd8dab60 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;

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

@@ -1,11 +1,11 @@
-From 5af22f227e6bf0613e322053e4f50c714c19dd28 Mon Sep 17 00:00:00 2001
+From e1b199e4583897d7f4ae1afcb31174fb9fa70c6f 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 7d29ad369..bd9f03a76 100644
+index a6042ca607..9fe1311143 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 {
@@ -19,7 +19,7 @@ index 7d29ad369..bd9f03a76 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 071a1e30f..f88105382 100644
+index 204cf4f648..67c60be6f7 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -418,6 +418,20 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati
@@ -44,7 +44,7 @@ index 071a1e30f..f88105382 100644
  
      protected void a(File file, WorldData worlddata) {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
-index a6aed2531..575e3762b 100644
+index a6aed2531f..575e3762b2 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutScoreboardTeam.java
 @@ -94,7 +94,7 @@ public class PacketPlayOutScoreboardTeam implements Packet<PacketListenerPlayOut
@@ -57,7 +57,7 @@ index a6aed2531..575e3762b 100644
              packetdataserializer.a(this.c);
              packetdataserializer.a(this.d);
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 7f324a9c0..d0c547cc9 100644
+index 7f324a9c0f..d0c547cc99 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -74,6 +74,7 @@ public abstract class PlayerList {

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

@@ -1,4 +1,4 @@
-From 0d03db270cc3bde0d73293c739cf16653cb7357a Mon Sep 17 00:00:00 2001
+From fcaa96c04e21424f4853ee85135b726a78a3d2c9 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 7c75433f5..088ec198e 100644
+index 5b784002f5..2d57bdf40e 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 {

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

@@ -1,4 +1,4 @@
-From be4311568ddb5dfe4be686cec3907e7ac9018ae3 Mon Sep 17 00:00:00 2001
+From bfb9f37286c82a166bde5dc26bff46a34572442d 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Configurable RCON IP address
 For servers with multiple IP's, ability to bind to a specific interface.
 
 diff --git a/src/main/java/net/minecraft/server/RemoteControlListener.java b/src/main/java/net/minecraft/server/RemoteControlListener.java
-index 6f0176f6f..c237f239f 100644
+index 6f0176f6ff..c237f239f3 100644
 --- a/src/main/java/net/minecraft/server/RemoteControlListener.java
 +++ b/src/main/java/net/minecraft/server/RemoteControlListener.java
 @@ -24,7 +24,7 @@ public class RemoteControlListener extends RemoteConnectionThread {
@@ -19,5 +19,5 @@ index 6f0176f6f..c237f239f 100644
          if (0 == this.h) {
              this.h = this.i + 10;
 -- 
-2.17.0
+2.18.0
 

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

@@ -1,4 +1,4 @@
-From 934f9f6f3306dbe1b0c95e38a3f2dc0d4279053c Mon Sep 17 00:00:00 2001
+From 90bf2f4b99dcb11f07cb5152a27bc38d4e0e1118 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 b6caf4c8a..f3a278c0b 100644
+index 8339d6f056..25a8a1afdf 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 {

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

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

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

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

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

@@ -1,11 +1,11 @@
-From 90aeab4e9f63ccbfff85966e96b7c95afa07182a Mon Sep 17 00:00:00 2001
+From 569009f4f6ccf61ecf805a6e9c8e71331b8473cf 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index b6ef1d437..8d54af6bb 100644
+index b6ef1d4378..8d54af6bb7 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -244,4 +244,14 @@ public class PaperWorldConfig {
@@ -24,7 +24,7 @@ index b6ef1d437..8d54af6bb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockIceFrost.java b/src/main/java/net/minecraft/server/BlockIceFrost.java
-index 1d5c24c7a..77cf6b8e9 100644
+index 1d5c24c7a7..77cf6b8e9b 100644
 --- a/src/main/java/net/minecraft/server/BlockIceFrost.java
 +++ b/src/main/java/net/minecraft/server/BlockIceFrost.java
 @@ -12,6 +12,7 @@ public class BlockIceFrost extends BlockIce {

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

@@ -1,4 +1,4 @@
-From bf2bd153e0203883f109de1266912090918f6b5d Mon Sep 17 00:00:00 2001
+From f45a5c9addc227e73e61f4afd6fe88ff3bf4f92c 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
@@ -6,7 +6,7 @@ Subject: [PATCH] remove null possibility for getServer singleton
 to stop IDE complaining about potential NPE
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index c181acd991..6de0b22f72 100644
+index 67c60be6f7..b41e7badff 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -68,6 +68,7 @@ import co.aikar.timings.MinecraftTimings; // Paper

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

@@ -1,4 +1,4 @@
-From 51c9e48269337867f03c9078b06f85e30be71629 Mon Sep 17 00:00:00 2001
+From 0fdb56f20d6b3b075cfafbdff871e27aedfe96cb 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
@@ -13,7 +13,7 @@ custom renderers are in use, defaulting to the much simpler Vanilla system.
 Additionally, numerous issues to player position tracking on maps has been fixed.
 
 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index a47ef2ca5..06b663c4d 100644
+index ca14080ccd..9814075d6d 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
 @@ -610,6 +610,12 @@ public abstract class EntityHuman extends EntityLiving {
@@ -30,7 +30,7 @@ index a47ef2ca5..06b663c4d 100644
              ItemStack itemstack1 = this.a(entityitem);
  
 diff --git a/src/main/java/net/minecraft/server/EntityTrackerEntry.java b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
-index 40e0bd7ce..a04a06f3b 100644
+index 40e0bd7ce2..a04a06f3bf 100644
 --- a/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 +++ b/src/main/java/net/minecraft/server/EntityTrackerEntry.java
 @@ -90,7 +90,7 @@ public class EntityTrackerEntry {
@@ -43,7 +43,7 @@ index 40e0bd7ce..a04a06f3b 100644
              ItemStack itemstack = entityitemframe.getItem();
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index f314925b6..7dae87199 100644
+index f314925b6b..7dae87199e 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1086,6 +1086,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -55,7 +55,7 @@ index f314925b6..7dae87199 100644
                          }
                      }
 diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
-index c73ffc3bc..14754bbeb 100644
+index c73ffc3bc2..14754bbeb2 100644
 --- a/src/main/java/net/minecraft/server/WorldMap.java
 +++ b/src/main/java/net/minecraft/server/WorldMap.java
 @@ -29,6 +29,7 @@ public class WorldMap extends PersistentBase {
@@ -127,7 +127,7 @@ index c73ffc3bc..14754bbeb 100644
              for ( org.bukkit.map.MapCursor cursor : render.cursors) {
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
-index 256a13178..5768cd512 100644
+index 256a131781..5768cd512e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 +++ b/src/main/java/org/bukkit/craftbukkit/map/RenderData.java
 @@ -5,7 +5,7 @@ import org.bukkit.map.MapCursor;

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

@@ -1,4 +1,4 @@
-From 5adbcec5141acf1e524b36ac8667998cff3f10d8 Mon Sep 17 00:00:00 2001
+From ebb3f2d170d70881d4f7a210e3f7c110839cc945 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
@@ -11,7 +11,7 @@ This feature is good for long term worlds so that newer players
 do not suffer with "Every chest has been looted"
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 8d54af6bb..a3823408c 100644
+index 8d54af6bb7..a3823408ca 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -254,4 +254,26 @@ public class PaperWorldConfig {
@@ -43,7 +43,7 @@ index 8d54af6bb..a3823408c 100644
  }
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java
 new file mode 100644
-index 000000000..36c36d158
+index 0000000000..36c36d158f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootable.java
 @@ -0,0 +1,12 @@
@@ -61,7 +61,7 @@ index 000000000..36c36d158
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java
 new file mode 100644
-index 000000000..20d236c45
+index 0000000000..20d236c451
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableBlockInventory.java
 @@ -0,0 +1,33 @@
@@ -100,7 +100,7 @@ index 000000000..20d236c45
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java
 new file mode 100644
-index 000000000..1150dee01
+index 0000000000..1150dee01e
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableEntityInventory.java
 @@ -0,0 +1,31 @@
@@ -137,7 +137,7 @@ index 000000000..1150dee01
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java
 new file mode 100644
-index 000000000..668097620
+index 0000000000..668097620f
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventory.java
 @@ -0,0 +1,88 @@
@@ -231,7 +231,7 @@ index 000000000..668097620
 +}
 diff --git a/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java
 new file mode 100644
-index 000000000..9a65603bc
+index 0000000000..9a65603bcb
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/loottable/CraftLootableInventoryData.java
 @@ -0,0 +1,182 @@
@@ -418,7 +418,7 @@ index 000000000..9a65603bc
 +    }
 +}
 diff --git a/src/main/java/net/minecraft/server/EntityMinecartContainer.java b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
-index 9ec73ac06..8bd7976f9 100644
+index 9ec73ac06a..8bd7976f97 100644
 --- a/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 +++ b/src/main/java/net/minecraft/server/EntityMinecartContainer.java
 @@ -6,17 +6,21 @@ import javax.annotation.Nullable;
@@ -540,7 +540,7 @@ index 9ec73ac06..8bd7976f9 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityLootable.java b/src/main/java/net/minecraft/server/TileEntityLootable.java
-index fbda02b32..e6fc1ae92 100644
+index fbda02b321..e6fc1ae923 100644
 --- a/src/main/java/net/minecraft/server/TileEntityLootable.java
 +++ b/src/main/java/net/minecraft/server/TileEntityLootable.java
 @@ -1,12 +1,16 @@
@@ -657,7 +657,7 @@ index fbda02b32..e6fc1ae92 100644
 +
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
-index ac9b4297b..0558cafe3 100644
+index ac9b4297b2..0558cafe31 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftBlockEntityState.java
 @@ -61,7 +61,7 @@ public class CraftBlockEntityState<T extends TileEntity> extends CraftBlockState
@@ -670,7 +670,7 @@ index ac9b4297b..0558cafe3 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
-index 6a54f2a16..a94c78512 100644
+index dff5bb5171..e7b719b43d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftChest.java
 @@ -1,6 +1,7 @@
@@ -691,7 +691,7 @@ index 6a54f2a16..a94c78512 100644
      public CraftChest(final Block block) {
          super(block, TileEntityChest.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
-index 1dc8bfecd..bfcf9b6c4 100644
+index 1dc8bfecd2..bfcf9b6c4d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftDispenser.java
 @@ -1,5 +1,6 @@
@@ -711,7 +711,7 @@ index 1dc8bfecd..bfcf9b6c4 100644
      public CraftDispenser(final Block block) {
          super(block, TileEntityDispenser.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
-index 6566554ab..df156d0d9 100644
+index 6566554ab6..df156d0d92 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftHopper.java
 @@ -1,5 +1,6 @@
@@ -731,7 +731,7 @@ index 6566554ab..df156d0d9 100644
      public CraftHopper(final Block block) {
          super(block, TileEntityHopper.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
-index c029a1244..c26f0b5af 100644
+index c029a12441..c26f0b5afc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
 +++ b/src/main/java/org/bukkit/craftbukkit/block/CraftShulkerBox.java
 @@ -1,5 +1,6 @@
@@ -751,7 +751,7 @@ index c029a1244..c26f0b5af 100644
      public CraftShulkerBox(final Block block) {
          super(block, TileEntityShulkerBox.class);
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
-index 69435c457..4291edf25 100644
+index 69435c4576..4291edf252 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartChest.java
 @@ -1,5 +1,6 @@
@@ -771,7 +771,7 @@ index 69435c457..4291edf25 100644
  
      public CraftMinecartChest(CraftServer server, EntityMinecartChest entity) {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
-index e9963e21c..acb4dee04 100644
+index e9963e21cd..acb4dee04f 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftMinecartHopper.java
 @@ -1,5 +1,6 @@

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

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

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

@@ -1,4 +1,4 @@
-From 694f896ba3bde5f9ad486dd58a1539808807026e Mon Sep 17 00:00:00 2001
+From d73a40f069529206aaa5365608272d6bfb902162 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 da1254f5e..428eaca37 100644
+index da1254f5e1..428eaca37a 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -71,6 +71,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -19,7 +19,7 @@ index da1254f5e..428eaca37 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 a04a06f3b..c405cc74b 100644
+index a04a06f3bf..c405cc74ba 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 a04a06f3b..c405cc74b 100644
  
      }
 -- 
-2.17.1
+2.18.0
 

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

@@ -1,11 +1,11 @@
-From 0d46f1966984e67b959aaf94ab2beccf1cf48dcf Mon Sep 17 00:00:00 2001
+From b4fa1d376f3a2981f359620f3b5814a1bd71fc98 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 bd9f03a76..5538dfd9d 100644
+index 9fe1311143..a1110da38e 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 {
@@ -19,7 +19,7 @@ index bd9f03a76..5538dfd9d 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PersistentScoreboard.java b/src/main/java/net/minecraft/server/PersistentScoreboard.java
-index 0260fb7ec..45d8de1b7 100644
+index 0260fb7ec9..45d8de1b7b 100644
 --- a/src/main/java/net/minecraft/server/PersistentScoreboard.java
 +++ b/src/main/java/net/minecraft/server/PersistentScoreboard.java
 @@ -177,6 +177,7 @@ public class PersistentScoreboard extends PersistentBase {

Spigot-Server-Patches/0115-Fix-Chunk-Unload-Queue-Issues.patch

@@ -1,4 +1,4 @@
-From 5f487664b0a7c81473babc61ebcb4d2b577b2405 Mon Sep 17 00:00:00 2001
+From 88ae26f30c72f35356d81d68a6556611f3e050ea Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 12 May 2016 02:03:56 -0400
 Subject: [PATCH] Fix Chunk Unload Queue Issues
@@ -9,7 +9,7 @@ has not resolved all the bugs with the changes.
 This patch fixes known issues and really should be applied by Spigot team.
 
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 695c6d3b70..acc21aec02 100644
+index e8a943cf74..63ca61c1d6 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -58,7 +58,7 @@ public class Chunk implements IChunkAccess {

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

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

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

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

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

@@ -1,4 +1,4 @@
-From b2db33ed633fd55ba4fe042e9f24bc90bf378979 Mon Sep 17 00:00:00 2001
+From c15b6afc0cf108c0a9da3655bdf3a6d0620231da 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 6de0b22f72..5f17ec1e9d 100644
+index b41e7badff..e3469cacff 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -676,7 +676,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati

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

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

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

@@ -1,11 +1,11 @@
-From 06776dc5112fcd1549743f82548ec21ac49fdc86 Mon Sep 17 00:00:00 2001
+From 6d9962a0cf301943ff52739267c5c4435fad6fa4 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
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a3823408c..41e73b340 100644
+index a3823408ca..41e73b3409 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,7 +2,6 @@ package com.destroystokyo.paper;
@@ -32,7 +32,7 @@ index a3823408c..41e73b340 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 428eaca37..964caa080 100644
+index 428eaca37a..964caa080c 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1173,6 +1173,12 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -61,7 +61,7 @@ index 428eaca37..964caa080 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityTNTPrimed.java b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
-index 87f3205f8..8c1d25979 100644
+index 87f3205f82..8c1d25979f 100644
 --- a/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 +++ b/src/main/java/net/minecraft/server/EntityTNTPrimed.java
 @@ -147,4 +147,49 @@ public class EntityTNTPrimed extends Entity {
@@ -115,5 +115,5 @@ index 87f3205f8..8c1d25979 100644
 +    // Paper end
  }
 -- 
-2.17.1
+2.18.0
 

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

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

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

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

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

@@ -1,11 +1,11 @@
-From cf48b3196d4f28b7ba27d4224610c7c538b6b420 Mon Sep 17 00:00:00 2001
+From 127d86acb4f7b4088c62625044d02ca86aaecc2c 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 38e696aa94..c552c624e5 100644
+index f7a4d53ede..5c26e78a71 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 {

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

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

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

@@ -1,4 +1,4 @@
-From eafc6ada7b329bf53e8c088bed1c237d95a08538 Mon Sep 17 00:00:00 2001
+From 15087609882f8372870b8dfe7f6cf033071fc532 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
@@ -17,7 +17,7 @@ This allows servers with smaller worlds who do less long distance exploring to s
 wasting cpu cycles on saving/unloading/reloading chunks repeatedly.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 41e73b340..ec6b550ff 100644
+index 41e73b3409..ec6b550ff6 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -285,4 +285,18 @@ public class PaperWorldConfig {
@@ -40,7 +40,7 @@ index 41e73b340..ec6b550ff 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index fe69ea4c9..cdff2a50b 100644
+index 63ca61c1d6..ace64c0345 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -39,6 +39,7 @@ public class Chunk implements IChunkAccess {
@@ -52,7 +52,7 @@ index fe69ea4c9..cdff2a50b 100644
      public final int locZ;
      private boolean m;
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 2925c345a..a5139b0b0 100644
+index 2925c345a1..a5139b0b0d 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -328,6 +328,19 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -76,7 +76,7 @@ index 2925c345a..a5139b0b0 100644
              this.f.a();
              this.chunkLoader.b();
 diff --git a/src/main/java/net/minecraft/server/PlayerChunk.java b/src/main/java/net/minecraft/server/PlayerChunk.java
-index ffff87dc0..344b95233 100644
+index ffff87dc03..344b95233f 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunk.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunk.java
 @@ -33,14 +33,23 @@ public class PlayerChunk {
@@ -112,7 +112,7 @@ index ffff87dc0..344b95233 100644
  
              return this.chunk != null;
 diff --git a/src/main/java/net/minecraft/server/PlayerChunkMap.java b/src/main/java/net/minecraft/server/PlayerChunkMap.java
-index 4d888d6d4..cf5c76a78 100644
+index 4d888d6d4f..cf5c76a78e 100644
 --- a/src/main/java/net/minecraft/server/PlayerChunkMap.java
 +++ b/src/main/java/net/minecraft/server/PlayerChunkMap.java
 @@ -461,7 +461,13 @@ public class PlayerChunkMap {
@@ -131,7 +131,7 @@ index 4d888d6d4..cf5c76a78 100644
  
      }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 7dae87199..b6efd8506 100644
+index 7dae87199e..b6efd8506b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1305,7 +1305,13 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose
@@ -150,7 +150,7 @@ index 7dae87199..b6efd8506 100644
                          this.methodProfiler.a(() -> {
                              return String.valueOf(TileEntityTypes.a(tileentity.C()));
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index e3e45ed48..d4851dd2a 100644
+index e3e45ed48a..d4851dd2a6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -1577,7 +1577,7 @@ public class CraftWorld implements World {
@@ -163,7 +163,7 @@ index e3e45ed48..d4851dd2a 100644
              }
  
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index a9b84fdec..e02647f80 100644
+index a9b84fdec4..e02647f806 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -284,6 +284,10 @@ public class ActivationRange

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

@@ -1,4 +1,4 @@
-From 6cfcac4ce43f629bdd36407b5450ec87b0b9d986 Mon Sep 17 00:00:00 2001
+From c259b0b0cc6e23351d7f7a1ad344791a31eb8125 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
@@ -8,7 +8,7 @@ Vanilla will double add Spider Jockeys to the world, so ignore already added.
 Also add debug if something else tries to, and abort before world gets bad state
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index f007af2e1..2f1488ee5 100644
+index f007af2e1a..2f1488ee53 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -1050,7 +1050,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -21,7 +21,7 @@ index f007af2e1..2f1488ee5 100644
              Iterator iterator = entity.bP().iterator();
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index b6efd8506..e74b53c48 100644
+index b6efd8506b..e74b53c483 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -966,6 +966,7 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

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

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

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

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

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

@@ -1,11 +1,11 @@
-From 5fe385d1c9048225ddd1b55d874c0782d527d01f Mon Sep 17 00:00:00 2001
+From 1b983e43aa6d3233a451b027d8b2a0b52e65bd9a 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 9d705ed7d1..fc33baf2bf 100644
+index 1ca3c87c7a..0fe8d1c3f1 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -354,7 +354,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

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

@@ -1,4 +1,4 @@
-From 296fbd3b2fcdd172ac1ed1afdbbfe5b80324fb2a Mon Sep 17 00:00:00 2001
+From 749742bd1afd6adb09686bc546a9c1884e94a469 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

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

@@ -1,11 +1,11 @@
-From b81234662dc8a123760b733872fc6341c1cdb723 Mon Sep 17 00:00:00 2001
+From 8ac446a7e1845926d3af8d6f6d57abf10fcc9071 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 5538dfd9d8..0e5773bae4 100644
+index a1110da38e..0a8fc7927a 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 {
@@ -33,7 +33,7 @@ index f135349174..85c7a96c5a 100644
          } else {
              String[] astring1 = astring;
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 761db58b29..3bbf9b0189 100644
+index 6e3539ab8d..7a7617750e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1358,7 +1358,8 @@ public final class CraftServer implements Server {

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

@@ -1,4 +1,4 @@
-From 300e97ecdb34c2c837b4610065ce834de7be0afb Mon Sep 17 00:00:00 2001
+From 5954bc01e73be3868d879fe2fa37c67819cacb61 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

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

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

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

@@ -1,4 +1,4 @@
-From ee51f2d2b90389e0e916203dcbb96bf63d83d8b0 Mon Sep 17 00:00:00 2001
+From a01021102b786403cb71a732788e62ec111eee75 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/0135-Configurable-packet-in-spam-threshold.patch

@@ -1,11 +1,11 @@
-From 9f53223bbee1f9a9c355d6db7f8526b5bbb300e1 Mon Sep 17 00:00:00 2001
+From 819150dc95ef61cb172647bd8eb4d73dd57252ea 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 0e5773bae..ed9ae4df3 100644
+index 0a8fc7927a..b496bc3869 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -239,4 +239,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 0e5773bae..ed9ae4df3 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 47554df42..c9613bf2d 100644
+index ed02cd7a7a..eec02ba0e9 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1186,13 +1186,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

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

@@ -1,11 +1,11 @@
-From db73402e6e13134db182d0dde9f1174efe995fbf Mon Sep 17 00:00:00 2001
+From e98e5640f208339d4204374704bbd2e10a9495cb 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 ed9ae4df3..4bdb0a5f9 100644
+index b496bc3869..aa0e3c757d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -248,4 +248,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index ed9ae4df3..4bdb0a5f9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c9613bf2d..4ccebb3f9 100644
+index eec02ba0e9..969e28c3b2 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -144,6 +144,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {

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

@@ -1,4 +1,4 @@
-From 06fde62d101a14f97ad1a3b537c28345e6ca2807 Mon Sep 17 00:00:00 2001
+From 4f3ee27d644d6d032c9d1d1d2f8c12c621fa7908 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,7 +12,7 @@ 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 4bdb0a5f9c..315d85090a 100644
+index aa0e3c757d..c1845d6811 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -255,4 +255,15 @@ public class PaperConfig {

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

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

Spigot-Server-Patches/0139-Remove-FishingHook-reference-on-Craft-Entity-removal.patch

@@ -1,4 +1,4 @@
-From 1a602000612c28f2376c093593250ff851542acb Mon Sep 17 00:00:00 2001
+From 7f9d1dd37e9eec7aa35da37945d67e42b73e3fae Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 16 Jun 2016 00:17:23 -0400
 Subject: [PATCH] Remove FishingHook reference on Craft Entity removal

Spigot-Server-Patches/0140-Auto-fix-bad-Y-levels-on-player-login.patch

@@ -1,4 +1,4 @@
-From a079a95c1d916ad191338fb5fad68745d9cf1558 Mon Sep 17 00:00:00 2001
+From f62f97c0dc44c38568c8b22e84f122d0281e82bb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:48:39 -0400
 Subject: [PATCH] Auto fix bad Y levels on player login
@@ -6,7 +6,7 @@ Subject: [PATCH] Auto fix bad Y levels on player login
 Bring down to a saner Y level if super high, as this can cause the server to crash
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 1879c32381..b76c28147b 100644
+index 9c04fa4a6f..9bb70c151d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -199,6 +199,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {

Spigot-Server-Patches/0141-Disable-Vanilla-Chunk-GC.patch

@@ -1,4 +1,4 @@
-From 0f4827d2c74c4372c38edf9a701a45ed926c67b7 Mon Sep 17 00:00:00 2001
+From f46ee99721efcc27aebf7ad253a341f469316360 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 26 Sep 2016 01:51:30 -0400
 Subject: [PATCH] Disable Vanilla Chunk GC

Spigot-Server-Patches/0142-Option-to-remove-corrupt-tile-entities.patch

@@ -1,11 +1,11 @@
-From ebe77e76a5d76ad93b286e6a654d8e4b78c85c93 Mon Sep 17 00:00:00 2001
+From acf15675a88a8b5969eb038d22b49e5cd5cf3e0c Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 5 Oct 2016 16:27:36 -0500
 Subject: [PATCH] Option to remove corrupt tile entities
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 499230af6..189ec79f0 100644
+index 499230af60..189ec79f05 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -315,4 +315,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index 499230af6..189ec79f0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 06d6814b8..7a797bef0 100644
+index 229215180b..f6beb6886d 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -829,6 +829,12 @@ public class Chunk implements IChunkAccess {

Spigot-Server-Patches/0143-Add-EntityZapEvent.patch

@@ -1,4 +1,4 @@
-From e858d6c03e2ac879054dceb8daa3ea41be42c4ca Mon Sep 17 00:00:00 2001
+From faf970b94899cf3982625094f4068a6234035e09 Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Sun, 16 Oct 2016 23:19:30 -0700
 Subject: [PATCH] Add EntityZapEvent

Spigot-Server-Patches/0144-Don-t-load-Chunks-from-Hoppers-and-other-things.patch

@@ -1,4 +1,4 @@
-From 6f5410680ed1d35082625a9c84be695294046115 Mon Sep 17 00:00:00 2001
+From 9047a61c9f88a72ba5b3eb8757040b86c1be3951 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 20:28:12 -0400
 Subject: [PATCH] Don't load Chunks from Hoppers and other things

Spigot-Server-Patches/0145-Prevent-Auto-Save-if-Save-Queue-is-full.patch

@@ -1,4 +1,4 @@
-From a5933b1c3c740f9eb59ce6db6ea847ee2a588a26 Mon Sep 17 00:00:00 2001
+From 611b7ca3705d1bbddc52ce5b54239609b31dbb28 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Nov 2016 21:52:22 -0400
 Subject: [PATCH] Prevent Auto Save if Save Queue is full

Spigot-Server-Patches/0146-Chunk-Save-Stats-Debug-Option.patch

@@ -1,4 +1,4 @@
-From 8281788d504c1618e1129a3dc19ce80b64d1c22c Mon Sep 17 00:00:00 2001
+From 4acb687be9e81d3882d1dcc889a97acc566f8eb3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Nov 2016 02:12:10 -0400
 Subject: [PATCH] Chunk Save Stats Debug Option

Spigot-Server-Patches/0147-Filter-bad-data-from-ArmorStand-and-SpawnEgg-items.patch

@@ -1,11 +1,11 @@
-From 4134a60719294c89762a82aa1ed2141094d07b7a Mon Sep 17 00:00:00 2001
+From 69ebaca79e2c169b0db6b464beaf1b8a384ae0ed Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 12 Nov 2016 23:25:22 -0600
 Subject: [PATCH] Filter bad data from ArmorStand and SpawnEgg items
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 4d0f2051a..872001d04 100644
+index 4d0f2051aa..872001d041 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -3,6 +3,7 @@ package com.destroystokyo.paper;
@@ -30,7 +30,7 @@ index 4d0f2051a..872001d04 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 33bc46b05..4e1b74ebe 100644
+index 33bc46b054..4e1b74ebe4 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -228,6 +228,15 @@ public class EntityFallingBlock extends Entity {

Spigot-Server-Patches/0148-Cache-user-authenticator-threads.patch

@@ -1,4 +1,4 @@
-From 1462c435b911a715894e8eeb1e3974b90d2263c6 Mon Sep 17 00:00:00 2001
+From b38249ab76ae2e8e2b755b638a6f33c10b388258 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 08:31:45 -0500
 Subject: [PATCH] Cache user authenticator threads

Spigot-Server-Patches/0149-Optimize-Network-Queue.patch

@@ -1,11 +1,11 @@
-From e1b901c4c6129afd133c9364c4996e61b03ab618 Mon Sep 17 00:00:00 2001
+From 4d7709bdec846b2845277b058b0fee0c2afb580d Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Wed, 23 Nov 2016 12:54:56 -0500
 Subject: [PATCH] Optimize Network Queue
 
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 94df23c31f..c97953a2fd 100644
+index 02daa43c68..0560882314 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -118,7 +118,7 @@ public abstract class MinecraftServer implements IAsyncTaskHandler, IMojangStati

Spigot-Server-Patches/0150-Optimise-removeQueue.patch

@@ -1,4 +1,4 @@
-From e9debd0d37b58e79725dbb5f4bc8029f23ee63f5 Mon Sep 17 00:00:00 2001
+From ebb301f7d984c0b8b4e17421060351a161896c9b Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue

Spigot-Server-Patches/0151-Allow-Reloading-of-Command-Aliases.patch

@@ -1,4 +1,4 @@
-From 89bbc27aa798aaa73dc9a5774b44560541178f04 Mon Sep 17 00:00:00 2001
+From 62fe788b0effcd22b0855348cf12920c3d3b9c91 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@@ -6,7 +6,7 @@ Subject: [PATCH] Allow Reloading of Command Aliases
 Reload the aliases stored in commands.yml
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
-index 7a7617750..6470135f7 100644
+index 7a7617750e..6470135f77 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1972,5 +1972,24 @@ public final class CraftServer implements Server {

Spigot-Server-Patches/0152-Add-source-to-PlayerExpChangeEvent.patch

@@ -1,4 +1,4 @@
-From fb639b8ca21b61e7043169b518c47f59b200e512 Mon Sep 17 00:00:00 2001
+From f0e15ef75b19d01a56fc793b28d3bb65478358de Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent

Spigot-Server-Patches/0153-Optimize-World.isLoaded-BlockPosition-Z.patch

@@ -1,4 +1,4 @@
-From 7a5bea01249d8a9da6a2ac09ae808e0baeb1e9fa Mon Sep 17 00:00:00 2001
+From 7b189ce3b0d490e5193f148241f783ed19d40033 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5d3378be0b..92070c9325 100644
+index 20e52fbcc8..6fe8ce96aa 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -273,6 +273,10 @@ public abstract class World implements GeneratorAccess, IIBlockAccess, AutoClose

Spigot-Server-Patches/0154-Don-t-let-fishinghooks-use-portals.patch

@@ -1,11 +1,11 @@
-From cb853229070f909198c981bb8c5e2f832cfb0a0b Mon Sep 17 00:00:00 2001
+From 0caccdfd0545a6b148266d891c7918effde93a12 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 964caa080..c28723158 100644
+index 964caa080c..c287231584 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -157,7 +157,7 @@ public abstract class Entity implements INamableTileEntity, ICommandListener, Ke
@@ -18,7 +18,7 @@ index 964caa080..c28723158 100644
      public int dimension;
      protected BlockPosition aq;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 7c119282b..4f801e8fe 100644
+index 7c119282b9..4f801e8fec 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -190,6 +190,12 @@ public class EntityFishingHook extends Entity {
@@ -35,5 +35,5 @@ index 7c119282b..4f801e8fe 100644
      }
  
 -- 
-2.17.1
+2.18.0
 

Spigot-Server-Patches/0155-Add-ProjectileCollideEvent.patch

@@ -1,4 +1,4 @@
-From 7b0507da629c3fcacfddd3c1da01a7bbf86fd8d8 Mon Sep 17 00:00:00 2001
+From dcd8262480ab5d1b2cfa2c232d16c345c48bf1de Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent

Spigot-Server-Patches/0156-Prevent-Pathfinding-out-of-World-Border.patch

@@ -1,4 +1,4 @@
-From 44e9f98e750fe8171d75df30354e63ef03e5b5ba Mon Sep 17 00:00:00 2001
+From 142065759260b7302dcdd7abf73aff114fe2aba5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border

Spigot-Server-Patches/0157-Bound-Treasure-Maps-to-World-Border.patch

@@ -1,4 +1,4 @@
-From 2251066897e6922fa76254032d8420e91fb16eca Mon Sep 17 00:00:00 2001
+From 9d310106114ee82c53fbcf15191d7ada9fa69cf3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border

Spigot-Server-Patches/0158-Configurable-Cartographer-Treasure-Maps.patch

@@ -1,4 +1,4 @@
-From 39a196741c1700fa0eb36c211f9a2656e89fe58f Mon Sep 17 00:00:00 2001
+From 016a2ae644aa7f14306cfa9a71fd9b86637a5d34 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 872001d04..b95f259a9 100644
+index 872001d041..b95f259a9a 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -334,4 +334,14 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index 872001d04..b95f259a9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 45df38bad..e8fdf8625 100644
+index 45df38bad4..e8fdf86250 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -755,6 +755,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {

Spigot-Server-Patches/0159-Optimize-ItemStack.isEmpty.patch

@@ -1,4 +1,4 @@
-From 766b2224cc263eb3f5d84aedae774f89cc97afdc Mon Sep 17 00:00:00 2001
+From f71f7c99f39e17afaa189ddb74c6ff65d58231d8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary
 
 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 6e7b2e721d..33e82f5377 100644
+index c7ef9c6890..4f230975aa 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -142,7 +142,7 @@ public final class ItemStack {

Spigot-Server-Patches/0160-Add-API-methods-to-control-if-armour-stands-can-move.patch

@@ -1,11 +1,11 @@
-From 9552638e5117ea211b9a4d0f6104982070a79281 Mon Sep 17 00:00:00 2001
+From dd4923a11f20976061fbd0f9bfcbf2d688bd1eb8 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index cf11a2225..578d96640 100644
+index cf11a2225b..578d966401 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -44,6 +44,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index cf11a2225..578d96640 100644
 +    // Paper end
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08ad..124c3185b 100644
+index 2b66a08ade..124c3185bc 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -211,4 +211,16 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {

Spigot-Server-Patches/0161-Add-option-to-remove-invalid-statistics.patch

@@ -1,11 +1,11 @@
-From 76c7552376cc1589c2638fc771b9267878df9f51 Mon Sep 17 00:00:00 2001
+From 91cc5d3990869c146ee076d44d79fa05d39a83d0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 20 Dec 2016 23:09:21 -0600
 Subject: [PATCH] Add option to remove invalid statistics
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 315d85090..644e01101 100644
+index c1845d6811..9f1182c723 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -266,4 +266,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index 315d85090..644e01101 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 07e7db455..34c57e26f 100644
+index 07e7db455b..34c57e26f4 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -83,6 +83,7 @@ public class ServerStatisticManager extends StatisticManager {

Spigot-Server-Patches/0162-Properly-fix-item-duplication-bug.patch

@@ -1,4 +1,4 @@
-From d7f1fa572f569e45b105296e0dfd07c0eb661cb3 Mon Sep 17 00:00:00 2001
+From 24ecc3817771126c2d7976e868d27eed874baba7 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug

Spigot-Server-Patches/0163-String-based-Action-Bar-API.patch

@@ -1,11 +1,11 @@
-From 4cc0c78d2e772137aa7230ea36c01823f5845af6 Mon Sep 17 00:00:00 2001
+From 2a36c0293be0e894d2fb7531a905844308ce4a32 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
 
 
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
-index 70cdc3f10..381542e0d 100644
+index 70cdc3f102..381542e0d2 100644
 --- a/src/main/java/net/minecraft/server/MCUtil.java
 +++ b/src/main/java/net/minecraft/server/MCUtil.java
 @@ -1,10 +1,13 @@
@@ -62,7 +62,7 @@ index 70cdc3f10..381542e0d 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 6f23ef5b8..63341ec77 100644
+index 6f23ef5b81..63341ec778 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -209,6 +209,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {

Spigot-Server-Patches/0164-Activation-Range-Improvements.patch

@@ -1,4 +1,4 @@
-From 34be4ecc0e2f22775476b1525df4a1d6b66aaa52 Mon Sep 17 00:00:00 2001
+From 9f4b4b473e9497c4d41e4a7c3797b2b352d4acfe Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 22:38:06 -0500
 Subject: [PATCH] Activation Range Improvements

Spigot-Server-Patches/0165-Firework-API-s.patch

@@ -1,4 +1,4 @@
-From 9e4afcd7dd8a13723ed96074ecc3f71bef52f7d1 Mon Sep 17 00:00:00 2001
+From 19b9fd7bebcb2b56fcfd4d48a77d58ae4cde4731 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's

Spigot-Server-Patches/0166-PlayerTeleportEndGatewayEvent.patch

@@ -1,4 +1,4 @@
-From e2f315dc84a82b3d7a612787b73136bcb502495e Mon Sep 17 00:00:00 2001
+From 10a014c690c95c33e9ff9aa5667fe820fc2e9a06 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent