Paper 1.9.2 Update

.gitignore

@@ -48,3 +48,4 @@ CraftBukkit
 Paperclip
 Paperclip.jar
 paperclip.jar
+paperclip-*.jar

BuildData

@@ -1 +1 @@
-Subproject commit 29cbded5ff05b66a9af3ac22efe07031d5fb5742
+Subproject commit 46d0be39f2fae4732ebe544dfada3949a18e2092

Bukkit

@@ -1 +1 @@
-Subproject commit 56605a05f6c85762d46b0b76b9eb20cfc7991e7e
+Subproject commit 8ce4d2f45fbdb7cd85346b220f6a9d34f2000910

CraftBukkit

@@ -1 +1 @@
-Subproject commit 7fc5cd856e46182e727f383a911ffa46326611f1
+Subproject commit 8b61cc52088ccb9220970740a4905baf3781a680

Paperclip

@@ -1 +1 @@
-Subproject commit 1d8ff24ec3fff88334498bfb4071b6b6c834cc07
+Subproject commit 9bb246f7f19963ef91e22af3e05a315ee5e5e746

Spigot

@@ -1 +1 @@
-Subproject commit d20369fcad255c6ab18fab8180fac63ff4cedec3
+Subproject commit 1480adb82751e38cca5bcc75202ece68277b0113

Spigot-API-Patches/0001-POM-changes.patch

@@ -1,11 +1,11 @@
-From ecf0497b4369c1851972cefd26fc4ee896fd1ebb Mon Sep 17 00:00:00 2001
+From 2f32c9ef89437d0047ea741fbc4bade6ae94003a Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 17:16:08 -0600
 Subject: [PATCH] POM changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 8fb67ea..d916f44 100644
+index 662379f..a03865f 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -4,35 +4,37 @@
@@ -24,7 +24,7 @@ index 8fb67ea..d916f44 100644
 -    <artifactId>spigot-api</artifactId>
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper-api</artifactId>
-     <version>1.9-R0.1-SNAPSHOT</version>
+     <version>1.9.2-R0.1-SNAPSHOT</version>
      <packaging>jar</packaging>
  
 -    <name>Spigot-API</name>
@@ -95,5 +95,5 @@ index 8fb67ea..d916f44 100644
                  <artifactId>maven-shade-plugin</artifactId>
                  <version>2.4.1</version>
 -- 
-2.7.3
+2.8.0
 

Spigot-Server-Patches/0001-POM-Changes.patch

@@ -1,11 +1,11 @@
-From 02259eec6505e02230fdf82e1f7087f57daca410 Mon Sep 17 00:00:00 2001
+From b068b16c1082061d7c28b75c62f3233b7c5b4713 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 29 Feb 2016 20:40:33 -0600
 Subject: [PATCH] POM Changes
 
 
 diff --git a/pom.xml b/pom.xml
-index 4f7cea7..7762cc9 100644
+index d775f7b..b01ebdf 100644
 --- a/pom.xml
 +++ b/pom.xml
 @@ -1,12 +1,12 @@
@@ -17,7 +17,7 @@ index 4f7cea7..7762cc9 100644
 +    <groupId>com.destroystokyo.paper</groupId>
 +    <artifactId>paper</artifactId>
      <packaging>jar</packaging>
-     <version>1.9-R0.1-SNAPSHOT</version>
+     <version>1.9.2-R0.1-SNAPSHOT</version>
 -    <name>Spigot</name>
 -    <url>http://www.spigotmc.org</url>
 +    <name>Paper</name>
