Update upstream CB

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

@@ -1,18 +1,18 @@
-From 3297e1fe6b7fed7ddd2c00a13ce84b44867ba8a5 Mon Sep 17 00:00:00 2001
+From 1296736b591fdc5caadef00bfb17a026fb9d56e5 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:18:39 -0600
 Subject: [PATCH] Be a bit more informative in maxHealth exception
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 4641e3d..aaea4e8 100644
+index 58fbed1d3..c1af8ddbd 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -92,7 +92,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -93,7 +93,10 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
- 
      public void setHealth(double health) {
+         health = (float) health;
          if ((health < 0) || (health > getMaxHealth())) {
--            throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth());
+-            throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + "(" + health + ")");
 +            // Paper - Be more informative
 +            throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + ", but was " + health
 +                    + ". (attribute base value: " + this.getHandle().getAttributeInstance(GenericAttributes.maxHealth).b()
@@ -21,5 +21,5 @@ index 4641e3d..aaea4e8 100644
  
          if (health == 0) {
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From 7a13996738912fc0d21b933fdf57cf51987d83b9 Mon Sep 17 00:00:00 2001
+From 0682a1c8a0a5f078c6d72d7035fe17a64e6316e2 Mon Sep 17 00:00:00 2001
 From: mrapple <tony@oc.tc>
 Date: Sun, 25 Nov 2012 13:43:39 -0600
 Subject: [PATCH] Add methods for working with arrows stuck in living entities
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index b959fdac8..bf8fbac4e 100644
+index a2d476818..193dadf43 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -1380,10 +1380,12 @@ public abstract class EntityLiving extends Entity {
@@ -22,10 +22,10 @@ index b959fdac8..bf8fbac4e 100644
          this.datawatcher.set(EntityLiving.bq, Integer.valueOf(i));
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index aaea4e860..2a77cd462 100644
+index c1af8ddbd..392e72bb5 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -559,4 +559,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -560,4 +560,16 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
      public boolean isCollidable() {
          return getHandle().collides;
      }

Spigot-Server-Patches/0080-Set-health-before-death-event.patch

@@ -1,11 +1,11 @@
-From 7616559613d65192dcd5fc9ab8b685a37c8960ca Mon Sep 17 00:00:00 2001
+From aaca06a70159e5a8b8be8f71820311e886f10951 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 19 Jul 2015 16:51:38 -0400
 Subject: [PATCH] Set health before death event
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index 88b6778..a60aee6 100644
+index 7da844e43..4103d4966 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -200,4 +200,9 @@ public class PaperConfig {
@@ -19,10 +19,10 @@ index 88b6778..a60aee6 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 2a77cd4..0493c1b 100644
+index 392e72bb5..a7ca9a508 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -98,11 +98,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
+@@ -99,11 +99,20 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
                      + (this instanceof CraftPlayer ? ", player: " + this.getName() + ')' : ')'));
          }
  
@@ -45,5 +45,5 @@ index 2a77cd4..0493c1b 100644
  
      public double getMaxHealth() {
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0155-Convert-new-health-to-a-float-during-set.patch

@@ -1,22 +0,0 @@
-From bcdd19f402a03724ce08447a8949176b0d0fbeab Mon Sep 17 00:00:00 2001
-From: kashike <kashike@vq.lc>
-Date: Thu, 1 Sep 2016 09:51:31 +0000
-Subject: [PATCH] Convert new health to a float during set
-
-Convert the new health value to a float before doing any validation logic
-
-diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-index 0493c1b..13d480f 100644
---- a/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-+++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftLivingEntity.java
-@@ -91,6 +91,7 @@ public class CraftLivingEntity extends CraftEntity implements LivingEntity {
-     }
- 
-     public void setHealth(double health) {
-+        health = (float) health; // Paper - convert health to a float during set to avoid the below error
-         if ((health < 0) || (health > getMaxHealth())) {
-             // Paper - Be more informative
-             throw new IllegalArgumentException("Health must be between 0 and " + getMaxHealth() + ", but was " + health
--- 
-2.9.3
-

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

@@ -1,11 +1,11 @@
-From 57b5fcc7936abe190f99e1d2a7c9cf6598285a60 Mon Sep 17 00:00:00 2001
+From 7765ad8bc7632664a0d4afbffe5b643d44f8e160 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
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 968c039..6c73e9a 100644
+index 968c03911..6c73e9a87 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1800,7 +1800,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -18,5 +18,5 @@ index 968c039..6c73e9a 100644
                              } else {
                                  Slot slot = this.player.activeContainer.getSlot(packetplayinwindowclick.b());
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From 9da6c289b144172ee1a8db3e63f9b2e24e1fa7f4 Mon Sep 17 00:00:00 2001
+From f9b70ce9eaf7eb1987f577d079506ad14491141f 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 b1aa228..3f5b482 100644
+index b1aa228f3..3f5b4825e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -225,4 +225,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index b1aa228..3f5b482 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 6c73e9a..2014714 100644
+index 6c73e9a87..20147142c 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -862,13 +862,14 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -44,5 +44,5 @@ index 6c73e9a..2014714 100644
              limitedPackets = 0;
              return true;
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From e8480741ede4c7cc74e90f39a4e6b9c40438f034 Mon Sep 17 00:00:00 2001
+From cbfe52d1b9d165b323c1291736f1a141169271ff 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 3f5b482..7018828 100644
+index 3f5b4825e..7018828bb 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -234,4 +234,11 @@ public class PaperConfig {
@@ -21,7 +21,7 @@ index 3f5b482..7018828 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 2014714..30726ae 100644
+index 20147142c..30726ae69 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -142,7 +142,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -43,5 +43,5 @@ index 2014714..30726ae 100644
                  }
              } else {
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,4 +1,4 @@
-From ec543c4631be849db42ba3150c4d686f72d55b26 Mon Sep 17 00:00:00 2001
+From 53871d032337b751a60b9980c4df8c161df75b29 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 7018828..dcb971a 100644
+index 7018828bb..dcb971a17 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -241,4 +241,9 @@ public class PaperConfig {
@@ -26,7 +26,7 @@ index 7018828..dcb971a 100644
 +    }
  }
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 965edc9..da530f9 100644
+index 965edc99c..da530f9aa 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -2,6 +2,7 @@ package com.destroystokyo.paper;
@@ -58,7 +58,7 @@ index 965edc9..da530f9 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 88437d7..9f7f32d 100644
+index 88437d77a..9f7f32dc2 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -960,11 +960,9 @@ public class Chunk {
@@ -76,7 +76,7 @@ index 88437d7..9f7f32d 100644
  
      public Random a(long i) {
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 7a56a64..5c5a56c 100644
+index 7a56a6416..5c5a56c51 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -1,5 +1,6 @@
@@ -96,7 +96,7 @@ index 7a56a64..5c5a56c 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index a52b562..ff85e16 100644
+index b5e386501..d67493666 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -30,6 +30,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -108,7 +108,7 @@ index a52b562..ff85e16 100644
      public final MinecraftServer server;
      public final PlayerInteractManager playerInteractManager;
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index b3e0ef7..9cdcdc4 100644
+index b3e0ef7fb..9cdcdc45a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -117,6 +117,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -155,7 +155,7 @@ index b3e0ef7..9cdcdc4 100644
          this.methodProfiler.a("tallying");
          this.h[this.ticks % 100] = System.nanoTime() - i;
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index be67df0..f675a70 100644
+index be67df061..f675a7013 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -330,6 +330,7 @@ public abstract class PlayerList {
@@ -192,7 +192,7 @@ index be67df0..f675a70 100644
      public void addWhitelist(GameProfile gameprofile) {
          this.whitelist.add(new WhiteListEntry(gameprofile));
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f969d2a..cc0e8d2 100644
+index f969d2a72..cc0e8d2c8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1003,8 +1003,9 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -215,5 +215,5 @@ index f969d2a..cc0e8d2 100644
              timings.worldSaveChunks.startTiming(); // Paper
              chunkproviderserver.a(flag);
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,4 +1,4 @@
-From ce2c2cae65762b4782f85dca2ac33ba4ed8d6204 Mon Sep 17 00:00:00 2001
+From 3cf59989e5b9a17e4186943fa44ef2b90ce192d8 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
@@ -8,7 +8,7 @@ World checks and the Chunk Add logic are inconsistent on how Y > 256, < 0, is tr
 Keep them consistent
 
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index ae1edb0..ee3f14c 100644
+index ae1edb009..ee3f14cca 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1760,7 +1760,7 @@ public abstract class World implements IBlockAccess {
@@ -21,5 +21,5 @@ index ae1edb0..ee3f14c 100644
  
              if (!entity.aa || entity.ab != k || entity.ac != l || entity.ad != i1) {
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From 76fc1946fe7c0e3be45fba0abfbe8db79f38ab23 Mon Sep 17 00:00:00 2001
+From 3d9463bc18a705c0db7d39ee52b12b52c5ecb4fe 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
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
-index ecfc316..3f909c1 100644
+index ecfc316bb..3f909c174 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFish.java
 @@ -64,6 +64,16 @@ public class CraftFish extends AbstractProjectile implements Fish {
@@ -26,5 +26,5 @@ index ecfc316..3f909c1 100644
      public LivingEntity _INVALID_getShooter() {
          return (LivingEntity) getShooter();
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,4 +1,4 @@
-From 88353ade21124a255a37c70cb1adf5aba64d9de1 Mon Sep 17 00:00:00 2001
+From 6628ec9e240ac8e81caf14c21b479c2586cb25b9 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 ff85e16..865ab5a 100644
+index d67493666..9576264f6 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -128,6 +128,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -18,5 +18,5 @@ index ff85e16..865ab5a 100644
      }
  
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0162-Raise-string-limit-for-packet-serialization.patch

@@ -1,4 +1,4 @@
-From e07c5baeb6d4035cdad4090fa6832735a4fd3a96 Mon Sep 17 00:00:00 2001
+From 2b6337e1d5a45c92453d836b6081080dfc22e13d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Sep 2016 23:54:20 -0400
 Subject: [PATCH] Raise string limit for packet serialization
@@ -8,7 +8,7 @@ The default limit is possible to hit with 50 page books with color codes, causin
 Bump the limit up a hair to above currently seen sizes.
 
 diff --git a/src/main/java/net/minecraft/server/PacketDataSerializer.java b/src/main/java/net/minecraft/server/PacketDataSerializer.java
-index 7a66195..68e8c46 100644
+index 7a6619595..68e8c4671 100644
 --- a/src/main/java/net/minecraft/server/PacketDataSerializer.java
 +++ b/src/main/java/net/minecraft/server/PacketDataSerializer.java
 @@ -297,8 +297,8 @@ public class PacketDataSerializer extends ByteBuf {
@@ -23,5 +23,5 @@ index 7a66195..68e8c46 100644
              this.d(abyte.length);
              this.writeBytes(abyte);
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,4 +1,4 @@
-From 0305bd7efe93f0852160268f7bf92ef288a3915e Mon Sep 17 00:00:00 2001
+From fd222183aa6a8d26fa588ea63e72b9e6373c28f4 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Disable Vanilla Chunk GC
 Bukkit has its own system for this.
 
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index cc0e8d2..7a6d11f 100644
+index cc0e8d2c8..7a6d11f20 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
 @@ -1020,7 +1020,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
@@ -29,5 +29,5 @@ index cc0e8d2..7a6d11f 100644
          }
      }
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From 619a184dd43c3ac81907ea9c9a30b9a71c84b8be Mon Sep 17 00:00:00 2001
+From bc529beac28d44e98cb027a1691f612ac33ef206 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 da530f9..376b9ed 100644
+index da530f9aa..376b9eda3 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -381,4 +381,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index da530f9..376b9ed 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 9f7f32d..d850dbf 100644
+index 9f7f32dc2..d850dbfc3 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
 @@ -783,11 +783,17 @@ public class Chunk {
@@ -41,5 +41,5 @@ index 9f7f32d..d850dbf 100644
          if (this.j) {
              TileEntity tileentity = (TileEntity) this.tileEntities.remove(blockposition);
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From e9c16b86b3ae078759e9a7a5a4306cd870214d0e Mon Sep 17 00:00:00 2001
+From aeac2456514f88556905fdca2e008fda6a5778b6 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPig.java b/src/main/java/net/minecraft/server/EntityPig.java
-index 88bd674..80ad25c 100644
+index 88bd674ba..80ad25c1b 100644
 --- a/src/main/java/net/minecraft/server/EntityPig.java
 +++ b/src/main/java/net/minecraft/server/EntityPig.java
 @@ -159,6 +159,12 @@ public class EntityPig extends EntityAnimal {
@@ -22,7 +22,7 @@ index 88bd674..80ad25c 100644
              if (CraftEventFactory.callPigZapEvent(this, entitylightning, entitypigzombie).isCancelled()) {
                  return;
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index ee11691..4ad7546 100644
+index ee11691bf..4ad75468c 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -616,6 +616,12 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -48,7 +48,7 @@ index ee11691..4ad7546 100644
          }
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 34dd048..ceefe8f 100644
+index 34dd048f4..ceefe8f5d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -671,6 +671,14 @@ public class CraftEventFactory {
@@ -67,5 +67,5 @@ index 34dd048..ceefe8f 100644
          HorseJumpEvent event = new HorseJumpEvent((AbstractHorse) horse.getBukkitEntity(), power);
          horse.getBukkitEntity().getServer().getPluginManager().callEvent(event);
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,4 +1,4 @@
-From fc58b79f9d2af4b4302702788ecf20bf61258e24 Mon Sep 17 00:00:00 2001
+From 56ad9b89139354596b878c072ac70d0821953537 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
@@ -13,7 +13,7 @@ This of course is undesirable, so just return the loaded side as "primary"
 and treat it as a single chest if the other sides are unloaded
 
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index 9c4d1c9..dd1c1a3 100644
+index 9c4d1c938..dd1c1a39b 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
 @@ -339,7 +339,13 @@ public class BlockChest extends BlockTileEntity {
@@ -32,5 +32,5 @@ index 9c4d1c9..dd1c1a3 100644
                      if (block == this) {
                          if (this.e(world, blockposition1)) {
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,4 +1,4 @@
-From dfab41eff8e54d14bb9fabe871e924425e1bc227 Mon Sep 17 00:00:00 2001
+From 9a8322a9eab3f68a0b6396656bfdfa917a8936d2 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
@@ -7,7 +7,7 @@ If the save queue already has 50 (configurable) of chunks pending,
 then avoid processing auto save (which would add more)
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 376b9ed..4ad072a 100644
+index 376b9eda3..4ad072ad8 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -382,6 +382,11 @@ public class PaperWorldConfig {
@@ -23,7 +23,7 @@ index 376b9ed..4ad072a 100644
      private void removeCorruptTEs() {
          removeCorruptTEs = getBoolean("remove-corrupt-tile-entities", false);
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 5c5a56c..b7afcb2 100644
+index 5c5a56c51..b7afcb204 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -254,6 +254,14 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -51,7 +51,7 @@ index 5c5a56c..b7afcb2 100644
                  }
              }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 1941121..139f279 100644
+index 19411212a..139f2799c 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -33,6 +33,7 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -63,5 +63,5 @@ index 1941121..139f279 100644
          ChunkCoordIntPair chunkcoordintpair = new ChunkCoordIntPair(i, j);
  
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,4 +1,4 @@
-From 9a0d4eaa54333b645b373b23f47a19509515a4fd Mon Sep 17 00:00:00 2001
+From 9ca9b1e8b6057785329ad750eb3a8c1ec25f46ac 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
@@ -8,7 +8,7 @@ Adds a command line flag to enable stats on how chunk saves are processing.
 Stats on current queue, how many was processed and how many were queued.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index b7afcb2..3b82627 100644
+index b7afcb204..3b82627eb 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
 @@ -28,6 +28,11 @@ public class ChunkProviderServer implements IChunkProvider {
@@ -55,7 +55,7 @@ index b7afcb2..3b82627 100644
              return false;
          }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 139f279..a10964b 100644
+index 139f2799c..a10964b5b 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -33,7 +33,13 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -90,5 +90,5 @@ index 139f279..a10964b 100644
              boolean flag;
  
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From 40e99b788e5e633d514a07da8d71d7f8436e2c0d Mon Sep 17 00:00:00 2001
+From ea606c2b1fe69dceefcbecdd3a296ac694e86e36 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 4ad072a..73bf744 100644
+index 4ad072ad8..73bf74422 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -391,4 +391,12 @@ public class PaperWorldConfig {
@@ -22,7 +22,7 @@ index 4ad072a..73bf744 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityFallingBlock.java b/src/main/java/net/minecraft/server/EntityFallingBlock.java
-index 8059e6d..a4f465e 100644
+index 8059e6dcd..a4f465e38 100644
 --- a/src/main/java/net/minecraft/server/EntityFallingBlock.java
 +++ b/src/main/java/net/minecraft/server/EntityFallingBlock.java
 @@ -251,6 +251,14 @@ public class EntityFallingBlock extends Entity {
@@ -41,7 +41,7 @@ index 8059e6d..a4f465e 100644
          Block block = this.block.getBlock();
  
 diff --git a/src/main/java/net/minecraft/server/ItemMonsterEgg.java b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
-index 1a01a57..f914ad4 100644
+index 1a01a57d2..f914ad417 100644
 --- a/src/main/java/net/minecraft/server/ItemMonsterEgg.java
 +++ b/src/main/java/net/minecraft/server/ItemMonsterEgg.java
 @@ -102,7 +102,14 @@ public class ItemMonsterEgg extends Item {
@@ -61,5 +61,5 @@ index 1a01a57..f914ad4 100644
                  entity.f(nbttagcompound1);
              }
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From 00a242d15af9615b1660c6b8670f045c92879300 Mon Sep 17 00:00:00 2001
+From ef01ba87037b167b8dc1535de3e3305c893fa2da 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
 
 
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index fe390fe..350ec03 100644
+index fe390feb9..350ec0323 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
 @@ -84,6 +84,12 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@@ -63,5 +63,5 @@ index fe390fe..350ec03 100644
      }
  
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From c31c56f3225f88b8b9f89a0cba8b4eb6ff8d136a Mon Sep 17 00:00:00 2001
+From 4d091fa158b4578c63484d21b6c3d99863f44bba 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 9cdcdc4..f96da89 100644
+index 9cdcdc45a..f96da8945 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -102,7 +102,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -18,5 +18,5 @@ index 9cdcdc4..f96da89 100644
      private long ab = aw();
  
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0172-Optimise-NetworkManager.patch

@@ -1,11 +1,11 @@
-From 1cb36c5c43cf194e8a20138d73709b3a7714dbd4 Mon Sep 17 00:00:00 2001
+From 2ba3ed38b54f7ef5f82c89636e249abaefb730ff Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 20:35:05 +0000
 Subject: [PATCH] Optimise NetworkManager
 
 
 diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index 184ef32..be14c0b 100644
+index 184ef32a8..be14c0b25 100644
 --- a/src/main/java/net/minecraft/server/NetworkManager.java
 +++ b/src/main/java/net/minecraft/server/NetworkManager.java
 @@ -62,8 +62,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
@@ -121,5 +121,5 @@ index 184ef32..be14c0b 100644
  
          }
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From a3fd633088704fb8d6d6e268e5cd8317dd031335 Mon Sep 17 00:00:00 2001
+From 53bb3f57e7c93afff979876d20e05be67440cf1f 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 865ab5a..6325baf 100644
+index 9576264f6..cff21dd8d 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -4,7 +4,9 @@ import com.google.common.collect.Lists;
@@ -61,5 +61,5 @@ index 865ab5a..6325baf 100644
  
      protected void a(MobEffect mobeffect) {
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,4 +1,4 @@
-From 0f9efb9581380733e92802be67bc2973c6d61905 Mon Sep 17 00:00:00 2001
+From fc71852806d0c70c3300d5bb6055c1de552842e4 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 1bbce7a..31c9a66 100644
+index 1bbce7a78..31c9a66b6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
 @@ -1848,5 +1848,15 @@ public final class CraftServer implements Server {
@@ -26,5 +26,5 @@ index 1bbce7a..31c9a66 100644
      // Paper end
  }
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From 54542ffb2fef73474028f82e4e1a012004990458 Mon Sep 17 00:00:00 2001
+From 94b01cbf4c1ae079c558720c06a4e19f8573a226 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 4b38164..14431b8 100644
+index 4b3816465..14431b8ad 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -172,7 +172,7 @@ public class EntityExperienceOrb extends Entity {
@@ -18,7 +18,7 @@ index 4b38164..14431b8 100644
  
                  this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index ceefe8f..104c3ce 100644
+index ceefe8f5d..104c3ce1d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -45,6 +45,7 @@ import org.bukkit.entity.Player;
@@ -48,5 +48,5 @@ index ceefe8f..104c3ce 100644
          Block block = world.getWorld().getBlockAt(x, y, z);
          CraftBlockState state = (CraftBlockState) block.getState();
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,4 +1,4 @@
-From b6ce850509cf00f172494e6f8e20bfaa8a6b1057 Mon Sep 17 00:00:00 2001
+From 8f8ae838b4b4a42d433c5592e374319a6be5030c 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 ee3f14c..5ea201e 100644
+index ee3f14cca..5ea201ed9 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -286,7 +286,7 @@ public abstract class World implements IBlockAccess {
@@ -19,5 +19,5 @@ index ee3f14c..5ea201e 100644
  
      public boolean a(BlockPosition blockposition, boolean flag) {
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0177-Speedup-BlockPos-by-fixing-inlining.patch

@@ -1,4 +1,4 @@
-From ffcde452891a2dec8898826d22962e2815d6d152 Mon Sep 17 00:00:00 2001
+From 07c4afb7070f5bd81820e9cc50eac084e78f2e23 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index f772c7c..f5dc144 100644
+index f772c7cdf..f5dc14493 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -7,11 +7,12 @@ import javax.annotation.concurrent.Immutable;
@@ -66,7 +66,7 @@ index f772c7c..f5dc144 100644
      public BaseBlockPosition d(BaseBlockPosition baseblockposition) {
          return new BaseBlockPosition(this.getY() * baseblockposition.getZ() - this.getZ() * baseblockposition.getY(), this.getZ() * baseblockposition.getX() - this.getX() * baseblockposition.getZ(), this.getX() * baseblockposition.getY() - this.getY() * baseblockposition.getX());
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index b3c1f55..6a0b3a6 100644
+index b3c1f550c..6a0b3a62d 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -211,19 +211,21 @@ public class BlockPosition extends BaseBlockPosition {
@@ -177,5 +177,5 @@ index b3c1f55..6a0b3a6 100644
  
          public BlockPosition h() {
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From d7a249718a819f8e00a9546693f5b74596feea59 Mon Sep 17 00:00:00 2001
+From 99ab310d8306e8ee1495804516c0a7fc7887400f 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 a3685ec..6656358 100644
+index a3685ec57..66563584f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -143,7 +143,7 @@ public abstract class Entity implements ICommandListener {
@@ -18,7 +18,7 @@ index a3685ec..6656358 100644
      public int dimension;
      protected BlockPosition an;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 0c528c6..606160a 100644
+index 0c528c699..606160a17 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -185,6 +185,12 @@ public class EntityFishingHook extends Entity {
@@ -35,5 +35,5 @@ index 0c528c6..606160a 100644
      }
  
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From 6a73feac6bbfa2e3b3e47786f494a8ae29244081 Mon Sep 17 00:00:00 2001
+From bd732661c1ea17893a42fb8c6d6a301d3d411b87 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 8cda475..79ca071 100644
+index 8cda47518..79ca071bc 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -190,6 +190,15 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -25,7 +25,7 @@ index 8cda475..79ca071 100644
                  this.a(movingobjectposition);
              }
 diff --git a/src/main/java/net/minecraft/server/EntityFireball.java b/src/main/java/net/minecraft/server/EntityFireball.java
-index 789de85..d5c9d24 100644
+index 789de85d1..d5c9d24cf 100644
 --- a/src/main/java/net/minecraft/server/EntityFireball.java
 +++ b/src/main/java/net/minecraft/server/EntityFireball.java
 @@ -70,6 +70,15 @@ public abstract class EntityFireball extends Entity {
@@ -45,7 +45,7 @@ index 789de85..d5c9d24 100644
                  this.a(movingobjectposition);
  
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 606160a..b78e0e4 100644
+index 606160a17..b78e0e49e 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
 @@ -240,6 +240,16 @@ public class EntityFishingHook extends Entity {
@@ -66,7 +66,7 @@ index 606160a..b78e0e4 100644
              vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z);
          }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 6fbc845..a8b9d92 100644
+index 6fbc84559..a8b9d9263 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
 @@ -160,6 +160,15 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@@ -86,7 +86,7 @@ index 6fbc845..a8b9d92 100644
              if (movingobjectposition.type == MovingObjectPosition.EnumMovingObjectType.BLOCK && this.world.getType(movingobjectposition.a()).getBlock() == Blocks.PORTAL) {
                  this.e(movingobjectposition.a());
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index 104c3ce..a7f827b 100644
+index 104c3ce1d..a7f827b67 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -792,6 +792,16 @@ public class CraftEventFactory {
@@ -107,5 +107,5 @@ index 104c3ce..a7f827b 100644
          Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
          ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From 78754b772ed91985a032ffcf48369d4cd95fbe39 Mon Sep 17 00:00:00 2001
+From e4f7d637a8e86123e5f99e825ed52558edce0043 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 22:10:35 -0600
 Subject: [PATCH] Vanished players don't have rights
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 6656358..4582b44 100644
+index 66563584f..4582b44ca 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -68,7 +68,7 @@ public abstract class Entity implements ICommandListener {
@@ -18,7 +18,7 @@ index 6656358..4582b44 100644
      protected int j;
      private Entity au;public void setVehicle(Entity entity) { this.au = entity; } // Paper // OBFHELPER
 diff --git a/src/main/java/net/minecraft/server/ItemBlock.java b/src/main/java/net/minecraft/server/ItemBlock.java
-index eb32871..a380e61 100644
+index eb32871bd..a380e615b 100644
 --- a/src/main/java/net/minecraft/server/ItemBlock.java
 +++ b/src/main/java/net/minecraft/server/ItemBlock.java
 @@ -20,7 +20,7 @@ public class ItemBlock extends Item {
@@ -31,7 +31,7 @@ index eb32871..a380e61 100644
              IBlockData iblockdata1 = this.a.getPlacedState(world, blockposition, enumdirection, f, f1, f2, i, entityhuman);
  
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5ea201e..fbdc450 100644
+index 5ea201ed9..fbdc450d1 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1796,6 +1796,33 @@ public abstract class World implements IBlockAccess {
@@ -78,7 +78,7 @@ index 5ea201e..fbdc450 100644
          this.getServer().getPluginManager().callEvent(event);
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
-index a7f827b..21a8cc7 100644
+index a7f827b67..21a8cc7f0 100644
 --- a/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 +++ b/src/main/java/org/bukkit/craftbukkit/event/CraftEventFactory.java
 @@ -797,6 +797,13 @@ public class CraftEventFactory {
@@ -96,5 +96,5 @@ index a7f827b..21a8cc7 100644
          return event;
      }
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,4 +1,4 @@
-From 3160b608ea40ce14bc154c44bf69d2b217d565dd Mon Sep 17 00:00:00 2001
+From 4300024fa23214ce098427de2ac3a09f81495c60 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border
 This prevents Entities from trying to run outside of the World Border
 
 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index c0ef240..74d1fd6 100644
+index c0ef2400b..74d1fd6b2 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
 @@ -69,6 +69,7 @@ public abstract class NavigationAbstract {
@@ -26,7 +26,7 @@ index c0ef240..74d1fd6 100644
              if (this.c != null && !this.c.b() && blockposition.equals(this.q)) {
                  return this.c;
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 9038d52..632eb1c 100644
+index 9038d52eb..632eb1c9d 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -29,7 +29,7 @@ public class WorldBorder {
@@ -39,5 +39,5 @@ index 9038d52..632eb1c 100644
      }
  
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0182-Ignore-invalid-Marker-Icon-ID-s-in-maps.patch

@@ -1,4 +1,4 @@
-From d6e5670a47e525658a753d478b2a90d974648c19 Mon Sep 17 00:00:00 2001
+From f57435f3697430f8acb77b73146404753206f51e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:38:57 -0500
 Subject: [PATCH] Ignore invalid Marker Icon ID's in maps
@@ -6,7 +6,7 @@ Subject: [PATCH] Ignore invalid Marker Icon ID's in maps
 Replace with the red marker. Should of only happened by creative abuse.
 
 diff --git a/src/main/java/net/minecraft/server/WorldMap.java b/src/main/java/net/minecraft/server/WorldMap.java
-index dbe6a80..dfd8e4d 100644
+index dbe6a80f2..dfd8e4d84 100644
 --- a/src/main/java/net/minecraft/server/WorldMap.java
 +++ b/src/main/java/net/minecraft/server/WorldMap.java
 @@ -194,7 +194,11 @@ public class WorldMap extends PersistentBase {
@@ -23,5 +23,5 @@ index dbe6a80..dfd8e4d 100644
                  }
              }
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,4 +1,4 @@
-From 509a9251303919994ac23a5c19c1c9ccefa438d3 Mon Sep 17 00:00:00 2001
+From c6dd309b98dd4efdd6fe84c4cfbc3e52f4199f79 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
@@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.
 
 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 9c1605b..7723676 100644
+index 9c1605b14..77236760f 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
 @@ -233,6 +233,9 @@ public abstract class StructureGenerator extends WorldGenBase {
@@ -25,7 +25,7 @@ index 9c1605b..7723676 100644
                              if (!flag1 || !world.b(l2, i3)) {
                                  return new BlockPosition((l2 << 4) + 8, 64, (i3 << 4) + 8);
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 632eb1c..1bb172b 100644
+index 632eb1c9d..1bb172bbf 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
 @@ -33,6 +33,18 @@ public class WorldBorder {
@@ -48,5 +48,5 @@ index 632eb1c..1bb172b 100644
          return (double) chunkcoordintpair.e() > this.b() && (double) chunkcoordintpair.c() < this.d() && (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e();
      }
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,4 +1,4 @@
-From 90b756d0798fb6ebe6a641c5fdbf7b6c8ea03822 Mon Sep 17 00:00:00 2001
+From 5e91efb7e5cb6a3812d67220724b1b343ea142bd 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 73bf744..a655b33 100644
+index 73bf74422..a655b3310 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -399,4 +399,14 @@ public class PaperWorldConfig {
@@ -28,7 +28,7 @@ index 73bf744..a655b33 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index 4ad7546..ac6e2a9 100644
+index 4ad75468c..ac6e2a9aa 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -761,7 +761,8 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -42,5 +42,5 @@ index 4ad7546..ac6e2a9 100644
              if (blockposition != null) {
                  ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true);
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,4 +1,4 @@
-From 98929d730bb71757834f2cb046e93391f3c79968 Mon Sep 17 00:00:00 2001
+From b89da7afca47aa4ee253252e9d0987ca47dacff7 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 911bd87..45ebd3f 100644
+index 911bd879a..45ebd3f61 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
 @@ -120,9 +120,15 @@ public final class ItemStack {
@@ -27,5 +27,5 @@ index 911bd87..45ebd3f 100644
      public static void a(DataConverterManager dataconvertermanager) {
          dataconvertermanager.a(DataConverterTypes.ITEM_INSTANCE, (DataInspector) (new DataInspectorBlockEntity()));
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From bbf2aa245b238a9084a999b9fba76e26489afb34 Mon Sep 17 00:00:00 2001
+From f7cab53501949e2eeb4837772ed75e6529553145 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 96bb110..7738ca3 100644
+index 96bb11005..7738ca385 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
 @@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving {
@@ -31,7 +31,7 @@ index 96bb110..7738ca3 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 2b66a08..8a06cb1 100644
+index 2b66a08ad..8a06cb165 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 @@ -211,4 +211,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@@ -50,5 +50,5 @@ index 2b66a08..8a06cb1 100644
 +    }
  }
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From d71a9a895ba320deab7f2418146a9406c31dd6db Mon Sep 17 00:00:00 2001
+From dad89fd5e206bc4c96bc01e552022513c6d39afa Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:52:04 -0600
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
 
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a655b33..e8762c4 100644
+index a655b3310..e8762c487 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -409,4 +409,9 @@ public class PaperWorldConfig {
@@ -19,7 +19,7 @@ index a655b33..e8762c4 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index fbdc450..869c11f 100644
+index fbdc450d1..869c11f81 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
 @@ -1329,6 +1329,7 @@ public abstract class World implements IBlockAccess {
@@ -31,5 +31,5 @@ index fbdc450..869c11f 100644
  
              for (int i = 0; i < list.size(); ++i) {
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From 5cb95a1756e3de3803e3e98a890f010f01dff02e Mon Sep 17 00:00:00 2001
+From a69f13e71467a2ba1d9762b972c3247cf1010f8f 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 dcb971a..7e0f670 100644
+index dcb971a17..7e0f67053 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
 @@ -246,4 +246,13 @@ public class PaperConfig {
@@ -23,7 +23,7 @@ index dcb971a..7e0f670 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 99466db..d1bee02 100644
+index 99466dbde..d1bee0257 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
 @@ -104,6 +104,7 @@ public class ServerStatisticManager extends StatisticManager {
@@ -53,5 +53,5 @@ index 99466db..d1bee02 100644
          }
      }
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0189-IllegalPacketEvent.patch

@@ -1,4 +1,4 @@
-From 9cf3486c0fb9f551a33bd99ddc3de4af38ca3411 Mon Sep 17 00:00:00 2001
+From c4a445c8c548b1cd7ab3534a89ded186de3caa8f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 23 Jun 2016 23:33:57 -0400
 Subject: [PATCH] IllegalPacketEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent
 Fired for invalid data from players that represents hacking attempts
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 30726ae..c6d6301 100644
+index 30726ae69..c6d63011d 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -67,5 +67,5 @@ index 30726ae..c6d6301 100644
                      }
                      // CraftBukkit start
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,4 +1,4 @@
-From 0a1e92cdf99210ef0604ae8988ab0a2fbf0755ab Mon Sep 17 00:00:00 2001
+From c84e25b7947738d4989e75b84eaf9618c499ec03 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Properly fix item duplication bug
 Credit to prplz for figuring out the real issue
 
 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 6325baf..e8659a5 100644
+index cff21dd8d..58217e55f 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
 @@ -1333,7 +1333,7 @@ public class EntityPlayer extends EntityHuman implements ICrafting {
@@ -19,7 +19,7 @@ index 6325baf..e8659a5 100644
  
      public void reset() {
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index c6d6301..48fc18f 100644
+index c6d63011d..48fc18f64 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2542,6 +2542,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -31,5 +31,5 @@ index c6d6301..48fc18f 100644
      }
  }
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From 0c2fed00aa5d22aa5254f8bd7f10bbd7ffc9ad5e Mon Sep 17 00:00:00 2001
+From 199a8c759491c9d4891263cecd97c65c097002c0 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 1159eea..3835951 100644
+index 1159eea1a..38359517c 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 1159eea..3835951 100644
 +    }
  }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 3edeb49..26b8979 100644
+index 3edeb4910..26b89799e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 @@ -163,6 +163,18 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@@ -85,5 +85,5 @@ index 3edeb49..26b8979 100644
          PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
          packet.header = header;
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,4 +1,4 @@
-From dc333e787198e993de7e00d4f8ce6af611bf91ea Mon Sep 17 00:00:00 2001
+From 80f5aaa2afda4fe90e9d9cd47710943a70ff78c7 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
@@ -6,7 +6,7 @@ Subject: [PATCH] Activation Range Improvements
 Fixes and adds new Immunities to improve gameplay behavior
 
 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index fdfe5b9..ce39074 100644
+index fdfe5b9ed..ce3907438 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
 @@ -10,6 +10,7 @@ public abstract class EntityCreature extends EntityInsentient {
@@ -18,7 +18,7 @@ index fdfe5b9..ce39074 100644
      private float b;
      private float c;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 4ec6bc9..07688b1 100644
+index 4ec6bc972..07688b1ce 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -73,7 +73,7 @@ public abstract class EntityLiving extends Entity {
@@ -31,7 +31,7 @@ index 4ec6bc9..07688b1 100644
      protected int ticksFarFromPlayer;
      protected float aW;
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index 13ae7a0..7e3aa6e 100644
+index 13ae7a030..7e3aa6ee6 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
 @@ -363,7 +363,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@@ -44,7 +44,7 @@ index 13ae7a0..7e3aa6e 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index ac6e2a9..e6c190d 100644
+index ac6e2a9aa..e6c190d43 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
 @@ -20,7 +20,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@@ -57,7 +57,7 @@ index ac6e2a9..e6c190d 100644
      Village village;
      private EntityHuman tradingPlayer;
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index 83d9c43..1cb6652 100644
+index 83d9c43f3..1cb6652c2 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
 @@ -18,7 +18,10 @@ public abstract class PathfinderGoal {
@@ -73,7 +73,7 @@ index 83d9c43..1cb6652 100644
      public void e() {}
  
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
-index e5b5e98..e3781f3 100644
+index e5b5e9887..e3781f3a8 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 @@ -2,12 +2,21 @@ package net.minecraft.server;
@@ -110,7 +110,7 @@ index e5b5e98..e3781f3 100644
                          }
                      }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index c8a6ff3..428912c 100644
+index c8a6ff3d4..428912cbc 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
 @@ -20,6 +20,7 @@ import net.minecraft.server.EntityFireball;
@@ -155,5 +155,5 @@ index c8a6ff3..428912c 100644
              {
                  EntityAnimal animal = (EntityAnimal) entity;
 -- 
-2.9.3
+2.11.0
 

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

@@ -1,11 +1,11 @@
-From 0f47833fdfad3a2fdf93468cb86b10db068db575 Mon Sep 17 00:00:00 2001
+From 5d2367ab09b48aab07a594c7623ad5b9ac35c2ce 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
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 572f4de..f9cf382 100644
+index 572f4dead..f9cf382b2 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
 @@ -2,6 +2,8 @@ package net.minecraft.server;
@@ -53,7 +53,7 @@ index 572f4de..f9cf382 100644
  
      public boolean aV() {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index 4fc36d2..5cd68bf 100644
+index 4fc36d243..5cd68bfaf 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
 @@ -9,6 +9,7 @@ public class ItemFireworks extends Item {
@@ -73,7 +73,7 @@ index 4fc36d2..5cd68bf 100644
                  if (!entityhuman.abilities.canInstantlyBuild) {
                      itemstack.subtract(1);
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index 2a2f53c..266741f 100644
+index 2a2f53c82..266741fcd 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
 @@ -103,7 +103,7 @@ public class NBTTagCompound extends NBTBase {
@@ -86,7 +86,7 @@ index 2a2f53c..266741f 100644
      }
  
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 99746b3..d4fbe31 100644
+index 99746b3c2..d4fbe31d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 @@ -1,6 +1,7 @@
@@ -129,5 +129,5 @@ index 99746b3..d4fbe31 100644
 +    // Paper end
  }
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0194-Change-Outdated-Build-Download-URL-to-Paper-CI.patch

@@ -1,11 +1,11 @@
-From fead6b49be37928cbae49c947f841db2fe07ed38 Mon Sep 17 00:00:00 2001
+From 625eec111773732cf5214eefbed6db8c145687eb Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 29 Dec 2016 00:56:51 -0500
 Subject: [PATCH] Change Outdated Build Download URL to Paper CI
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index 4ac4e6f..3164e71 100644
+index 4ac4e6fd3..3164e7130 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
 @@ -200,7 +200,7 @@ public class Main {
@@ -18,5 +18,5 @@ index 4ac4e6f..3164e71 100644
                          Thread.sleep(TimeUnit.SECONDS.toMillis(15));
                      }
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0195-PlayerTeleportEndGatewayEvent.patch

@@ -1,4 +1,4 @@
-From 0c1528c54ffa3864bdbb41ae001d1c46b165c72f Mon Sep 17 00:00:00 2001
+From 3331f90f88f72d43c0712d98934ee579fcbbee9b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event
 
 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index 065d0bb..ea8992d 100644
+index 065d0bbfc..ea8992d72 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 @@ -124,7 +124,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@@ -19,5 +19,5 @@ index 065d0bb..ea8992d 100644
                      if (teleEvent.isCancelled()) {
                          return;
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0196-MC-111699-Ignore-Improper-Anvil-Item-Name-Packets.patch

@@ -1,4 +1,4 @@
-From f809fd07b0cdb887cc360f88627d7e920f8fe87f Mon Sep 17 00:00:00 2001
+From 1eb8895ea3faa5a5d86cce1a3987dafae44af62a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 02:07:24 -0500
 Subject: [PATCH] MC-111699: Ignore Improper Anvil Item Name Packets
@@ -11,7 +11,7 @@ This breaks the ability to rename more than 1 item at a time.
 See: https://bugs.mojang.com/browse/MC-111699
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 48fc18f..85a397f 100644
+index 48fc18f64..85a397fc0 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2426,7 +2426,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -24,5 +24,5 @@ index 48fc18f..85a397f 100644
                              } else {
                                  containeranvil.a("");
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0197-MC-112017-Allow-31-instead-of-30-for-item-names.patch

@@ -1,11 +1,11 @@
-From 929d116641ae926b9aeaedd6885f339ab1bde996 Mon Sep 17 00:00:00 2001
+From e567e95f08b62e4dc0745348cd1268b02fe2e6d6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 02:43:22 -0500
 Subject: [PATCH] MC-112017: Allow 31 instead of 30 for item names
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 85a397f..be9c4cc 100644
+index 85a397fc0..be9c4cc7f 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -2425,7 +2425,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -18,5 +18,5 @@ index 85a397f..be9c4cc 100644
                                  }
                              } else {
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0198-ShulkerBox-Dupe-Prevention.patch

@@ -1,4 +1,4 @@
-From 2a9d9d7750cc9d6f0642032741dd62ee88e87a0f Mon Sep 17 00:00:00 2001
+From a7cbc5919d8864382fea1849336260e011fdf4c8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 16:32:56 -0500
 Subject: [PATCH] ShulkerBox Dupe Prevention
@@ -7,7 +7,7 @@ This ensures that Shulker Boxes can never drop their contents twice, and
 that the inventory is cleared incase it some how also got saved to the world.
 
 diff --git a/src/main/java/net/minecraft/server/BlockShulkerBox.java b/src/main/java/net/minecraft/server/BlockShulkerBox.java
-index fcb1a6c..12fb816 100644
+index fcb1a6c66..12fb81635 100644
 --- a/src/main/java/net/minecraft/server/BlockShulkerBox.java
 +++ b/src/main/java/net/minecraft/server/BlockShulkerBox.java
 @@ -109,6 +109,7 @@ public class BlockShulkerBox extends BlockTileEntity {
@@ -19,5 +19,5 @@ index fcb1a6c..12fb816 100644
  
              world.updateAdjacentComparators(blockposition, iblockdata.getBlock());
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0199-Provide-E-TE-Chunk-count-stat-methods.patch

@@ -1,4 +1,4 @@
-From 5ece888aafbc73029bfa5ff4ce2a9233214aed16 Mon Sep 17 00:00:00 2001
+From 916402f157c1f616887deba4a577e0d19ad438a5 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 5a44a9f..da478ef 100644
+index 5a44a9f38..da478ef81 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -78,6 +78,29 @@ public class CraftWorld implements World {
@@ -41,5 +41,5 @@ index 5a44a9f..da478ef 100644
  
      public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0200-Enforce-Sync-Player-Saves.patch

@@ -1,4 +1,4 @@
-From 8662d21eec7cf0a245afa76c2bb97f5aa46b622a Mon Sep 17 00:00:00 2001
+From f8bc3dbb3e883bfae68fc44d2dfd9515b8eb43ff Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index f675a70..a9d59bb 100644
+index f675a7013..a9d59bbf5 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
 @@ -1212,6 +1212,7 @@ public abstract class PlayerList {
@@ -27,5 +27,5 @@ index f675a70..a9d59bb 100644
      // Paper end
  
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0201-Enforce-Sync-Chunk-Unloads.patch

@@ -1,4 +1,4 @@
-From 5c19853f344cc99877fa67e0bb8264c36140fb2f Mon Sep 17 00:00:00 2001
+From d4aa3c8deec9ddbaca22637b693f3328b90d4cd4 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 16:06:44 -0500
 Subject: [PATCH] Enforce Sync Chunk Unloads
@@ -7,7 +7,7 @@ Unloading Chunks async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index da478ef..95dcb9f 100644
+index da478ef81..95dcb9f81 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -238,6 +238,7 @@ public class CraftWorld implements World {
@@ -27,5 +27,5 @@ index da478ef..95dcb9f 100644
  
      public boolean regenerateChunk(int x, int z) {
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0202-Don-t-allow-entities-to-ride-themselves-572.patch

@@ -1,11 +1,11 @@
-From 2cab3eb376f8c1e33443825626dcfd9f19220f2a Mon Sep 17 00:00:00 2001
+From 6ed7a04198e6377cefc6e90ed0d4fb4f03847539 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 4582b44..a1d2233 100644
+index 4582b44ca..a1d2233ba 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1869,6 +1869,7 @@ public abstract class Entity implements ICommandListener {
@@ -17,5 +17,5 @@ index 4582b44..a1d2233 100644
              throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
          } else {
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0203-Fix-block-break-desync.patch

@@ -1,11 +1,11 @@
-From 66f928386db0545e7f032a6f3c2818ce4f16fb27 Mon Sep 17 00:00:00 2001
+From 6dab89610b23619c3ed9526b91839eb7fd19bdf3 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 8 Jan 2017 18:50:35 +1100
 Subject: [PATCH] Fix block break desync
 
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index be9c4cc..f153e58 100644
+index be9c4cc7f..f153e58ee 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -821,6 +821,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -17,5 +17,5 @@ index be9c4cc..f153e58 100644
              } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
                  return;
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0204-Assign-the-World-in-WorldGenStronghold.patch

@@ -1,11 +1,11 @@
-From bbe7c59189a5f0cc2aab47ab258b52d04df9bd1f Mon Sep 17 00:00:00 2001
+From 006c3a5eb0cb49692f0a82fcc3308e1df00d16c7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 14 Jan 2017 01:22:07 -0600
 Subject: [PATCH] Assign the World in WorldGenStronghold
 
 
 diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-index c937547..a3b958e 100644
+index c93754704..a3b958e01 100644
 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
 +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
 @@ -56,6 +56,7 @@ public class WorldGenStronghold extends StructureGenerator {
@@ -17,5 +17,5 @@ index c937547..a3b958e 100644
              this.c();
              this.b = true;
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0205-Add-fromBottle-flag-to-Experience-Orbs.patch

@@ -1,11 +1,11 @@
-From 48105c4299692d667f49f32e8c8e54cfe9c5abd7 Mon Sep 17 00:00:00 2001
+From 092a5eb65aa2d8476d100478cde14681b15d27a7 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 14 Jan 2017 16:15:26 -0600
 Subject: [PATCH] Add fromBottle flag to Experience Orbs
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index 14431b8..54c9200 100644
+index 14431b8ad..54c9200a9 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 @@ -15,6 +15,14 @@ public class EntityExperienceOrb extends Entity {
@@ -37,7 +37,7 @@ index 14431b8..54c9200 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index 0255986..2893129 100644
+index 0255986fd..289312950 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 @@ -40,7 +40,7 @@ public class EntityThrownExpBottle extends EntityProjectile {
@@ -50,7 +50,7 @@ index 0255986..2893129 100644
  
              this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 3a09cab..61e3c6c 100644
+index 3a09cab3d..61e3c6c3e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 @@ -18,6 +18,13 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
@@ -68,5 +68,5 @@ index 3a09cab..61e3c6c 100644
      public EntityExperienceOrb getHandle() {
          return (EntityExperienceOrb) entity;
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0206-Remove-the-Vanilla-Method-Profiler.patch

@@ -1,4 +1,4 @@
-From be1ee208e91e3e055087c6b12b415eb5aadb45f6 Mon Sep 17 00:00:00 2001
+From a8769808a533f8a7b2f715a05c1f574cc35fad4e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jan 2017 02:00:33 -0500
 Subject: [PATCH] Remove the Vanilla Method Profiler

Spigot-Server-Patches/0207-Cap-Entity-Collisions.patch

@@ -1,4 +1,4 @@
-From c377f831fbdaded7826daaca9b5ca25741c705ce Mon Sep 17 00:00:00 2001
+From da9c2df1370a98d01f434079113c709ac652bdb6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@@ -12,7 +12,7 @@ just as it does in Vanilla, but entity pushing logic will be capped.
 You can set this to 0 to disable collisions.
 
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index e8762c4..dba1c47 100644
+index e8762c487..dba1c477e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 @@ -414,4 +414,10 @@ public class PaperWorldConfig {
@@ -27,7 +27,7 @@ index e8762c4..dba1c47 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index a1d2233..37dc29f 100644
+index a1d2233ba..37dc29f63 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -168,6 +168,7 @@ public abstract class Entity implements ICommandListener {
@@ -39,7 +39,7 @@ index a1d2233..37dc29f 100644
      // Spigot end
  
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 07688b1..6ac6a40 100644
+index 07688b1ce..6ac6a4062 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -2132,8 +2132,11 @@ public abstract class EntityLiving extends Entity {
@@ -56,5 +56,5 @@ index 07688b1..6ac6a40 100644
                  this.C(entity);
              }
 -- 
-2.9.3
+2.11.0
 

Spigot-Server-Patches/0208-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch

@@ -1,11 +1,11 @@
-From 0f97a18ec8df436c8e28873ed645dbd184456a29 Mon Sep 17 00:00:00 2001
+From 72885fec95927895df4c2c778da04c078cfa9112 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 23 Jan 2017 15:10:25 -0600
 Subject: [PATCH] Do not allow a zero max height in BiomeJungle
 
 
 diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java
-index a4e5e49..20c18cd 100644
+index a4e5e4933..20c18cdbd 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungle.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungle.java
 @@ -39,7 +39,11 @@ public class BiomeJungle extends BiomeBase {
@@ -22,7 +22,7 @@ index a4e5e49..20c18cd 100644
          (new WorldGenMelon()).generate(world, random, blockposition.a(i, k, j));
          WorldGenVines worldgenvines = new WorldGenVines();
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 6a0b3a6..38a7af5 100644
+index 6a0b3a62d..38a7af58c 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
 @@ -42,6 +42,7 @@ public class BlockPosition extends BaseBlockPosition {
@@ -34,5 +34,5 @@ index 6a0b3a6..38a7af5 100644
          return d0 == 0.0D && d1 == 0.0D && d2 == 0.0D ? this : new BlockPosition((double) this.getX() + d0, (double) this.getY() + d1, (double) this.getZ() + d2);
      }
 -- 
-2.9.3
+2.11.0
 

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 16b5116c7c528a99a4270324fa05133852ff6bf4
+Subproject commit c1aa85918e6683fa0d8677feb733ba8743c40502