@@ -183,5 +183,5 @@ index 9304637..674096c 100644
  
          if (stream != null) {
 -- 
-2.7.3
+2.8.0
 

Spigot-Server-Patches/0003-MC-Dev-fixes.patch

@@ -0,0 +1,88 @@
+From 9588a00f0ac51c242d71abc1d9b9c43f905d5f14 Mon Sep 17 00:00:00 2001
+From: Aikar <aikar@aikar.co>
+Date: Wed, 30 Mar 2016 19:36:20 -0400
+Subject: [PATCH] MC Dev fixes
+
+
+diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
+index e54e7b7..47c9f69 100644
+--- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
++++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
+@@ -87,7 +87,7 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
+         return Objects.toStringHelper(this).add("x", this.getX()).add("y", this.getY()).add("z", this.getZ()).toString();
+     }
+ 
+-    public int compareTo(Object object) {
++    public int compareTo(BaseBlockPosition object) { // Paper - decompile fix
+         return this.i((BaseBlockPosition) object);
+     }
+ }
+diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
+index be4b871..5ca8125 100644
+--- a/src/main/java/net/minecraft/server/BiomeBase.java
++++ b/src/main/java/net/minecraft/server/BiomeBase.java
+@@ -47,7 +47,7 @@ public abstract class BiomeBase {
+     protected List<BiomeBase.BiomeMeta> x;
+ 
+     public static int a(BiomeBase biomebase) {
+-        return BiomeBase.REGISTRY_ID.a((Object) biomebase);
++        return BiomeBase.REGISTRY_ID.a(biomebase); // Paper - decompile fix
+     }
+ 
+     public static BiomeBase a(int i) {
+diff --git a/src/main/java/net/minecraft/server/BlockStateList.java b/src/main/java/net/minecraft/server/BlockStateList.java
+index 8df8b04..19ea22f 100644
+--- a/src/main/java/net/minecraft/server/BlockStateList.java
++++ b/src/main/java/net/minecraft/server/BlockStateList.java
+@@ -83,7 +83,7 @@ public class BlockStateList {
+         if (!BlockStateList.a.matcher(s).matches()) {
+             throw new IllegalArgumentException("Block: " + block.getClass() + " has invalidly named property: " + s);
+         } else {
+-            Iterator iterator = iblockstate.c().iterator();
++            Iterator<T> iterator = iblockstate.c().iterator(); // Paper - decompile fix
+ 
+             String s1;
+ 
+@@ -92,7 +92,7 @@ public class BlockStateList {
+                     return s;
+                 }
+ 
+-                Comparable comparable = (Comparable) iterator.next();
++                T comparable = iterator.next(); // Paper - decompile fix
+ 
+                 s1 = iblockstate.a(comparable);
+             } while (BlockStateList.a.matcher(s1).matches());
+@@ -154,7 +154,7 @@ public class BlockStateList {
+             if (!this.b.containsKey(iblockstate)) {
+                 throw new IllegalArgumentException("Cannot get property " + iblockstate + " as it does not exist in " + this.a.t());
+             } else {
+-                return (Comparable) iblockstate.b().cast(this.b.get(iblockstate));
++                return iblockstate.b().cast(this.b.get(iblockstate)); // Paper - decompile fix
+             }
+         }
+ 
+diff --git a/src/main/java/net/minecraft/server/CommandAbstract.java b/src/main/java/net/minecraft/server/CommandAbstract.java
+index 156922a..f2feee5 100644
+--- a/src/main/java/net/minecraft/server/CommandAbstract.java
++++ b/src/main/java/net/minecraft/server/CommandAbstract.java
+@@ -212,7 +212,7 @@ public abstract class CommandAbstract implements ICommand {
+         }
+ 
+         if (object != null && oclass.isAssignableFrom(object.getClass())) {
+-            return (Entity) object;
++            return (T) object; // Paper - fix decompile error
+         } else {
+             throw new ExceptionEntityNotFound();
+         }
+@@ -551,7 +551,7 @@ public abstract class CommandAbstract implements ICommand {
+         return this.getCommand().compareTo(icommand.getCommand());
+     }
+ 
+-    public int compareTo(Object object) {
++    public int compareTo(ICommand object) { // Paper - fix decompile error
+         return this.a((ICommand) object);
+     }
+ 
+-- 
+2.8.0
+

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

@@ -1,4 +1,4 @@
-From 021b726e4f01b94cb7e0f19ff0feaa1386f5e010 Mon Sep 17 00:00:00 2001
+From a2bec60dd78b081c7ad0a82fb03aee52dbab9284 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 04:00:11 -0600
 Subject: [PATCH] Timings v2
@@ -276,7 +276,7 @@ index 1d2f580..88e1e98 100644
      public static int getId(Block block) {
          return Block.REGISTRY.a(block); // CraftBukkit - decompile error
 diff --git a/src/main/java/net/minecraft/server/DedicatedServer.java b/src/main/java/net/minecraft/server/DedicatedServer.java
-index dd3abb8..a0186ef 100644
+index 328857d..0225a2e 100644
 --- a/src/main/java/net/minecraft/server/DedicatedServer.java
 +++ b/src/main/java/net/minecraft/server/DedicatedServer.java
 @@ -22,7 +22,7 @@ import java.io.PrintStream;
@@ -289,7 +289,7 @@ index dd3abb8..a0186ef 100644
  import org.bukkit.craftbukkit.util.Waitable;
  import org.bukkit.event.server.RemoteServerCommandEvent;
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 3665f8a..146223a 100644
+index 2983756..9e84616 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -24,7 +24,8 @@ import org.bukkit.block.BlockFace;
@@ -328,7 +328,7 @@ index 3665f8a..146223a 100644
  
      public void recalcPosition() {
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 1609977..569ab24 100644
+index 2a2d235..151162e 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
 @@ -24,7 +24,7 @@ import org.bukkit.event.entity.EntityRegainHealthEvent;
@@ -340,7 +340,7 @@ index 1609977..569ab24 100644
  
  public abstract class EntityLiving extends Entity {
  
-@@ -1691,7 +1691,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1697,7 +1697,6 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void m() {
@@ -348,7 +348,7 @@ index 1609977..569ab24 100644
          super.m();
          this.cu();
          if (!this.world.isClientSide) {
-@@ -1764,9 +1763,7 @@ public abstract class EntityLiving extends Entity {
+@@ -1770,9 +1769,7 @@ public abstract class EntityLiving extends Entity {
              }
          }
  
@@ -358,7 +358,7 @@ index 1609977..569ab24 100644
          double d0 = this.locX - this.lastX;
          double d1 = this.locZ - this.lastZ;
          float f = (float) (d0 * d0 + d1 * d1);
-@@ -1835,8 +1832,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1841,8 +1838,6 @@ public abstract class EntityLiving extends Entity {
          } else {
              this.bo = 0;
          }
@@ -367,7 +367,7 @@ index 1609977..569ab24 100644
      }
  
      protected float h(float f, float f1) {
-@@ -1901,7 +1896,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1907,7 +1902,6 @@ public abstract class EntityLiving extends Entity {
          }
  
          this.world.methodProfiler.a("ai");
@@ -375,7 +375,7 @@ index 1609977..569ab24 100644
          if (this.cf()) {
              this.bc = false;
              this.bd = 0.0F;
-@@ -1912,7 +1906,6 @@ public abstract class EntityLiving extends Entity {
+@@ -1918,7 +1912,6 @@ public abstract class EntityLiving extends Entity {
              this.doTick();
              this.world.methodProfiler.b();
          }
@@ -383,7 +383,7 @@ index 1609977..569ab24 100644
  
          this.world.methodProfiler.b();
          this.world.methodProfiler.a("jump");
-@@ -1935,14 +1928,10 @@ public abstract class EntityLiving extends Entity {
+@@ -1941,14 +1934,10 @@ public abstract class EntityLiving extends Entity {
          this.be *= 0.98F;
          this.bf *= 0.9F;
          this.r();
@@ -399,7 +399,7 @@ index 1609977..569ab24 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5664994..eac4e79 100644
+index 0caa3f9..a5fea4a 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -45,7 +45,7 @@ import org.bukkit.craftbukkit.CraftServer;
@@ -460,7 +460,7 @@ index 5664994..eac4e79 100644
          // Run tasks that are waiting on processing
          SpigotTimings.processQueueTimer.startTiming(); // Spigot
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 525c905..cd19408 100644
+index 3409a53..dfd6067 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -58,6 +58,7 @@ import org.bukkit.inventory.CraftingInventory;
@@ -634,10 +634,10 @@ index 18993be..fab56f7 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 4f9136d..10e06d6 100644
+index aaa738a..8b90615 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -241,13 +241,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -244,13 +244,13 @@ public class WorldServer extends World implements IAsyncTaskHandler {
  
          timings.doChunkUnload.stopTiming(); // Spigot
          this.methodProfiler.c("tickPending");
@@ -655,7 +655,7 @@ index 4f9136d..10e06d6 100644
          this.methodProfiler.c("chunkMap");
          timings.doChunkMap.startTiming(); // Spigot
          this.manager.flush();
-@@ -477,7 +477,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -480,7 +480,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                      }
                  }
  
@@ -664,7 +664,7 @@ index 4f9136d..10e06d6 100644
                  if (i > 0) {
                      ChunkSection[] achunksection = chunk.getSections();
                      int i1 = achunksection.length;
-@@ -505,6 +505,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -508,6 +508,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                          }
                      }
                  }
@@ -672,7 +672,7 @@ index 4f9136d..10e06d6 100644
              }
  
              this.methodProfiler.b();
-@@ -702,6 +703,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -703,6 +704,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
  
                  this.methodProfiler.a("cleaning");
  
@@ -680,7 +680,7 @@ index 4f9136d..10e06d6 100644
                  NextTickListEntry nextticklistentry;
  
                  for (int j = 0; j < i; ++j) {
-@@ -715,9 +717,11 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -716,9 +718,11 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                      // this.nextTickListHash.remove(nextticklistentry);
                      this.U.add(nextticklistentry);
                  }
@@ -692,7 +692,7 @@ index 4f9136d..10e06d6 100644
                  Iterator iterator = this.U.iterator();
  
                  while (iterator.hasNext()) {
-@@ -727,6 +731,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -728,6 +732,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
  
                      if (this.areChunksLoadedBetween(nextticklistentry.a.a(-b0, -b0, -b0), nextticklistentry.a.a(b0, b0, b0))) {
                          IBlockData iblockdata = this.getType(nextticklistentry.a);
@@ -701,7 +701,7 @@ index 4f9136d..10e06d6 100644
  
                          if (iblockdata.getMaterial() != Material.AIR && Block.a(iblockdata.getBlock(), nextticklistentry.a())) {
                              try {
-@@ -739,10 +745,12 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -740,10 +746,12 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                                  throw new ReportedException(crashreport);
                              }
                          }
@@ -1133,5 +1133,5 @@ index e53092c..0b057fa 100644
      }
  }
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0030-Always-tick-falling-blocks.patch

@@ -1,4 +1,4 @@
-From c45b5e15b8442fbfd975903c63da1792fa032739 Mon Sep 17 00:00:00 2001
+From 314c57cc2680355fecb09a3fe154c3aa08873dae Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 00:32:25 -0600
 Subject: [PATCH] Always tick falling blocks
@@ -25,5 +25,5 @@ index 0b057fa..f0d3a19 100644
                  || entity instanceof EntityFireworks )
          {
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0030-Fix-redstone-lag-issues.patch

@@ -1,79 +0,0 @@
-From 2ca3862b9d997a97f44d1bdca8b36f8dc1f8f1ff Mon Sep 17 00:00:00 2001
-From: Zach Brown <zach.brown@destroystokyo.com>
-Date: Wed, 2 Mar 2016 00:21:24 -0600
-Subject: [PATCH] Fix redstone lag issues
-
-
-diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index 7c0e61f..facb98c 100644
---- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-+++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -155,4 +155,15 @@ public class PaperWorldConfig {
-         netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
-         log("Top of the nether void damage: " + netherVoidTopDamage);
-     }
-+
-+    public int tickNextTickCap;
-+    public boolean tickNextTickListCapIgnoresRedstone;
-+    private void tickNextTickCap() {
-+        tickNextTickCap = getInt("tick-next-tick-list-cap", 1000); // Higher values will be friendlier to vanilla style mechanics (to a point) but may hurt performance
-+        tickNextTickListCapIgnoresRedstone = getBoolean("tick-next-tick-list-cap-ignores-redstone", false); // Redstone TickNextTicks will always bypass the preceding cap
-+        log("WorldServer TickNextTick cap set at " + tickNextTickCap);
-+        log("WorldServer TickNextTickList cap always processes redstone: " + tickNextTickListCapIgnoresRedstone);
-+
-+    }
-+
- }
-diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 10e06d6..e2a7187 100644
---- a/src/main/java/net/minecraft/server/WorldServer.java
-+++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -691,6 +691,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
-             if (false) { // CraftBukkit
-                 throw new IllegalStateException("TickNextTick list out of synch");
-             } else {
-+                // Paper start - No, stop doing this, it affects things like redstone
-+                /*
-                 if (i > 1000) {
-                     // CraftBukkit start - If the server has too much to process over time, try to alleviate that
-                     if (i > 20 * 1000) {
-@@ -700,6 +702,11 @@ public class WorldServer extends World implements IAsyncTaskHandler {
-                     }
-                     // CraftBukkit end
-                 }
-+                */
-+                if (i > paperConfig.tickNextTickCap) {
-+                    i = paperConfig.tickNextTickCap;
-+                }
-+                // Paper end
- 
-                 this.methodProfiler.a("cleaning");
- 
-@@ -719,6 +726,24 @@ public class WorldServer extends World implements IAsyncTaskHandler {
-                 }
-                 timings.scheduledBlocksCleanup.stopTiming(); // Paper
- 
-+                // Paper start - Allow redstone ticks to bypass the tickNextTickListCap
-+                if (paperConfig.tickNextTickListCapIgnoresRedstone) {
-+                    Iterator<NextTickListEntry> iterator = this.nextTickList.iterator();
-+                    while (iterator.hasNext()) {
-+                        NextTickListEntry next = iterator.next();
-+                        if (!flag && next.b > this.worldData.getTime()) {
-+                            break;
-+                        }
-+
-+                        IBlockData data = next.a().getBlockData();
-+                        if (next.a().isPowerSource(data) || next.a() instanceof IInventory) {
-+                            iterator.remove();
-+                            this.U.add(next);
-+                        }
-+                    }
-+                }
-+                // Paper end
-+
-                 this.methodProfiler.b();
-                 this.methodProfiler.a("ticking");
-                 timings.scheduledBlocksTicking.startTiming(); // Paper
--- 
-2.7.4
-

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

@@ -1,4 +1,4 @@
-From fedb4489139be404ed7916f2ea5223241b561187 Mon Sep 17 00:00:00 2001
+From 0c7102107d53530cbc3158beae7f75f00b4daca3 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:52:31 -0600
 Subject: [PATCH] Lighting Queue
@@ -17,13 +17,24 @@ index 3f4271c..5fdf051 100644
      public static final Timing tickEntityTimer = Timings.ofSafe("## tickEntity");
      public static final Timing tickTileEntityTimer = Timings.ofSafe("## tickTileEntity");
 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index facb98c..e0e9a65 100644
+index 7c0e61f..e0e9a65 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-@@ -166,4 +166,9 @@ public class PaperWorldConfig {
- 
+@@ -155,4 +155,20 @@ public class PaperWorldConfig {
+         netherVoidTopDamage = getBoolean( "nether-ceiling-void-damage", false );
+         log("Top of the nether void damage: " + netherVoidTopDamage);
      }
- 
++
++    public int tickNextTickCap;
++    public boolean tickNextTickListCapIgnoresRedstone;
++    private void tickNextTickCap() {
++        tickNextTickCap = getInt("tick-next-tick-list-cap", 1000); // Higher values will be friendlier to vanilla style mechanics (to a point) but may hurt performance
++        tickNextTickListCapIgnoresRedstone = getBoolean("tick-next-tick-list-cap-ignores-redstone", false); // Redstone TickNextTicks will always bypass the preceding cap
++        log("WorldServer TickNextTick cap set at " + tickNextTickCap);
++        log("WorldServer TickNextTickList cap always processes redstone: " + tickNextTickListCapIgnoresRedstone);
++
++    }
++
 +    public boolean queueLightUpdates;
 +    private void queueLightUpdates() {
 +        queueLightUpdates = getBoolean("queue-light-updates", false);
@@ -146,7 +157,7 @@ index 83857a6..4dd672a 100644
                  ChunkUnloadEvent event = new ChunkUnloadEvent(chunk.bukkitChunk);
                  server.getPluginManager().callEvent(event);
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index e9bb02f..d0fd638 100644
+index 3aac51d..24aa5b5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -47,6 +47,11 @@ import org.bukkit.craftbukkit.CraftServer;
@@ -229,5 +240,5 @@ index f8746b3..a6d4097 100644
                  }
  
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0032-Optimize-draining.patch

@@ -1,4 +1,4 @@
-From e85b4d19d220e6b663b4a518597ff7cf77831e80 Mon Sep 17 00:00:00 2001
+From fedd40dec713035b2abc4c4a7f5da4054813ff59 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 00:55:24 -0600
 Subject: [PATCH] Optimize draining
@@ -24,5 +24,5 @@ index 036e861..f35f30c 100644
              }
          } else {
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0033-Configurable-end-credits.patch

@@ -1,4 +1,4 @@
-From 1c44a3a34312691c21a43b92620d81bacab17113 Mon Sep 17 00:00:00 2001
+From d34f8c81adc1f3e993c07929e82eda897197eca4 Mon Sep 17 00:00:00 2001
 From: DoctorDark <doctordark11@gmail.com>
 Date: Wed, 16 Mar 2016 02:21:39 -0500
 Subject: [PATCH] Configurable end credits
@@ -52,5 +52,5 @@ index 3e33f49..8d04c82 100644
                  } else {
                      this.b((Statistic) AchievementList.D);
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0034-Fix-lag-from-explosions-processing-dead-entities.patch

@@ -1,11 +1,11 @@
-From cf462e484f0ad41d7f87d13cfe63cd2b44a2c135 Mon Sep 17 00:00:00 2001
+From 7db30b2993803a75446a250e1c11713a84da3f1a Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 01:39:52 -0600
 Subject: [PATCH] Fix lag from explosions processing dead entities
 
 
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 3234511..8ce1b23 100644
+index 69720e8..ae49403 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -103,7 +103,14 @@ public class Explosion {
@@ -25,5 +25,5 @@ index 3234511..8ce1b23 100644
  
          for (int l1 = 0; l1 < list.size(); ++l1) {
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0035-Generator-Settings.patch

@@ -1,4 +1,4 @@
-From d76297a44be358054075f915a50480c1be1d06a2 Mon Sep 17 00:00:00 2001
+From a96d56be4ce9239126a7d0677042ca9a9c429e58 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 02:17:54 -0600
 Subject: [PATCH] Generator Settings
@@ -38,7 +38,7 @@ index 3a57c8e..66deccb 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BiomeBase.java b/src/main/java/net/minecraft/server/BiomeBase.java
-index bc83bb7..854bbb4 100644
+index 5ca8125..e321a89 100644
 --- a/src/main/java/net/minecraft/server/BiomeBase.java
 +++ b/src/main/java/net/minecraft/server/BiomeBase.java
 @@ -174,7 +174,7 @@ public abstract class BiomeBase {
@@ -265,5 +265,5 @@ index 22d96e9..83d9509 100644
          Iterator iterator = this.c.values().iterator();
  
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0036-Optimize-explosions.patch

@@ -1,4 +1,4 @@
-From 6d08aaefa976503ede51306afe7d8f85e17429b0 Mon Sep 17 00:00:00 2001
+From 433cc3bbabdc8eada43006b218bfaf6064bb7c71 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 11:59:48 -0600
 Subject: [PATCH] Optimize explosions
@@ -25,7 +25,7 @@ index 66deccb..09b9867 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 8ce1b23..5bb2510 100644
+index ae49403..7e99b7d 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -129,7 +129,7 @@ public class Explosion {
@@ -124,7 +124,7 @@ index 8ce1b23..5bb2510 100644
 +    // Paper end
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index d0fd638..5076aa3 100644
+index 24aa5b5..ee9491f 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -900,6 +900,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -156,5 +156,5 @@ index a6d4097..c0f0b83 100644
      public CraftWorld getWorld() {
          return this.world;
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0037-Stop-updating-flowing-block-if-material-has-changed.patch

@@ -1,4 +1,4 @@
-From a3368ae0995a5ee4474ff5734c922d6c8f1cb3ca Mon Sep 17 00:00:00 2001
+From 32d5f0477fdbb9b41debf0d7267fb80f137814b1 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 12:03:23 -0600
 Subject: [PATCH] Stop updating flowing block if material has changed
@@ -17,5 +17,5 @@ index f35f30c..1f07f82 100644
  
          if (this.h(world, blockposition.down(), iblockdata2)) {
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0038-Fast-draining.patch

@@ -1,4 +1,4 @@
-From c9e4fbbe1ceced99a47e76c5f7bcaad14d094d6e Mon Sep 17 00:00:00 2001
+From 123f7daf33fadf6f80077c2be0974454fde2f7b1 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:20:52 -0600
 Subject: [PATCH] Fast draining
@@ -96,5 +96,5 @@ index 1f07f82..517c1e8 100644
 +    }
  }
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0039-Configurable-lava-flow-speed.patch

@@ -1,4 +1,4 @@
-From ebbe7bc51b8020a58c466053febcdcbe10211fed Mon Sep 17 00:00:00 2001
+From a4b691d0c39da80e14863ca658c80f9afb6506de Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 12:27:07 -0600
 Subject: [PATCH] Configurable lava flow speed
@@ -35,5 +35,5 @@ index 517c1e8..51b80cb 100644
                  world.getType(blockposition.north(1)).getBlock().material == Material.LAVA ||
                          world.getType(blockposition.south(1)).getBlock().material == Material.LAVA ||
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0040-Add-player-view-distance-API.patch

@@ -1,4 +1,4 @@
-From 94b4dc473c08c9903cc6a49e9bb742ce97dbef9f Mon Sep 17 00:00:00 2001
+From 84315fb08fc96322d441c192dbb8b6c39fa63913 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 14:35:27 -0600
 Subject: [PATCH] Add player view distance API
@@ -109,5 +109,5 @@ index 8370d94..8e94ddd 100644
  
      // Spigot start
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0041-Disable-explosion-knockback.patch

@@ -1,4 +1,4 @@
-From 6b3da1239ae323d5dcae1c59d86156fe471fe27b Mon Sep 17 00:00:00 2001
+From 3b7cd69c0a28f2310feb483fe385636155aa1eb3 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:48:03 -0600
 Subject: [PATCH] Disable explosion knockback
@@ -19,10 +19,10 @@ index 095f3b6..491a8a7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 569ab24..da52fe7 100644
+index 151162e..3b9b112 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -855,12 +855,14 @@ public abstract class EntityLiving extends Entity {
+@@ -860,12 +860,14 @@ public abstract class EntityLiving extends Entity {
                      }
                  }
  
@@ -37,7 +37,7 @@ index 569ab24..da52fe7 100644
                          this.world.broadcastEntityEffect(this, (byte) 2);
                      }
  
-@@ -884,6 +886,8 @@ public abstract class EntityLiving extends Entity {
+@@ -889,6 +891,8 @@ public abstract class EntityLiving extends Entity {
                      }
                  }
  
@@ -47,7 +47,7 @@ index 569ab24..da52fe7 100644
                      SoundEffect soundeffect = this.bS();
  
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 5bb2510..418ee29 100644
+index 7e99b7d..91540c7 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -145,7 +145,7 @@ public class Explosion {
@@ -69,5 +69,5 @@ index 5bb2510..418ee29 100644
                              }
                          }
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0042-Disable-thunder.patch

@@ -1,4 +1,4 @@
-From 5491f2f781884e632797d341eb903226e831f478 Mon Sep 17 00:00:00 2001
+From 16e99fad4aaad1c8e519e9f77ef13c47e6f9191d Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:52:43 -0600
 Subject: [PATCH] Disable thunder
@@ -19,10 +19,10 @@ index 491a8a7..a665e3a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index e2a7187..f87cd59 100644
+index 8b90615..94b5c37 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -417,7 +417,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -420,7 +420,8 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                  int l;
                  BlockPosition blockposition;
  
@@ -33,5 +33,5 @@ index e2a7187..f87cd59 100644
                      l = this.l >> 2;
                      blockposition = this.a(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0043-Disable-ice-and-snow.patch

@@ -1,4 +1,4 @@
-From 34b52524c899c87cd5e2a581f5fbe793d4e07e39 Mon Sep 17 00:00:00 2001
+From d65be532ca3364948e131e0362ae3937f6ad3d32 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 14:57:24 -0600
 Subject: [PATCH] Disable ice and snow
@@ -19,10 +19,10 @@ index a665e3a..41b2a42 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index f87cd59..0e1cbfe 100644
+index 94b5c37..47dbea8 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -441,7 +441,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -444,7 +444,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                  }
  
                  this.methodProfiler.c("iceandsnow");
@@ -32,5 +32,5 @@ index f87cd59..0e1cbfe 100644
                      l = this.l >> 2;
                      blockposition = this.p(new BlockPosition(j + (l & 15), 0, k + (l >> 8 & 15)));
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0044-Configurable-mob-spawner-tick-rate.patch

@@ -1,4 +1,4 @@
-From 4ae728fd4fbe6c9d9a314f61bed525ae6c16163d Mon Sep 17 00:00:00 2001
+From 69f769aa7facf3d6ea3367c6b9fdb6f0ff7322e3 Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 15:03:53 -0600
 Subject: [PATCH] Configurable mob spawner tick rate
@@ -64,5 +64,5 @@ index 2eee845..f4f77d7 100644
                  }
  
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0045-Configurable-TNT-cannon-fix.patch

@@ -1,4 +1,4 @@
-From b54bda97dbbe9c013c860bb721c8fc836486b243 Mon Sep 17 00:00:00 2001
+From 45c9d527168cc83dafaa5f8f4c2b33b789fbdd79 Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 23:00:53 -0600
 Subject: [PATCH] Configurable TNT cannon fix
@@ -60,7 +60,7 @@ index ffc07cd..64aaba4 100644
              int i = aenumdirection.length;
  
 diff --git a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
-index b4d1741..257bbbb 100644
+index cce1cd7..7f5a112 100644
 --- a/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
 +++ b/src/main/java/net/minecraft/server/BlockRedstoneTorch.java
 @@ -52,6 +52,17 @@ public class BlockRedstoneTorch extends BlockTorch {
@@ -140,7 +140,7 @@ index 1a133d9..f4f9be6 100644
              int i = aenumdirection.length;
  
 diff --git a/src/main/java/net/minecraft/server/BlockTNT.java b/src/main/java/net/minecraft/server/BlockTNT.java
-index f794167..021a3be 100644
+index 3b799bf..e6c0ffb 100644
 --- a/src/main/java/net/minecraft/server/BlockTNT.java
 +++ b/src/main/java/net/minecraft/server/BlockTNT.java
 @@ -29,7 +29,11 @@ public class BlockTNT extends Block {
@@ -168,12 +168,12 @@ index f794167..021a3be 100644
 +                // Paper end
  
                  world.addEntity(entitytntprimed);
-                 world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gj, SoundCategory.BLOCKS, 1.0F, 1.0F);
+                 world.a((EntityHuman) null, entitytntprimed.locX, entitytntprimed.locY, entitytntprimed.locZ, SoundEffects.gk, SoundCategory.BLOCKS, 1.0F, 1.0F);
 diff --git a/src/main/java/net/minecraft/server/DispenserRegistry.java b/src/main/java/net/minecraft/server/DispenserRegistry.java
-index d7bea3d..61ac795 100644
+index 392e2fa..a93a990 100644
 --- a/src/main/java/net/minecraft/server/DispenserRegistry.java
 +++ b/src/main/java/net/minecraft/server/DispenserRegistry.java
-@@ -498,7 +498,11 @@ public class DispenserRegistry {
+@@ -497,7 +497,11 @@ public class DispenserRegistry {
                  org.bukkit.block.Block block = world.getWorld().getBlockAt(isourceblock.getBlockPosition().getX(), isourceblock.getBlockPosition().getY(), isourceblock.getBlockPosition().getZ());
                  CraftItemStack craftItem = CraftItemStack.asCraftMirror(itemstack1);
  
@@ -294,7 +294,7 @@ index 1113b1c..12feacf 100644
      public void setFuseTicks(int i) {
          this.datawatcher.set(EntityTNTPrimed.FUSE_TICKS, Integer.valueOf(i));
 diff --git a/src/main/java/net/minecraft/server/Explosion.java b/src/main/java/net/minecraft/server/Explosion.java
-index 418ee29..9b86454 100644
+index 91540c7..209b470 100644
 --- a/src/main/java/net/minecraft/server/Explosion.java
 +++ b/src/main/java/net/minecraft/server/Explosion.java
 @@ -148,9 +148,16 @@ public class Explosion {
@@ -315,5 +315,5 @@ index 418ee29..9b86454 100644
                              EntityHuman entityhuman = (EntityHuman) entity;
  
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0046-Send-absolute-position-the-first-time-an-entity-is-s.patch

@@ -1,4 +1,4 @@
-From f953ad5cc6a322d6486ad2003f90ba92f51ba368 Mon Sep 17 00:00:00 2001
+From 4cb89212841a3259484ca781c652b0245884f5a2 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Wed, 2 Mar 2016 23:13:07 -0600
 Subject: [PATCH] Send absolute position the first time an entity is seen
@@ -93,5 +93,5 @@ index f8570a8..1602dff 100644
  
                      entityplayer.playerConnection.sendPacket(packet);
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0047-Add-BeaconEffectEvent.patch

@@ -1,4 +1,4 @@
-From 0f460eada64a1fa1d012d8310f9eccec0feaa0d1 Mon Sep 17 00:00:00 2001
+From 0ef61deea4cab7fac10e7ece97a0811d5ac83113 Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Wed, 2 Mar 2016 23:30:53 -0600
 Subject: [PATCH] Add BeaconEffectEvent
@@ -61,5 +61,5 @@ index ed5b374..048f5bb 100644
              }
          }
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0048-Configurable-container-update-tick-rate.patch

@@ -1,4 +1,4 @@
-From 6ccc58fffcabd1eb401162d3f524ad539964f177 Mon Sep 17 00:00:00 2001
+From bd05644ab0f98384fc8793dd89ef321a99e3306e Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Wed, 2 Mar 2016 23:34:44 -0600
 Subject: [PATCH] Configurable container update tick rate
@@ -45,5 +45,5 @@ index ed307bc..2681aa5 100644
              this.closeInventory();
              this.activeContainer = this.defaultContainer;
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0049-Fix-lava-water-some-times-creating-air-instead-of-co.patch

@@ -1,11 +1,11 @@
-From 373eef295a46206b41b22b4cb6631d0f3d2c98a9 Mon Sep 17 00:00:00 2001
+From dd8cd2c8b782274b95bb4a1318b35823783594fb Mon Sep 17 00:00:00 2001
 From: Iceee <andrew@opticgaming.tv>
 Date: Wed, 2 Mar 2016 23:38:52 -0600
 Subject: [PATCH] Fix lava/water some times creating air instead of cobblestone
 
 
 diff --git a/src/main/java/net/minecraft/server/BlockFluids.java b/src/main/java/net/minecraft/server/BlockFluids.java
-index 675cdc0..8c23ce3 100644
+index cdbb7a4..c5f052a 100644
 --- a/src/main/java/net/minecraft/server/BlockFluids.java
 +++ b/src/main/java/net/minecraft/server/BlockFluids.java
 @@ -166,7 +166,7 @@ public abstract class BlockFluids extends Block {
@@ -18,5 +18,5 @@ index 675cdc0..8c23ce3 100644
                      this.fizz(world, blockposition);
                      return true;
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0050-Use-UserCache-for-player-heads.patch

@@ -1,4 +1,4 @@
-From da2863df4fb017aff9677682fb316da7a3348b3f Mon Sep 17 00:00:00 2001
+From 29fa1b0750cdafb845d8155c40148f595ec36495 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 2 Mar 2016 23:42:37 -0600
 Subject: [PATCH] Use UserCache for player heads
@@ -32,5 +32,5 @@ index 2abca0c..7d83bbe 100644
  
          return true;
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0051-Disable-spigot-tick-limiters.patch

@@ -1,4 +1,4 @@
-From c303f2f17f0a9bde32a41118a0d5831e0d071de1 Mon Sep 17 00:00:00 2001
+From ae8a00e13119c8db9690397334b9259e9d5f828f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:45:17 -0600
 Subject: [PATCH] Disable spigot tick limiters
@@ -35,5 +35,5 @@ index c0f0b83..bffa3ac 100644
              TileEntity tileentity = (TileEntity) this.tileEntityListTick.get(tileTickPosition);
              // Spigot start
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 597ee1c40918eefe854dbc41d38f9cf305a78d98 Mon Sep 17 00:00:00 2001
+From 64711b96753d6fb0210d4ea0c8dbaee533f1a9b7 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Wed, 2 Mar 2016 23:46:57 -0600
 Subject: [PATCH] Configurable Chunk IO Thread Base Count
@@ -39,5 +39,5 @@ index e4fd9bc..7b7a3d0 100644
  
      private static final AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException> instance = new AsynchronousExecutor<QueuedChunk, Chunk, Runnable, RuntimeException>(new ChunkIOProvider(), BASE_THREADS);
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0053-Don-t-create-Region-File-s-when-checking-if-chunk-ex.patch

@@ -1,4 +1,4 @@
-From 47f34049305ac72e737769f0e6b7c00bccd40b5f Mon Sep 17 00:00:00 2001
+From d97d5c88e8438283e42818c51ea7d68c1102e28a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 2 Mar 2016 23:51:51 -0600
 Subject: [PATCH] Don't create Region File's when checking if chunk exists
@@ -7,7 +7,7 @@ Plugins like Dynmap can end up creating tons of emtpy Region Files
 when using chunkExists.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 53b5296..5bd6ce0 100644
+index 5d77c92..eb13bc9 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -38,7 +38,10 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -49,5 +49,5 @@ index 5528019..01a08d4 100644
                  file1.mkdirs();
              }
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0054-Don-t-create-a-chunk-just-to-unload-it.patch

@@ -1,4 +1,4 @@
-From 4aafe0f081ad7097a066c0cc28c6a36706a4302f Mon Sep 17 00:00:00 2001
+From 4523f4c601e523971012b1a5b50c40704f74fdc6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 2 Mar 2016 23:55:20 -0600
 Subject: [PATCH] Don't create a chunk just to unload it
@@ -23,5 +23,5 @@ index 83e3003..3f2d83a 100644
              save = true;
          }
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0055-EAR-Fix-bug-with-teleporting-entities.patch

@@ -1,4 +1,4 @@
-From df57dc656157c2df692858b66b253575232f2a68 Mon Sep 17 00:00:00 2001
+From 81633282d869e155958c376e88e245dc6f645bd0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 00:07:23 -0600
 Subject: [PATCH] EAR: Fix bug with teleporting entities
@@ -7,7 +7,7 @@ Subject: [PATCH] EAR: Fix bug with teleporting entities
 https://hub.spigotmc.org/stash/projects/SPIGOT/repos/spigot/pull-requests/52/overview
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 96014a9..c99b402 100644
+index 782abd6..359e18e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -119,9 +119,17 @@ public abstract class Entity implements ICommandListener {
@@ -45,5 +45,5 @@ index f0d3a19..a1bd1a6 100644
          }
  
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From f17ded80e85aec1519ed04ee5992f0ad4426abd8 Mon Sep 17 00:00:00 2001
+From 04ef494aa58524008dad1d2b8402234c5c109ac2 Mon Sep 17 00:00:00 2001
 From: Steve Anton <anxuiz.nx@gmail.com>
 Date: Thu, 3 Mar 2016 00:09:38 -0600
 Subject: [PATCH] Add PlayerInitialSpawnEvent
@@ -32,5 +32,5 @@ index ef76652..b636a71 100644
          entityplayer.playerInteractManager.a((WorldServer) entityplayer.world);
          String s1 = "local";
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0057-Process-Entity-Chunk-Registration-on-Teleport.patch

@@ -1,4 +1,4 @@
-From f6e2e87141988fcc4c191ef0cc75e30c4fa87398 Mon Sep 17 00:00:00 2001
+From 8cdfbcfe70be7d3748aa4b92e6a0a1bf48a03e51 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 00:12:23 -0600
 Subject: [PATCH] Process Entity Chunk Registration on Teleport
@@ -18,5 +18,5 @@ index f4168c4..b422b75 100644
          return true;
      }
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0058-Disable-chest-cat-detection.patch

@@ -1,4 +1,4 @@
-From bb0773bf6b5ee21d8bc8be6f66227fa59ef8335c Mon Sep 17 00:00:00 2001
+From dc5bbfacc8f4f564722ac6a0e89cebf5b2afff74 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:13:45 -0600
 Subject: [PATCH] Disable chest cat detection
@@ -19,10 +19,10 @@ index 91eb5de..d5a1c47 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/BlockChest.java b/src/main/java/net/minecraft/server/BlockChest.java
-index 7d27317..ed8d1df 100644
+index 2fb9c76..5143d9e 100644
 --- a/src/main/java/net/minecraft/server/BlockChest.java
 +++ b/src/main/java/net/minecraft/server/BlockChest.java
-@@ -392,6 +392,11 @@ public class BlockChest extends BlockTileEntity {
+@@ -396,6 +396,11 @@ public class BlockChest extends BlockTileEntity {
      }
  
      private boolean j(World world, BlockPosition blockposition) {
@@ -35,5 +35,5 @@ index 7d27317..ed8d1df 100644
  
          EntityOcelot entityocelot;
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From e926a4a0baf7c0878c2111f9f037fd535439102d Mon Sep 17 00:00:00 2001
+From a4eaef38bd59f6b140348788f2e2e5956dc958fc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 01:17:12 -0600
 Subject: [PATCH] Ensure commands are not ran async
@@ -14,7 +14,7 @@ big slowdown in execution but throwing an exception at same time to raise awaren
 that it is happening so that plugin authors can fix their code to stop executing commands async.
 
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index b351f2b..50fcc7c 100644
+index 19ef641..32ea702 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1265,6 +1265,29 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -82,5 +82,5 @@ index 14e5647..c6cee80 100644
              return true;
          }
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From aa27334c54ae835db3bad51791bc5fada2bcf653 Mon Sep 17 00:00:00 2001
+From 3f3eba49196fa43733c35773683d09bbd34952d4 Mon Sep 17 00:00:00 2001
 From: vemacs <d@nkmem.es>
 Date: Thu, 3 Mar 2016 01:19:22 -0600
 Subject: [PATCH] All chunks are slime spawn chunks toggle
@@ -19,7 +19,7 @@ index d5a1c47..1f97e59 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntitySlime.java b/src/main/java/net/minecraft/server/EntitySlime.java
-index cb92686..645082d 100644
+index fbefa3e..da73220 100644
 --- a/src/main/java/net/minecraft/server/EntitySlime.java
 +++ b/src/main/java/net/minecraft/server/EntitySlime.java
 @@ -243,7 +243,8 @@ public class EntitySlime extends EntityInsentient implements IMonster {
@@ -33,5 +33,5 @@ index cb92686..645082d 100644
                  }
              }
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0061-Add-Location-support-to-tab-completers-vanilla-featu.patch

@@ -1,4 +1,4 @@
-From 9400db7c1dfd50bcaa073c27eac23ca6bcd68242 Mon Sep 17 00:00:00 2001
+From 629b40a00252fba89e0cd179b07eea9ed168b7db Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Thu, 3 Mar 2016 01:44:39 -0600
 Subject: [PATCH] Add Location support to tab completers (vanilla feature
@@ -20,7 +20,7 @@ index 1f97e59..ca11cd7 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 5076aa3..d628a32 100644
+index ee9491f..058735e 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -1186,7 +1186,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs
@@ -151,5 +151,5 @@ index 100d84a..a40218c 100644
  
      public static CommandSender lastSender = null; // Nasty :(
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0062-Made-EntityDismountEvent-Cancellable.patch

@@ -1,11 +1,11 @@
-From 172117c0ef004434c7568f0bad02ebdf77390e48 Mon Sep 17 00:00:00 2001
+From 43e30251a99b69cfd0da8a5fde044b124b344585 Mon Sep 17 00:00:00 2001
 From: Nik Gil <nikmanG@users.noreply.github.com>
 Date: Thu, 3 Mar 2016 04:04:19 -0600
 Subject: [PATCH] Made EntityDismountEvent Cancellable
 
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index c99b402..cc345d9 100644
+index 359e18e..282a14f 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -38,6 +38,7 @@ import org.bukkit.craftbukkit.event.CraftEventFactory;
@@ -29,5 +29,5 @@ index c99b402..cc345d9 100644
              entity.j = 60;
          }
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 720d59b0a5a83d3b047cd43e23ae149d284dc0db Mon Sep 17 00:00:00 2001
+From 996f0b89d6d0fb777228a3de783c06a64a3d83cc Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:02:07 -0600
 Subject: [PATCH] Optimize Pathfinding
@@ -47,5 +47,5 @@ index 7cfe0af..9687785 100644
      }
  
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0064-Optimize-getBlockData.patch

@@ -1,4 +1,4 @@
-From 5a12cc3597b9adaa7c33ca1a9a31da1b61e3ac4c Mon Sep 17 00:00:00 2001
+From b306fe77bc8bd4a8236521c184d12201e221a73f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 3 Mar 2016 02:07:55 -0600
 Subject: [PATCH] Optimize getBlockData
@@ -27,5 +27,5 @@ index 3b5e8c2..42fedb7 100644
  
      public IBlockData a(final int i, final int j, final int k) {
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From c0a13468860520d04911b27b40c3f733606f380f Mon Sep 17 00:00:00 2001
+From ae2b4a0ed69035e5b3ecab62b4e522cff5b196a0 Mon Sep 17 00:00:00 2001
 From: CullanP <cullanpage@gmail.com>
 Date: Thu, 3 Mar 2016 02:13:38 -0600
 Subject: [PATCH] Avoid hopper searches if there are no items
@@ -95,5 +95,5 @@ index 42fedb7..806e499 100644
  
              while (iterator.hasNext()) {
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 8483263baf5476af87b6de9e8102df77142b10b2 Mon Sep 17 00:00:00 2001
+From e758d7754c164a0d94cc2351394f13e83cd5b34f Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 3 Mar 2016 02:15:57 -0600
 Subject: [PATCH] Expose server CommandMap
@@ -17,5 +17,5 @@ index 3a288bd..794a2c9 100644
          return commandMap;
      }
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 46667c660cf72a61bf80b4fc4c2c62d8f1308596 Mon Sep 17 00:00:00 2001
+From 306e73f4d5861978df54525515967bc218842bfc 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
@@ -21,5 +21,5 @@ index 8aa8686..aed3e4f 100644
  
          if (entity instanceof EntityPlayer && health == 0) {
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0068-Graduate-bungeecord-chat-API-from-spigot-subclasses.patch

@@ -1,4 +1,4 @@
-From cb036e63381da8aa3fa178df3ad52a4f4fafb1dc Mon Sep 17 00:00:00 2001
+From 72d50d65d74b4b9c801ff77f91e2c2c88527caa8 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 3 Mar 2016 02:21:58 -0600
 Subject: [PATCH] Graduate bungeecord chat API from spigot subclasses
@@ -59,5 +59,5 @@ index 8e94ddd..f5a48f9 100644
      public String getDisplayName() {
          return getHandle().displayName;
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,22 +1,14 @@
-From da041e745dfb77377be5f5675e35a86c048253b6 Mon Sep 17 00:00:00 2001
+From e46e17e08a42764c03959f5667d23193d70a49b0 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Thu, 3 Mar 2016 02:32:10 -0600
 Subject: [PATCH] Player Tab List and Title APIs
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
-index 49c0ca8..f438732 100644
+index 5f5b382..242efb0 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutPlayerListHeaderFooter.java
-@@ -1,14 +1,11 @@
- package net.minecraft.server;
- 
--import net.minecraft.server.IChatBaseComponent;
--import net.minecraft.server.Packet;
--import net.minecraft.server.PacketDataSerializer;
--import net.minecraft.server.PacketListenerPlayOut;
--
- import java.io.IOException;
+@@ -4,6 +4,8 @@ import java.io.IOException;
  
  public class PacketPlayOutPlayerListHeaderFooter implements Packet<PacketListenerPlayOut> {
  
@@ -25,7 +17,7 @@ index 49c0ca8..f438732 100644
      private IChatBaseComponent a;
      private IChatBaseComponent b;
  
-@@ -24,8 +21,19 @@ public class PacketPlayOutPlayerListHeaderFooter implements Packet<PacketListene
+@@ -19,8 +21,19 @@ public class PacketPlayOutPlayerListHeaderFooter implements Packet<PacketListene
      }
  
      public void b(PacketDataSerializer packetdataserializer) throws IOException {
@@ -48,7 +40,7 @@ index 49c0ca8..f438732 100644
  
      public void a(PacketListenerPlayOut packetlistenerplayout) {
 diff --git a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
-index a27ad50..ecadb81 100644
+index 2286c9e..169a03c 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayOutTitle.java
 @@ -10,6 +10,18 @@ public class PacketPlayOutTitle implements Packet<PacketListenerPlayOut> {
@@ -181,5 +173,5 @@ index f5a48f9..609f7ea 100644
  
      @Override
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From d753f184ac224ba3df89980d37f5fd099be26a30 Mon Sep 17 00:00:00 2001
+From 1299d70ab8048f1fb255ff46acce134a8c1f75ee Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:33:53 -0600
 Subject: [PATCH] Ensure inv drag is in bounds
@@ -18,5 +18,5 @@ index 000b4db..e72eac4 100644
          return slot != null ? slot.getItem() : null;
      }
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From faf5c9a69d1d8376d97f1d955ef4a1e362b00098 Mon Sep 17 00:00:00 2001
+From 3693b4666afcd63dcbcfad3b2973c329096fbe5b Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:39:54 -0600
 Subject: [PATCH] Change implementation of (tile)entity removal list
@@ -64,5 +64,5 @@ index bffa3ac..ad5c96c 100644
          this.f.clear();
          this.l();
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From b7f01f493caaf13f0e3f207253154f875c11d7d0 Mon Sep 17 00:00:00 2001
+From bfe20a3b2501f9c79626f645784920ac0b2c5950 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:46:17 -0600
 Subject: [PATCH] Add configurable portal search radius
@@ -54,5 +54,5 @@ index 1d5dce1..7ca2617 100644
      private boolean canCreatePortal = true;
  
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 7865b56d5163b97ccc38977c35d533c2406c5827 Mon Sep 17 00:00:00 2001
+From b9716afbe619e7b425cc2a9161b709555d39ac2f Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 02:48:12 -0600
 Subject: [PATCH] Add velocity warnings
@@ -22,5 +22,5 @@ index b422b75..d24b81b 100644
          entity.motY = vel.getY();
          entity.motZ = vel.getZ();
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0074-Fix-inter-world-teleportation-glitches.patch

@@ -1,4 +1,4 @@
-From 9498346a722c19b0d8b45ac0cb712a34c1e7a3bf Mon Sep 17 00:00:00 2001
+From 25ea05e9420d42f53a771cd2e20bd36aef0cd92f Mon Sep 17 00:00:00 2001
 From: Sudzzy <originmc@outlook.com>
 Date: Thu, 3 Mar 2016 02:50:31 -0600
 Subject: [PATCH] Fix inter-world teleportation glitches
@@ -39,5 +39,5 @@ index 609f7ea..2f86dd3 100644
          return true;
      }
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From e61675931315d61a0eaab3258128c674d59e3975 Mon Sep 17 00:00:00 2001
+From 56f60ae2d3c9494957214772ea557b4e3d8dc608 Mon Sep 17 00:00:00 2001
 From: Joseph Hirschfeld <joe@ibj.io>
 Date: Thu, 3 Mar 2016 03:15:41 -0600
 Subject: [PATCH] Add exception reporting event
@@ -372,5 +372,5 @@ index 44e057c..cf0bd0c 100644
                  // (async tasks must live with race-conditions if they attempt to cancel between these few lines of code)
              }
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 88cefc5d4dc82eeb95719ceee5d40341d2434b69 Mon Sep 17 00:00:00 2001
+From b0b1a8be6b6d96d0077f999fbfea9f5ddb3665d6 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Mon, 7 Mar 2016 12:51:01 -0700
 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 fa95e8f..f0908a2 100644
+index 47c9f69..c5b6a34 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -5,9 +5,11 @@ import com.google.common.base.Objects;
@@ -219,5 +219,5 @@ index e7a95f3..2d56f02 100644
  
          public BlockPosition h() {
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 4c628dcc065ddd266dfcf18b7bcd3060420f761b Mon Sep 17 00:00:00 2001
+From 67810a958994d256c3711da836fdb98d41e477eb Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Tue, 8 Mar 2016 18:28:43 -0800
 Subject: [PATCH] Don't nest if we don't need to when cerealising text
@@ -26,5 +26,5 @@ index c0e1199..bc6c054 100644
              packetdataserializer.a(this.a);
          }
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 0ce9c27495ac928d3b803d40753da0284429a90d Mon Sep 17 00:00:00 2001
+From 1987bc0cc04d03eb767e4703072b066c4b473af0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 8 Mar 2016 23:25:45 -0500
 Subject: [PATCH] Disable Scoreboards for non players by default
@@ -25,7 +25,7 @@ index 75b22fa..f967ec0 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/CommandScoreboard.java b/src/main/java/net/minecraft/server/CommandScoreboard.java
-index 871535c..25950bd 100644
+index b044f33..1758a56 100644
 --- a/src/main/java/net/minecraft/server/CommandScoreboard.java
 +++ b/src/main/java/net/minecraft/server/CommandScoreboard.java
 @@ -490,6 +490,7 @@ public class CommandScoreboard extends CommandAbstract {
@@ -37,7 +37,7 @@ index 871535c..25950bd 100644
  
                          if (scoreboard.addPlayerToTeam(s2, s)) {
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index cc345d9..4a09ec3 100644
+index 282a14f..3ded885 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -1859,6 +1859,7 @@ public abstract class Entity implements ICommandListener {
@@ -49,5 +49,5 @@ index cc345d9..4a09ec3 100644
      }
  
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,14 +1,14 @@
-From 1503f029ded104f093527e73cf51d77d5ac009b7 Mon Sep 17 00:00:00 2001
+From 3d8ddadac2aa4be6d132d2242c814afda0930d5c 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 da52fe7..2363b1f 100644
+index 3b9b112..54a0808 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -1272,10 +1272,12 @@ public abstract class EntityLiving extends Entity {
+@@ -1278,10 +1278,12 @@ public abstract class EntityLiving extends Entity {
          return (float) this.getAttributeInstance(GenericAttributes.maxHealth).getValue();
      }
  
@@ -43,5 +43,5 @@ index aed3e4f..0502593 100644
 +    // Paper end
  }
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,11 +1,11 @@
-From 7139eede06aaa7b9627fa63b8f9a2616f0c39e50 Mon Sep 17 00:00:00 2001
+From 16df8534ab49f0dfe02976ca774fc7b3e66b8550 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sat, 4 Apr 2015 23:17:52 -0400
 Subject: [PATCH] Complete resource pack API
 
 
 diff --git a/src/main/java/net/minecraft/server/PacketPlayInResourcePackStatus.java b/src/main/java/net/minecraft/server/PacketPlayInResourcePackStatus.java
-index 30ca225..148141d 100644
+index 04e52d2..2a14e1a 100644
 --- a/src/main/java/net/minecraft/server/PacketPlayInResourcePackStatus.java
 +++ b/src/main/java/net/minecraft/server/PacketPlayInResourcePackStatus.java
 @@ -4,7 +4,7 @@ import java.io.IOException;
@@ -18,7 +18,7 @@ index 30ca225..148141d 100644
  
      public PacketPlayInResourcePackStatus() {}
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 50fcc7c..5e83e50 100644
+index 32ea702..82ba20a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
 @@ -1026,7 +1026,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@@ -86,5 +86,5 @@ index 2f86dd3..a168a77 100644
  
      // Spigot start
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0081-Re-add-Spigot-s-hopper-check-feature.patch

@@ -1,4 +1,4 @@
-From e1ea0950cef2aa1054a3db5cb5c750602739fb22 Mon Sep 17 00:00:00 2001
+From 3b10847113aae94f27ea2d6787aa6dd2428fb26a Mon Sep 17 00:00:00 2001
 From: Byteflux <byte@byteflux.net>
 Date: Sat, 12 Mar 2016 13:37:50 -0600
 Subject: [PATCH] Re-add Spigot's hopper-check feature
@@ -19,7 +19,7 @@ index f967ec0..4d6e5fc 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/TileEntityHopper.java b/src/main/java/net/minecraft/server/TileEntityHopper.java
-index 4cd2caa..6406bed 100644
+index b2f0c18..243da36 100644
 --- a/src/main/java/net/minecraft/server/TileEntityHopper.java
 +++ b/src/main/java/net/minecraft/server/TileEntityHopper.java
 @@ -178,6 +178,12 @@ public class TileEntityHopper extends TileEntityLootable implements IHopper, ITi
@@ -36,5 +36,5 @@ index 4cd2caa..6406bed 100644
              return false;
          } else {
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 4cc6be534b490919b4e2bff32bf93121d92f6c6c Mon Sep 17 00:00:00 2001
+From af642f58324bdab0a5c1b9d2706443b192b7e13e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 4 Mar 2016 18:18:37 -0600
 Subject: [PATCH] Chunk save queue improvements
@@ -41,7 +41,7 @@ index e55ff98..2a391d5 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 5bd6ce0..336e780 100644
+index eb13bc9..cbbf95f 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -11,14 +11,17 @@ import java.util.List;
@@ -170,5 +170,5 @@ index 4733f94..113aea2 100644
  
          if (this.b.isEmpty()) {
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 92679822582a085d38fef8fa9221b3c99e2696ee Mon Sep 17 00:00:00 2001
+From 92e6b36b911d23f516db64a05b72e25b40dbc5c0 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 4 Mar 2013 23:46:10 -0500
 Subject: [PATCH] Chunk Save Reattempt
@@ -6,7 +6,7 @@ Subject: [PATCH] Chunk Save Reattempt
 We commonly have "Stream Closed" errors on chunk saving, so this code should re-try to save the chunk in the event of failure and hopefully prevent rollbacks.
 
 diff --git a/src/main/java/net/minecraft/server/ChunkRegionLoader.java b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
-index 336e780..7eb13f8 100644
+index cbbf95f..778f8f5 100644
 --- a/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 +++ b/src/main/java/net/minecraft/server/ChunkRegionLoader.java
 @@ -170,11 +170,16 @@ public class ChunkRegionLoader implements IChunkLoader, IAsyncChunkSaver {
@@ -42,5 +42,5 @@ index 2ca94a4..68dd17d 100644
  
      }
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 521c61138ada72d1984b456255efe1d24335a33d Mon Sep 17 00:00:00 2001
+From fb8fffbcccdbf0564e2c9c14e68f773212176618 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:17:38 -0400
 Subject: [PATCH] Default loading permissions.yml before plugins
@@ -51,5 +51,5 @@ index 53bfbc4..8ffc06b 100644
              CraftDefaultPermissions.registerCorePermissions();
              helpMap.initializeCommands();
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 4c91ca2b1fe10d6f28f9cf9f3c31568297310361 Mon Sep 17 00:00:00 2001
+From 569eaebd6555de10a0b88497b260c209c9b8d047 Mon Sep 17 00:00:00 2001
 From: William <admin@domnian.com>
 Date: Fri, 18 Mar 2016 03:30:17 -0400
 Subject: [PATCH] Allow Reloading of Custom Permissions
@@ -23,5 +23,5 @@ index 8ffc06b..29244e1 100644
 +    // Paper end
  }
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 2263abc5482ee2d5e7942f6debecf3a3a1482529 Mon Sep 17 00:00:00 2001
+From 4ac4c0bbbf0d85a87df58b7b64b9bb6b285f46d6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 13:50:14 -0400
 Subject: [PATCH] Remove Metadata on reload
@@ -26,5 +26,5 @@ index 29244e1..9ed9fbb 100644
          commandMap.clearCommands();
          resetRecipes();
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From dc43a9c78695bcc273f89f2e343e7d686186fcd0 Mon Sep 17 00:00:00 2001
+From 6bd67621d6773a3127b55f78fd1b30a3b639a315 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 14:19:19 -0400
 Subject: [PATCH] Undead horse leashing
@@ -20,7 +20,7 @@ index 4d6e5fc..38f94ce 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityHorse.java b/src/main/java/net/minecraft/server/EntityHorse.java
-index ec1e7f6..19532b8 100644
+index a81bf3b..8367458 100644
 --- a/src/main/java/net/minecraft/server/EntityHorse.java
 +++ b/src/main/java/net/minecraft/server/EntityHorse.java
 @@ -167,6 +167,7 @@ public class EntityHorse extends EntityAnimal implements IInventoryListener, IJu
@@ -32,5 +32,5 @@ index ec1e7f6..19532b8 100644
      }
  
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 63cb0a322261ca30465a9ff95036501d02ee012a Mon Sep 17 00:00:00 2001
+From e9f30600cca1ac5e4c62925729269cc5a1b09322 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
@@ -22,5 +22,5 @@ index 1b17ca6..0a20cec 100644
                  this.burn();
                  flag1 = true;
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 8087698a536aa02f6c2fd3590e4eb9bd41c2a508 Mon Sep 17 00:00:00 2001
+From b472f6b03d8f312bacbb0e22730c30fbb42b3c60 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
@@ -293,5 +293,5 @@ index 22cc267..94f2ba0 100644
      private final Spigot spigot = new Spigot()
      {
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 0eb70e15ed6050e0d6bcf3b2c10cb3ff6ea05e03 Mon Sep 17 00:00:00 2001
+From ab8ab4ef84ffa10baf61b44d14a4cc73445dab32 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
@@ -24,7 +24,7 @@ index 38f94ce..7d8a541 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index df19327..8c261d0 100644
+index 7a4f56d..a073e6c 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -144,7 +144,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -37,5 +37,5 @@ index df19327..8c261d0 100644
                  }
              } else {
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0091-Optimize-BlockStateList-BlockData.patch

@@ -1,4 +1,4 @@
-From 4ddf8ca6b66ac815c05020403f61108ce1b938b3 Mon Sep 17 00:00:00 2001
+From 02ef268d939372fee2ed6febdcab16b32556bb72 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 19:15:44 -0400
 Subject: [PATCH] Optimize BlockStateList/BlockData
@@ -13,17 +13,17 @@ would then NPE, so it would not result in hidden issues.
 This is super hot code, so removing those checks should give decent gains.
 
 diff --git a/src/main/java/net/minecraft/server/BlockStateList.java b/src/main/java/net/minecraft/server/BlockStateList.java
-index a11c62f..43f198b 100644
+index 19ea22f..43ecf3b 100644
 --- a/src/main/java/net/minecraft/server/BlockStateList.java
 +++ b/src/main/java/net/minecraft/server/BlockStateList.java
-@@ -145,21 +145,11 @@ public class BlockStateList {
+@@ -151,21 +151,11 @@ public class BlockStateList {
          }
  
          public <T extends Comparable<T>> T get(IBlockState<T> iblockstate) {
 -            if (!this.b.containsKey(iblockstate)) {
 -                throw new IllegalArgumentException("Cannot get property " + iblockstate + " as it does not exist in " + this.a.t());
 -            } else {
--                return iblockstate.b().cast(this.b.get(iblockstate));
+-                return iblockstate.b().cast(this.b.get(iblockstate)); // Paper - decompile fix
 -            }
 +            return iblockstate.b().cast(this.b.get(iblockstate)); // Paper
          }
@@ -41,5 +41,5 @@ index a11c62f..43f198b 100644
  
          public ImmutableMap<IBlockState<?>, Comparable<?>> s() {
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 44c89e9b0fc391d369d1213dbdbc0a925ab7b884 Mon Sep 17 00:00:00 2001
+From 5dc04c9513360e761b5d95a02a5af027f5556a07 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
@@ -93,5 +93,5 @@ index ad7a81c..d658fa2 100644
          // CraftBukkit start - tree generation
          if (captureTreeGeneration) {
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 6c92c7164a6032a1db7d37f07a46c9f303937352 Mon Sep 17 00:00:00 2001
+From 2b215afb5bc1e8af17912c2dcf1cfab0bbb122e4 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
@@ -91,7 +91,7 @@ index 73e68d8..439a77e 100644
  
              if (random.nextInt((int) ((100.0F / (this == Blocks.PUMPKIN_STEM ? world.spigotConfig.pumpkinModifier : world.spigotConfig.melonModifier)) * (25.0F / f)) + 1) == 0) { // Spigot
 diff --git a/src/main/java/net/minecraft/server/EntityMonster.java b/src/main/java/net/minecraft/server/EntityMonster.java
-index 64f4754..05eb5f9 100644
+index f477036..23826fe 100644
 --- a/src/main/java/net/minecraft/server/EntityMonster.java
 +++ b/src/main/java/net/minecraft/server/EntityMonster.java
 @@ -118,17 +118,17 @@ public abstract class EntityMonster extends EntityCreature implements IMonster {
@@ -118,7 +118,7 @@ index 64f4754..05eb5f9 100644
      }
  
 diff --git a/src/main/java/net/minecraft/server/EntityZombie.java b/src/main/java/net/minecraft/server/EntityZombie.java
-index 949452c..d6c07a2 100644
+index 7a5b053..0b0eef3 100644
 --- a/src/main/java/net/minecraft/server/EntityZombie.java
 +++ b/src/main/java/net/minecraft/server/EntityZombie.java
 @@ -194,7 +194,7 @@ public class EntityZombie extends EntityMonster {
@@ -131,5 +131,5 @@ index 949452c..d6c07a2 100644
                          if (!this.world.isPlayerNearby((double) i1, (double) j1, (double) k1, 7.0D) && this.world.a(entityzombie.getBoundingBox(), (Entity) entityzombie) && this.world.getCubes(entityzombie, entityzombie.getBoundingBox()).isEmpty() && !this.world.containsLiquid(entityzombie.getBoundingBox())) {
                              this.world.addEntity(entityzombie, CreatureSpawnEvent.SpawnReason.REINFORCEMENTS); // CraftBukkit
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From bedf1c64bec230afeb374d62bb43eb9e9490746c Mon Sep 17 00:00:00 2001
+From 5e0d629b3e6a5db8d5a0151baee6c66582d768ff 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
@@ -41,5 +41,5 @@ index 932eeb7..06a06ea 100644
  
                  if (gameprofile != null) {
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,14 +1,14 @@
-From 76d2d29b4343817fa91cbce9f4a635318cbd6246 Mon Sep 17 00:00:00 2001
+From 18897365f4f62800534d033dcf86f46dea38d55f Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 21 Jun 2015 15:07:20 -0400
 Subject: [PATCH] Custom replacement for eaten items
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 2363b1f..624730a 100644
+index 54a0808..4b9e65b 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -2216,12 +2216,25 @@ public abstract class EntityLiving extends Entity {
+@@ -2222,12 +2222,25 @@ public abstract class EntityLiving extends Entity {
              ItemStack itemstack = (craftItem.equals(event.getItem())) ? this.bm.a(this.world, this) : CraftItemStack.asNMSCopy(event.getItem()).a(world, this);
              // CraftBukkit end
  
@@ -35,5 +35,5 @@ index 2363b1f..624730a 100644
  
      }
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 12e201bfb0a6bbbd6062ddff4209e23f89dea8e5 Mon Sep 17 00:00:00 2001
+From 52355afff2119157d7c0a1ef6f86ac5a44c669b2 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
@@ -46,5 +46,5 @@ index 0502593..3a0d338 100644
  
      public double getMaxHealth() {
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,14 +1,14 @@
-From 86e85867373de0f4473d131236191f6a43d36387 Mon Sep 17 00:00:00 2001
+From 50673c9e6a2f18b9997e5ef316a0ce67fb2f846e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 27 Sep 2015 01:18:02 -0400
 Subject: [PATCH] handle NaN health/absorb values and repair bad data
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index 624730a..7883ba7 100644
+index 4b9e65b..ebd0475 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
-@@ -458,7 +458,13 @@ public abstract class EntityLiving extends Entity {
+@@ -463,7 +463,13 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void a(NBTTagCompound nbttagcompound) {
@@ -23,7 +23,7 @@ index 624730a..7883ba7 100644
          if (nbttagcompound.hasKeyOfType("Attributes", 9) && this.world != null && !this.world.isClientSide) {
              GenericAttributes.a(this.getAttributeMap(), nbttagcompound.getList("Attributes", 10));
          }
-@@ -743,6 +749,10 @@ public abstract class EntityLiving extends Entity {
+@@ -748,6 +754,10 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void setHealth(float f) {
@@ -34,7 +34,7 @@ index 624730a..7883ba7 100644
          // CraftBukkit start - Handle scaled health
          if (this instanceof EntityPlayer) {
              org.bukkit.craftbukkit.entity.CraftPlayer player = ((EntityPlayer) this).getBukkitEntity();
-@@ -2086,7 +2096,7 @@ public abstract class EntityLiving extends Entity {
+@@ -2092,7 +2102,7 @@ public abstract class EntityLiving extends Entity {
      }
  
      public void setAbsorptionHearts(float f) {
@@ -56,5 +56,5 @@ index a168a77..fe5084e 100644
      }
  
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 31512ee99a551bd2cfb70cc1dc3351a513309310 Mon Sep 17 00:00:00 2001
+From 1da217f367d2f1e81f73d6b7f8b1359f3410f648 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
@@ -22,5 +22,5 @@ index 5421026..7100710 100644
          long i = d(chunkcoordintpair.x, chunkcoordintpair.z);
  
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0099-Support-offline-mode-in-whitelist-command-as-well.patch

@@ -1,11 +1,11 @@
-From b24a42a51ce2b505c2e5c4d6db906c86fde03305 Mon Sep 17 00:00:00 2001
+From f989b42f5b3ba73c09345df011db7c83eac75f06 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 21 Mar 2016 00:19:18 -0500
 Subject: [PATCH] Support offline mode in whitelist command as well
 
 
 diff --git a/src/main/java/net/minecraft/server/CommandWhitelist.java b/src/main/java/net/minecraft/server/CommandWhitelist.java
-index fdc9210..49e9ce1 100644
+index b52bf74..8da137e 100644
 --- a/src/main/java/net/minecraft/server/CommandWhitelist.java
 +++ b/src/main/java/net/minecraft/server/CommandWhitelist.java
 @@ -43,24 +43,35 @@ public class CommandWhitelist extends CommandAbstract {
@@ -44,13 +44,14 @@ index fdc9210..49e9ce1 100644
                      a(icommandlistener, (ICommand) this, "commands.whitelist.remove.success", new Object[] { astring[1]});
                  } else if (astring[0].equals("reload")) {
                      minecraftserver.getPlayerList().reloadWhitelist();
-@@ -95,4 +106,41 @@ public class CommandWhitelist extends CommandAbstract {
-         return a((ICommand) o);
+@@ -88,4 +99,43 @@ public class CommandWhitelist extends CommandAbstract {
+             return Collections.emptyList();
+         }
      }
-     // Paper end
 +
++    // Paper start
 +    /**
-+     * Paper - Adds or removes a player from the game whitelist
++     * Adds or removes a player from the game whitelist
 +     *
 +     * @param mcserver running instance of MinecraftServer
 +     * @param playerName the player we're going to be whitelisting
@@ -85,7 +86,8 @@ index fdc9210..49e9ce1 100644
 +            }
 +        }
 +    }
++    // Paper end
  }
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0100-Optimize-Chunk-Unload-Queue.patch

@@ -1,4 +1,4 @@
-From e26a0dcdf9c130cac19a89266af08f9ec5adaf8a Mon Sep 17 00:00:00 2001
+From 37286df2722a024569953f7d0627bc1c231a1826 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 18 Mar 2016 17:57:25 -0400
 Subject: [PATCH] Optimize Chunk Unload Queue
@@ -348,5 +348,5 @@ index a1bd1a6..7fcd437 100644
          {
              isActive = false;
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0101-Fix-SkullCache-case-bug.patch

@@ -1,4 +1,4 @@
-From 25f458b42dc059d51743f85b6340048c777b7552 Mon Sep 17 00:00:00 2001
+From da3e50d1652f69d0f5fb9522ec10e881cb9fc384 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 5 Jan 2016 21:48:24 -0500
 Subject: [PATCH] Fix SkullCache case bug
@@ -18,5 +18,5 @@ index 7eecc6c..3c20ef3 100644
                      callback.apply(profile);
                  } else {
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 2d41484aecd2aa30d934c36ce9b78f085bf5dfd2 Mon Sep 17 00:00:00 2001
+From 00a2f241b17ef929b9355f54fdf2b47cf24ef1ca Mon Sep 17 00:00:00 2001
 From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
 Date: Sat, 19 Mar 2016 22:25:11 +0100
 Subject: [PATCH] Waving banner workaround
@@ -33,5 +33,5 @@ index c5c3f40..3ed2356 100644
  
      public void a(PacketDataSerializer packetdataserializer) throws IOException {
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 955f9898c8dadc03491cd96489b4764b080e38d6 Mon Sep 17 00:00:00 2001
+From 2c65576061d5389c06554fc760fa93afd8322eb4 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 4a09ec3..cf89b20 100644
+index 3ded885..6bdb76e 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -45,6 +45,7 @@ public abstract class Entity implements ICommandListener {
@@ -27,5 +27,5 @@ index 4a09ec3..cf89b20 100644
          this.justCreated = true;
          this.uniqueID = MathHelper.a(this.random);
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From ddf153243e16bbaf898972af89ee86633247c4d5 Mon Sep 17 00:00:00 2001
+From 53747cbca7417b33a59fdc3288cb3301594259e4 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 cf89b20..da8b434 100644
+index 6bdb76e..2637e60 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -2109,7 +2109,7 @@ public abstract class Entity implements ICommandListener {
@@ -20,5 +20,5 @@ index cf89b20..da8b434 100644
              WorldServer worldserver1 = ((CraftWorld) exit.getWorld()).getHandle();
              int i = worldserver1.dimension;
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 075c6a844c9b87d35a5ce5a5722b0e37c83ad5bb Mon Sep 17 00:00:00 2001
+From 90e134ecf1742e7882e0b1d9a0fea51236fd0317 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
@@ -86,10 +86,10 @@ index 0a3cfbc..825e931 100644
  
      public Chunk getChunkIfLoaded(int x, int z) {
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 0e1cbfe..7e06fa9 100644
+index 47dbea8..b859c51 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -200,6 +200,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -203,6 +203,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
      // CraftBukkit end
  
      public void doTick() {
@@ -110,5 +110,5 @@ index c81dfee..ec62b1f 100644
          // Update neighbor counts
          for (int xx = -2; xx < 3; xx++) {
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From b00ca434639def8f7a3ceb9c85ef6186d47af291 Mon Sep 17 00:00:00 2001
+From 52834641965d3823b1d464616db2fb9bbc27e597 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
@@ -19,10 +19,10 @@ index 7d8a541..66ba48a 100644
 +    }
  }
 diff --git a/src/main/java/net/minecraft/server/WorldServer.java b/src/main/java/net/minecraft/server/WorldServer.java
-index 7e06fa9..f7bb918 100644
+index b859c51..fd1150b 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -426,7 +426,10 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -429,7 +429,10 @@ public class WorldServer extends World implements IAsyncTaskHandler {
                      if (this.isRainingAt(blockposition)) {
                          DifficultyDamageScaler difficultydamagescaler = this.D(blockposition);
  
@@ -35,5 +35,5 @@ index 7e06fa9..f7bb918 100644
  
                              entityhorse.setType(EnumHorseType.SKELETON);
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0107-Optimize-isValidLocation-for-inlining.patch

@@ -1,4 +1,4 @@
-From 582d4af0eb99687080da0728560e2202ed04a87c Mon Sep 17 00:00:00 2001
+From 551294f564c0fa74d282ee54ad8efea388161f38 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 22 Mar 2016 23:41:34 -0400
 Subject: [PATCH] Optimize isValidLocation for inlining
@@ -8,7 +8,7 @@ Move test to the blockPosition class so that it can access local variables.
 Replace all calls to the new place to the unnecessary forward.
 
 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index f0908a2..d1688e1 100644
+index c5b6a34..17bbfb0 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
 @@ -9,6 +9,9 @@ public class BaseBlockPosition implements Comparable<BaseBlockPosition> {
@@ -118,5 +118,5 @@ index 825e931..b5406e9 100644
          } else {
              Chunk chunk = this.chunkProvider.getLoadedChunkAt(blockposition.getX() >> 4, blockposition.getZ() >> 4);
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0108-Use-correct-item-in-arrow-pickup-event.patch

@@ -1,11 +1,11 @@
-From cb0cd69765009c61da1bfe006de106ba65eee7fa Mon Sep 17 00:00:00 2001
+From 010b8cf40e7f0e7af73a26a32e20b247bb2374ef Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 22 Mar 2016 16:00:16 -0400
 Subject: [PATCH] Use correct item in arrow pickup event
 
 
 diff --git a/src/main/java/net/minecraft/server/EntityArrow.java b/src/main/java/net/minecraft/server/EntityArrow.java
-index 8c261d0..97948f4 100644
+index a073e6c..6749898 100644
 --- a/src/main/java/net/minecraft/server/EntityArrow.java
 +++ b/src/main/java/net/minecraft/server/EntityArrow.java
 @@ -430,7 +430,7 @@ public abstract class EntityArrow extends Entity implements IProjectile {
@@ -27,5 +27,5 @@ index 8c261d0..97948f4 100644
              }
  
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0109-Fix-cooked-fish-legacy-import.patch

@@ -1,4 +1,4 @@
-From 0d20c24a6c30ad425c511216c9cc8ef4e78f1fc8 Mon Sep 17 00:00:00 2001
+From d0d8685cfd509adfb38b1b43e340915833202ede Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Tue, 1 Mar 2016 04:32:08 -0500
 Subject: [PATCH] Fix cooked fish legacy import
@@ -18,5 +18,5 @@ index 87b82eb..a7c71f4 100644
          DataConverterMaterialId.a[352] = "minecraft:bone";
          DataConverterMaterialId.a[353] = "minecraft:sugar";
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0110-Load-chunk-before-player-teleport.patch

@@ -1,4 +1,4 @@
-From 562e105bbb5bda677214a8be2b1e3be52457839c Mon Sep 17 00:00:00 2001
+From fd475da2c48964e0ea04cbe945c0c11f71b94dfd Mon Sep 17 00:00:00 2001
 From: Gabscap <sonstige.netzwerke@gabriel-paradzik.de>
 Date: Sat, 26 Mar 2016 18:41:22 +0100
 Subject: [PATCH] Load chunk before player teleport
@@ -23,5 +23,5 @@ index fe5084e..d77211a 100644
          if (fromWorld == toWorld) {
              entity.playerConnection.teleport(to);
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0111-Prevent-possible-infinite-loop-in-BlockPosition-iter.patch

@@ -1,4 +1,4 @@
-From f7eb7e7f48789ec63ed17a648a7086f730e58cdc Mon Sep 17 00:00:00 2001
+From 5cf2de3b1381af0c32b0cfd020b12ce6d05d47d6 Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sat, 26 Mar 2016 21:36:05 -0500
 Subject: [PATCH] Prevent possible infinite loop in BlockPosition iterator
@@ -87,5 +87,5 @@ index 2d56f02..b87c4c6 100644
                              // Paper start - modify base position variables
                              ((BaseBlockPosition) this.b).a = i;
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 10c6150a48e2a65c2b689a54529fb5a05272770b Mon Sep 17 00:00:00 2001
+From c45edfb67ae5072a2a5dfdbe9c4012c888ed7c94 Mon Sep 17 00:00:00 2001
 From: Jedediah Smith <jedediah@silencegreys.com>
 Date: Sun, 20 Mar 2016 06:45:01 -0400
 Subject: [PATCH] Access items by EquipmentSlot
@@ -64,5 +64,5 @@ index 0902386..19662da 100644
 +    // Paper end
  }
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0113-Check-async-remove-unused-vars-GH-159.patch

@@ -1,4 +1,4 @@
-From 89a445c07fdd5030baa8307fd083e376b646867b Mon Sep 17 00:00:00 2001
+From 442c1cd9adabfa9d608bba2341e09588d22bd9af Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 27 Mar 2016 20:24:05 -0500
 Subject: [PATCH] Check async, remove unused vars, GH-159
@@ -28,5 +28,5 @@ index 721bcae..3ba55d7 100644
                      if ((mobcnt = getEntityCount(worldserver, enumcreaturetype.a())) <= limit * i / 256) {
                          BlockPosition.MutableBlockPosition blockposition_mutableblockposition = new BlockPosition.MutableBlockPosition();
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 871e055e21f6d81aee4c4a8ebf7ba987abe0af06 Mon Sep 17 00:00:00 2001
+From 4813940c2a3f49cc5656021b86802fad492efc17 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
@@ -38,10 +38,10 @@ index b5406e9..fcd7cd6 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 f7bb918..3c41a0c 100644
+index fd1150b..f170d7a 100644
 --- a/src/main/java/net/minecraft/server/WorldServer.java
 +++ b/src/main/java/net/minecraft/server/WorldServer.java
-@@ -29,6 +29,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
+@@ -32,6 +32,7 @@ import org.bukkit.event.weather.LightningStrikeEvent;
  public class WorldServer extends World implements IAsyncTaskHandler {
  
      private static final Logger a = LogManager.getLogger();
@@ -49,7 +49,7 @@ index f7bb918..3c41a0c 100644
      private final MinecraftServer server;
      public EntityTracker tracker;
      private final PlayerChunkMap manager;
-@@ -766,6 +767,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -742,6 +743,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
  
                          if (iblockdata.getMaterial() != Material.AIR && Block.a(iblockdata.getBlock(), nextticklistentry.a())) {
                              try {
@@ -57,7 +57,7 @@ index f7bb918..3c41a0c 100644
                                  iblockdata.getBlock().b((World) this, nextticklistentry.a, iblockdata, this.random);
                              } catch (Throwable throwable) {
                                  CrashReport crashreport = CrashReport.a(throwable, "Exception while ticking a block");
-@@ -773,7 +775,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
+@@ -749,7 +751,7 @@ public class WorldServer extends World implements IAsyncTaskHandler {
  
                                  CrashReportSystemDetails.a(crashreportsystemdetails, nextticklistentry.a, iblockdata);
                                  throw new ReportedException(crashreport);
@@ -67,5 +67,5 @@ index f7bb918..3c41a0c 100644
                          timing.stopTiming(); // Paper
                      } else {
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From 5c9cf706ab6830412c90caeb2e3aacb8eead887f Mon Sep 17 00:00:00 2001
+From 9cfb72beaff0ebaa90f24e86e409410a268d565c 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
@@ -25,5 +25,5 @@ index fcd7cd6..fa84bad 100644
      }
  
 -- 
-2.7.4
+2.8.0
 

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

@@ -1,4 +1,4 @@
-From e98e5779ce26d8e3ac106551c07fc2a8c6bff37f Mon Sep 17 00:00:00 2001
+From 9f0319957909bbe303e1e8e7a3163b3ef550ef66 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
@@ -36,5 +36,5 @@ index 6e3d17b..9334a0a 100644
  
      public void c(long i) {
 -- 
-2.7.4
+2.8.0
 

Spigot-Server-Patches/0117-EntityPathfindEvent.patch

@@ -1,4 +1,4 @@
-From e5e8089880653c1435a16e5f25731a5b5ba1bf6e Mon Sep 17 00:00:00 2001
+From 54ac4679bd5f98cde6a96547de0890155ae4c391 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 21:22:26 -0400
 Subject: [PATCH] EntityPathfindEvent
@@ -35,5 +35,5 @@ index 9687785..0926d22 100644
                  float f = this.h();
  
 -- 
-2.7.4
+2.8.0