Anti Xray v2 (#858)

2017-10-05 14:38:21 +01:00 · 2017-10-05 14:38:21 +01:00 · 524ebe97d7
parent 0bff7a667d
commit 524ebe97d7
72 changed files with 1835 additions and 293 deletions
--- a/Spigot-Server-Patches/0003-MC-Dev-fixes.patch
+++ b/Spigot-Server-Patches/0003-MC-Dev-fixes.patch
@ -1,4 +1,4 @@
-From d96016cb6d0bc3a710cf6e081872d2f4117e1dda Mon Sep 17 00:00:00 2001
+From f44918d9a3c234a2be57605bd9752b9908e12784 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
@ -44,7 +44,7 @@ index 71524f2cd..288c52c55 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/CommandAbstract.java b/src/main/java/net/minecraft/server/CommandAbstract.java
-index 14a7b9c92..8b703db42 100644
+index 76501e299..67cadecbb 100644
 --- a/src/main/java/net/minecraft/server/CommandAbstract.java
 +++ b/src/main/java/net/minecraft/server/CommandAbstract.java
@@ -231,7 +231,7 @@ public abstract class CommandAbstract implements ICommand {
@ -83,6 +83,28 @@ index 14a7b9c92..8b703db42 100644
         return this.a((ICommand) object);
     }
 
+diff --git a/src/main/java/net/minecraft/server/RegistryBlockID.java b/src/main/java/net/minecraft/server/RegistryBlockID.java
+index 58f47d0de..8860a0129 100644
+--- a/src/main/java/net/minecraft/server/RegistryBlockID.java
+++ b/src/main/java/net/minecraft/server/RegistryBlockID.java
+@@ -8,7 +8,7 @@ import java.util.Iterator;
+ import java.util.List;
+ import javax.annotation.Nullable;
+ 
+-public class RegistryBlockID<T> implements Registry<T> {
+public class RegistryBlockID<T> implements Registry { // Paper - Fix decompile error
+ 
+     private final IdentityHashMap<T, Integer> a;
+     private final List<T> b;
+@@ -26,7 +26,7 @@ public class RegistryBlockID<T> implements Registry<T> {
+         this.a.put(t0, Integer.valueOf(i));
+ 
+         while (this.b.size() <= i) {
+-            this.b.add((Object) null);
+            this.b.add(null); // Paper - Fix decompile error
+         }
+ 
+         this.b.set(i, t0);
 diff --git a/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java b/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java
 index f5bcbdbe1..3190cadfc 100644
 --- a/src/test/java/org/bukkit/craftbukkit/inventory/ItemFactoryTest.java
@ -97,5 +119,5 @@ index f5bcbdbe1..3190cadfc 100644
         for (ZipEntry clazzEntry; (clazzEntry = nmsZipStream.getNextEntry()) != null; ) {
             final String entryName = clazzEntry.getName();
 -- 
-2.13.0
+2.14.2

--- a/Spigot-Server-Patches/0005-MC-Utils.patch
+++ b/Spigot-Server-Patches/0005-MC-Utils.patch
@ -1,13 +1,22 @@
-From 2ff1a095a26d78e4e5de5a878259f8094cbb0d90 Mon Sep 17 00:00:00 2001
+From 6b1f6a4395784e4baa167d1552735368f74404a2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 28 Mar 2016 20:55:47 -0400
 Subject: [PATCH] MC Utils


 diff --git a/src/main/java/net/minecraft/server/Chunk.java b/src/main/java/net/minecraft/server/Chunk.java
-index 38d69b944..7fee74d80 100644
+index 4bbebb25a..c4d9344a7 100644
 --- a/src/main/java/net/minecraft/server/Chunk.java
 +++ b/src/main/java/net/minecraft/server/Chunk.java
+@@ -20,7 +20,7 @@ import org.bukkit.Server; // CraftBukkit
+ public class Chunk {
+ 
+     private static final Logger e = LogManager.getLogger();
+-    public static final ChunkSection a = null;
+    public static final ChunkSection a = null; public static final ChunkSection EMPTY_CHUNK_SECTION = Chunk.a; // Paper - OBFHELPER
+     private final ChunkSection[] sections;
+     private final byte[] g;
+     private final int[] h;
@@ -675,6 +675,7 @@ public class Chunk {
         return !block.isTileEntity() ? null : ((ITileEntity) block).a(this.world, iblockdata.getBlock().toLegacyData(iblockdata));
     }
@ -16,6 +25,19 @@ index 38d69b944..7fee74d80 100644
     @Nullable
     public TileEntity a(BlockPosition blockposition, Chunk.EnumTileEntityState chunk_enumtileentitystate) {
         // CraftBukkit start
+diff --git a/src/main/java/net/minecraft/server/DataPaletteBlock.java b/src/main/java/net/minecraft/server/DataPaletteBlock.java
+index 1f2fe87b6..2cb462b8e 100644
+--- a/src/main/java/net/minecraft/server/DataPaletteBlock.java
+++ b/src/main/java/net/minecraft/server/DataPaletteBlock.java
+@@ -5,7 +5,7 @@ import javax.annotation.Nullable;
+ public class DataPaletteBlock implements DataPaletteExpandable {
+ 
+     private static final DataPalette d = new DataPaletteGlobal();
+-    protected static final IBlockData a = Blocks.AIR.getBlockData();
+    protected static final IBlockData a = Blocks.AIR.getBlockData(); public static final IBlockData DEFAULT_BLOCK_DATA = DataPaletteBlock.a; // Paper - OBFHELPER
+     protected DataBits b;
+     protected DataPalette c;
+     private int e;
 diff --git a/src/main/java/net/minecraft/server/MCUtil.java b/src/main/java/net/minecraft/server/MCUtil.java
 new file mode 100644
 index 000000000..1159eea1a
@ -252,5 +274,5 @@ index e0cb6aa6e..bc6383669 100644
 
     public NBTTagList() {}
 -- 
-2.13.0
+2.14.2

--- a/Spigot-Server-Patches/0169-Optimise-NetworkManager.patch
+++ b/Spigot-Server-Patches/0169-Optimise-NetworkManager.patch
@ -1,88 +0,0 @@
-From fa201a9b717a5ae06c7572fcaa0811eb210d8a00 Mon Sep 17 00:00:00 2001
-From: Alfie Cleveland <alfeh@me.com>
-Date: Fri, 25 Nov 2016 20:35:05 +0000
-Subject: [PATCH] Optimise NetworkManager
-
-
-diff --git a/src/main/java/net/minecraft/server/NetworkManager.java b/src/main/java/net/minecraft/server/NetworkManager.java
-index d583cced..89743d2b 100644
--- a/src/main/java/net/minecraft/server/NetworkManager.java
-+++ b/src/main/java/net/minecraft/server/NetworkManager.java
-@@ -62,8 +62,8 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
-         }
-     };
-     private final EnumProtocolDirection h;
-    private final Queue<NetworkManager.QueuedPacket> i = Queues.newConcurrentLinkedQueue();
-    private final ReentrantReadWriteLock j = new ReentrantReadWriteLock();
-+    // private final Queue<NetworkManager.QueuedPacket> i = Queues.newConcurrentLinkedQueue(); // Paper
-+    // private final ReentrantReadWriteLock j = new ReentrantReadWriteLock(); // Paper
-     public Channel channel;
-     // Spigot Start // PAIL
-     public SocketAddress l;
-@@ -141,32 +141,14 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
-         if (this.isConnected()) {
-             this.m();
-             this.a(packet, (GenericFutureListener[]) null);
-        } else {
-            this.j.writeLock().lock();
-
-            try {
-                this.i.add(new NetworkManager.QueuedPacket(packet, new GenericFutureListener[0]));
-            } finally {
-                this.j.writeLock().unlock();
-            }
-         }
-
-     }
- 
-     public void sendPacket(Packet<?> packet, GenericFutureListener<? extends Future<? super Void>> genericfuturelistener, GenericFutureListener<? extends Future<? super Void>>... agenericfuturelistener) {
-         if (this.isConnected()) {
-             this.m();
-             this.a(packet, (GenericFutureListener[]) ArrayUtils.add(agenericfuturelistener, 0, genericfuturelistener));
-        } else {
-            this.j.writeLock().lock();
-
-            try {
-                this.i.add(new NetworkManager.QueuedPacket(packet, (GenericFutureListener[]) ArrayUtils.add(agenericfuturelistener, 0, genericfuturelistener)));
-            } finally {
-                this.j.writeLock().unlock();
-            }
-         }
-
-     }
- 
-     private void a(final Packet<?> packet, @Nullable final GenericFutureListener<? extends Future<? super Void>>[] agenericfuturelistener) {
-@@ -211,20 +193,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
-     }
- 
-     private void m() {
-        if (this.channel != null && this.channel.isOpen()) {
-            this.j.readLock().lock();
-
-            try {
-                while (!this.i.isEmpty()) {
-                    NetworkManager.QueuedPacket networkmanager_queuedpacket = (NetworkManager.QueuedPacket) this.i.poll();
-
-                    this.a(networkmanager_queuedpacket.a, networkmanager_queuedpacket.b);
-                }
-            } finally {
-                this.j.readLock().unlock();
-            }
-
-        }
-+        // Paper - Contents removed
-     }
- 
-     public void a() {
-@@ -320,7 +289,7 @@ public class NetworkManager extends SimpleChannelInboundHandler<Packet<?>> {
-                 } else if (this.i() != null) {
-                     this.i().a(new ChatMessage("multiplayer.disconnect.generic", new Object[0]));
-                 }
-                this.i.clear(); // Free up packet queue.
-+                 // this.i.clear(); // Free up packet queue. // Paper - remove unneeded packet queue
-             }
- 
-         }
-- 
-2.13.1.windows.2
-
--- a/Spigot-Server-Patches/0169-Optimise-removeQueue.patch
+++ b/Spigot-Server-Patches/0169-Optimise-removeQueue.patch
@ -1,11 +1,11 @@
-From 40a8cfaaa06855558e2bde433738ee629bcce1a6 Mon Sep 17 00:00:00 2001
+From 7afee50d20f36a17db863aef658144e885105110 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Fri, 25 Nov 2016 13:22:40 +0000
 Subject: [PATCH] Optimise removeQueue


 diff --git a/src/main/java/net/minecraft/server/EntityPlayer.java b/src/main/java/net/minecraft/server/EntityPlayer.java
-index 8fb569be..df2e607d 100644
+index e8b78b51a..53147c6e2 100644
 --- a/src/main/java/net/minecraft/server/EntityPlayer.java
 +++ b/src/main/java/net/minecraft/server/EntityPlayer.java
@@ -3,8 +3,10 @@ package net.minecraft.server;
@ -61,5 +61,5 @@ index 8fb569be..df2e607d 100644
         this.cv = entityplayer.cv;
         this.setShoulderEntityLeft(entityplayer.getShoulderEntityLeft());
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0170-Allow-Reloading-of-Command-Aliases.patch
+++ b/Spigot-Server-Patches/0170-Allow-Reloading-of-Command-Aliases.patch
@ -1,4 +1,4 @@
-From 27326fc9080806c4213bd311c9f8faad37abd804 Mon Sep 17 00:00:00 2001
+From 0d2536e60ec8f1c70ca0fe5df04dcb65e123f3c4 Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Mon, 28 Nov 2016 10:21:52 -0500
 Subject: [PATCH] Allow Reloading of Command Aliases
@ -35,5 +35,5 @@ index d40b13c6e..5bbb09c9d 100644
     // Paper end
 }
 -- 
-2.14.1.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0171-Add-source-to-PlayerExpChangeEvent.patch
+++ b/Spigot-Server-Patches/0171-Add-source-to-PlayerExpChangeEvent.patch
@ -1,4 +1,4 @@
-From a0f07e693a7588b712572531456ce10d93fc2284 Mon Sep 17 00:00:00 2001
+From b9cf0c402f2c29fa10934108747fc075759462eb Mon Sep 17 00:00:00 2001
 From: AlphaBlend <whizkid3000@hotmail.com>
 Date: Thu, 8 Sep 2016 08:48:33 -0700
 Subject: [PATCH] Add source to PlayerExpChangeEvent
@ -48,5 +48,5 @@ index bdeeac36f..7422a91f0 100644
         Block block = world.getWorld().getBlockAt(x, y, z);
         CraftBlockState state = (CraftBlockState) block.getState();
 -- 
-2.13.2
+2.14.2

--- a/Spigot-Server-Patches/0172-Optimize-World.isLoaded-BlockPosition-Z.patch
+++ b/Spigot-Server-Patches/0172-Optimize-World.isLoaded-BlockPosition-Z.patch
@ -1,4 +1,4 @@
-From b495a4c3b32ad02d02084cba9b399321fbb0ad5f Mon Sep 17 00:00:00 2001
+From 828a1726d978ac9d0588a4228e4b9de9c2c15dca Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 2 Dec 2016 00:11:43 -0500
 Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize World.isLoaded(BlockPosition)Z
 Reduce method invocations for World.isLoaded(BlockPosition)Z

 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 6b368216e..de11ef617 100644
+index a2b5926a1..445936c7b 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -290,7 +290,7 @@ public abstract class World implements IBlockAccess {
@ -19,5 +19,5 @@ index 6b368216e..de11ef617 100644
 
     public boolean a(BlockPosition blockposition, boolean flag) {
 -- 
-2.13.3.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0173-Speedup-BlockPos-by-fixing-inlining.patch
+++ b/Spigot-Server-Patches/0173-Speedup-BlockPos-by-fixing-inlining.patch
@ -1,4 +1,4 @@
-From 9532738f11a4563b57e61ebf94c2109b3c2ef211 Mon Sep 17 00:00:00 2001
+From d66ad0e6ed1fa7d6cd87caee8b0591020c96d362 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Wed, 30 Nov 2016 20:56:58 -0600
 Subject: [PATCH] Speedup BlockPos by fixing inlining
@ -21,7 +21,7 @@ This is based upon conclusions drawn from inspecting the assenmbly generated byt
 They had 'callq' (invoke) instead of 'mov' (get from memory) instructions.

 diff --git a/src/main/java/net/minecraft/server/BaseBlockPosition.java b/src/main/java/net/minecraft/server/BaseBlockPosition.java
-index 679d5504..8e737718 100644
+index 679d5504e..8e737718e 100644
 --- a/src/main/java/net/minecraft/server/BaseBlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BaseBlockPosition.java
@@ -7,11 +7,12 @@ import javax.annotation.concurrent.Immutable;
@ -66,7 +66,7 @@ index 679d5504..8e737718 100644
     public BaseBlockPosition d(BaseBlockPosition baseblockposition) {
         return new BaseBlockPosition(this.getY() * baseblockposition.getZ() - this.getZ() * baseblockposition.getY(), this.getZ() * baseblockposition.getX() - this.getX() * baseblockposition.getZ(), this.getX() * baseblockposition.getY() - this.getY() * baseblockposition.getX());
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index b3c1f550..6a0b3a62 100644
+index b3c1f550c..6a0b3a62d 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -211,19 +211,21 @@ public class BlockPosition extends BaseBlockPosition {
@ -177,5 +177,5 @@ index b3c1f550..6a0b3a62 100644
 
         public BlockPosition h() {
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0174-Don-t-let-fishinghooks-use-portals.patch
+++ b/Spigot-Server-Patches/0174-Don-t-let-fishinghooks-use-portals.patch
@ -1,11 +1,11 @@
-From 77dc690ea1c5f9cc188ef8cab6a4c0c4c5105369 Mon Sep 17 00:00:00 2001
+From c6d1d4e466c703108bebad80f9715753077ead19 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 16:03:19 -0600
 Subject: [PATCH] Don't let fishinghooks use portals


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0a8d8a1a..e6b469a0 100644
+index ffd4d836b..a042c37c7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -144,7 +144,7 @@ public abstract class Entity implements ICommandListener {
@ -18,7 +18,7 @@ index 0a8d8a1a..e6b469a0 100644
     public int dimension;
     protected BlockPosition an;
 diff --git a/src/main/java/net/minecraft/server/EntityFishingHook.java b/src/main/java/net/minecraft/server/EntityFishingHook.java
-index 339d1f1b..7f011aef 100644
+index 339d1f1b1..7f011aef8 100644
 --- a/src/main/java/net/minecraft/server/EntityFishingHook.java
 +++ b/src/main/java/net/minecraft/server/EntityFishingHook.java
@@ -185,6 +185,12 @@ public class EntityFishingHook extends Entity {
@ -35,5 +35,5 @@ index 339d1f1b..7f011aef 100644
     }
 
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0175-Add-ProjectileCollideEvent.patch
+++ b/Spigot-Server-Patches/0175-Add-ProjectileCollideEvent.patch
@ -1,4 +1,4 @@
-From 4cda6abfb75a1e47090cf7c87aac477a69da019a Mon Sep 17 00:00:00 2001
+From 7c179086ea4e84afc3bcfb4f28513a0ce33bba44 Mon Sep 17 00:00:00 2001
 From: Techcable <Techcable@outlook.com>
 Date: Fri, 16 Dec 2016 21:25:39 -0600
 Subject: [PATCH] Add ProjectileCollideEvent
@ -66,7 +66,7 @@ index 7f011aef8..6ac89d1e3 100644
             vec3d1 = new Vec3D(movingobjectposition.pos.x, movingobjectposition.pos.y, movingobjectposition.pos.z);
         }
 diff --git a/src/main/java/net/minecraft/server/EntityProjectile.java b/src/main/java/net/minecraft/server/EntityProjectile.java
-index 3d3c1f5f9..0415c521d 100644
+index cfcaf3832..01c7fcc8b 100644
 --- a/src/main/java/net/minecraft/server/EntityProjectile.java
 +++ b/src/main/java/net/minecraft/server/EntityProjectile.java
@@ -160,6 +160,15 @@ public abstract class EntityProjectile extends Entity implements IProjectile {
@ -107,5 +107,5 @@ index 7422a91f0..16f6410b2 100644
         Projectile bukkitEntity = (Projectile) entity.getBukkitEntity();
         ProjectileLaunchEvent event = new ProjectileLaunchEvent(bukkitEntity);
 -- 
-2.13.2
+2.14.2

--- a/Spigot-Server-Patches/0176-Vanished-players-don-t-have-rights.patch
+++ b/Spigot-Server-Patches/0176-Vanished-players-don-t-have-rights.patch
@ -1,4 +1,4 @@
-From 0f2721ccf07d4698f377874093f70525616612ce Mon Sep 17 00:00:00 2001
+From 1cc4d5c4bd56750665addda72b522ae03480e5db Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 16 Dec 2016 22:10:35 -0600
 Subject: [PATCH] Vanished players don't have rights
@ -96,5 +96,5 @@ index 16f6410b2..883ef489f 100644
         return event;
     }
 -- 
-2.14.1
+2.14.2

--- a/Spigot-Server-Patches/0177-Prevent-Pathfinding-out-of-World-Border.patch
+++ b/Spigot-Server-Patches/0177-Prevent-Pathfinding-out-of-World-Border.patch
@ -1,4 +1,4 @@
-From 9a65260de4bb5ebafdd7f927be87a0766f11bfab Mon Sep 17 00:00:00 2001
+From cbabd72bb30424273efa4f0e1208c71a18867ca3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 19 Dec 2016 23:07:42 -0500
 Subject: [PATCH] Prevent Pathfinding out of World Border
@ -6,7 +6,7 @@ Subject: [PATCH] Prevent Pathfinding out of World Border
 This prevents Entities from trying to run outside of the World Border

 diff --git a/src/main/java/net/minecraft/server/NavigationAbstract.java b/src/main/java/net/minecraft/server/NavigationAbstract.java
-index 3ac6f84d..935b2e81 100644
+index 3ac6f84d3..935b2e81e 100644
 --- a/src/main/java/net/minecraft/server/NavigationAbstract.java
 +++ b/src/main/java/net/minecraft/server/NavigationAbstract.java
@@ -69,6 +69,7 @@ public abstract class NavigationAbstract {
@ -26,7 +26,7 @@ index 3ac6f84d..935b2e81 100644
             if (this.c != null && !this.c.b() && blockposition.equals(this.q)) {
                 return this.c;
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 9038d52e..632eb1c9 100644
+index 9038d52eb..632eb1c9d 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
@@ -29,7 +29,7 @@ public class WorldBorder {
@ -39,5 +39,5 @@ index 9038d52e..632eb1c9 100644
     }
 
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0178-Bound-Treasure-Maps-to-World-Border.patch
+++ b/Spigot-Server-Patches/0178-Bound-Treasure-Maps-to-World-Border.patch
@ -1,4 +1,4 @@
-From 62903803744076053bb0aa8bcba062aac2a83342 Mon Sep 17 00:00:00 2001
+From dc1d7a66413d919af3fcbdb4825553e27ef47087 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:15:11 -0500
 Subject: [PATCH] Bound Treasure Maps to World Border
@ -11,7 +11,7 @@ that is outside happens to be closer, but unreachable, yet another reachable
 one is in border that would of been missed.

 diff --git a/src/main/java/net/minecraft/server/StructureGenerator.java b/src/main/java/net/minecraft/server/StructureGenerator.java
-index 078957aa..7b635d3f 100644
+index 078957aac..7b635d3fa 100644
 --- a/src/main/java/net/minecraft/server/StructureGenerator.java
 +++ b/src/main/java/net/minecraft/server/StructureGenerator.java
@@ -236,6 +236,9 @@ public abstract class StructureGenerator extends WorldGenBase {
@ -25,7 +25,7 @@ index 078957aa..7b635d3f 100644
                             if (!flag1 || !world.b(l2, i3)) {
                                 return new BlockPosition((l2 << 4) + 8, 64, (i3 << 4) + 8);
 diff --git a/src/main/java/net/minecraft/server/WorldBorder.java b/src/main/java/net/minecraft/server/WorldBorder.java
-index 632eb1c9..1bb172bb 100644
+index 632eb1c9d..1bb172bbf 100644
 --- a/src/main/java/net/minecraft/server/WorldBorder.java
 +++ b/src/main/java/net/minecraft/server/WorldBorder.java
@@ -33,6 +33,18 @@ public class WorldBorder {
@ -48,5 +48,5 @@ index 632eb1c9..1bb172bb 100644
         return (double) chunkcoordintpair.e() > this.b() && (double) chunkcoordintpair.c() < this.d() && (double) chunkcoordintpair.f() > this.c() && (double) chunkcoordintpair.d() < this.e();
     }
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0179-Configurable-Cartographer-Treasure-Maps.patch
+++ b/Spigot-Server-Patches/0179-Configurable-Cartographer-Treasure-Maps.patch
@ -1,4 +1,4 @@
-From f4a1622b086019d10c6fe4694ebec9cd9c4b5e91 Mon Sep 17 00:00:00 2001
+From 7d2695a42ff73a0761934735c1e8c081aad4c778 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 20 Dec 2016 15:26:27 -0500
 Subject: [PATCH] Configurable Cartographer Treasure Maps
@ -9,7 +9,7 @@ Also allow turning off treasure maps all together as they can eat up Map ID's
 which are limited in quantity.

 diff --git a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
-index a80d8b2a..32ca0a40 100644
+index a80d8b2ac..32ca0a40e 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperWorldConfig.java
@@ -395,4 +395,14 @@ public class PaperWorldConfig {
@ -28,7 +28,7 @@ index a80d8b2a..32ca0a40 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/EntityVillager.java b/src/main/java/net/minecraft/server/EntityVillager.java
-index ae68f07a..35221dec 100644
+index ae68f07ab..35221decf 100644
 --- a/src/main/java/net/minecraft/server/EntityVillager.java
 +++ b/src/main/java/net/minecraft/server/EntityVillager.java
@@ -767,7 +767,7 @@ public class EntityVillager extends EntityAgeable implements NPC, IMerchant {
@ -41,5 +41,5 @@ index ae68f07a..35221dec 100644
             if (blockposition != null) {
                 ItemStack itemstack = ItemWorldMap.a(world, (double) blockposition.getX(), (double) blockposition.getZ(), (byte) 2, true, true);
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0180-Optimize-ItemStack.isEmpty.patch
+++ b/Spigot-Server-Patches/0180-Optimize-ItemStack.isEmpty.patch
@ -1,4 +1,4 @@
-From e5dde989e3b6bf034318d920ed8ed37da169b2d9 Mon Sep 17 00:00:00 2001
+From 26b973aadf97eaaa7083ac46b35ae44ad3737f9b Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 21 Dec 2016 03:48:29 -0500
 Subject: [PATCH] Optimize ItemStack.isEmpty()
@ -6,7 +6,7 @@ Subject: [PATCH] Optimize ItemStack.isEmpty()
 Remove hashMap lookup every check, simplify code to remove ternary

 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 0dcea61d..3aefb023 100644
+index 0dcea61d2..3aefb023e 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -126,9 +126,15 @@ public final class ItemStack {
@ -27,5 +27,5 @@ index 0dcea61d..3aefb023 100644
     public static void a(DataConverterManager dataconvertermanager) {
         dataconvertermanager.a(DataConverterTypes.ITEM_INSTANCE, (DataInspector) (new DataInspectorBlockEntity()));
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0181-Add-API-methods-to-control-if-armour-stands-can-move.patch
+++ b/Spigot-Server-Patches/0181-Add-API-methods-to-control-if-armour-stands-can-move.patch
@ -1,11 +1,11 @@
-From 1deed3fc3cac67faa2ae6a5e5eff15e322ad50fd Mon Sep 17 00:00:00 2001
+From 478aa5503a8330df7b3f266a55185ef1477116d6 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:47:25 -0600
 Subject: [PATCH] Add API methods to control if armour stands can move


 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index b0324509..036498c0 100644
+index 5603a3746..fcbfcd6a9 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -50,6 +50,7 @@ public class EntityArmorStand extends EntityLiving {
@ -31,7 +31,7 @@ index b0324509..036498c0 100644
 +    // Paper end
 }
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
-index 2b66a08a..8a06cb16 100644
+index 2b66a08ad..8a06cb165 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftArmorStand.java
@@ -211,4 +211,14 @@ public class CraftArmorStand extends CraftLivingEntity implements ArmorStand {
@ -50,5 +50,5 @@ index 2b66a08a..8a06cb16 100644
 +    }
 }
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0182-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
+++ b/Spigot-Server-Patches/0182-Option-to-prevent-armor-stands-from-doing-entity-loo.patch
@ -1,4 +1,4 @@
-From db77a614e7f10100de64a1cc512a5d6a479bbb4d Mon Sep 17 00:00:00 2001
+From e8c8ed97ba71d78ae174cda9add33a9b3c491b03 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Wed, 21 Dec 2016 11:52:04 -0600
 Subject: [PATCH] Option to prevent armor stands from doing entity lookups
@ -19,7 +19,7 @@ index 32ca0a40e..70af657f5 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/World.java b/src/main/java/net/minecraft/server/World.java
-index 5bd721814..12938b9f8 100644
+index 843c944ab..30cf4a251 100644
 --- a/src/main/java/net/minecraft/server/World.java
 +++ b/src/main/java/net/minecraft/server/World.java
@@ -1337,6 +1337,7 @@ public abstract class World implements IBlockAccess {
@ -31,5 +31,5 @@ index 5bd721814..12938b9f8 100644
 
             for (int i = 0; i < list.size(); ++i) {
 -- 
-2.13.3.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0183-Add-option-to-remove-invalid-statistics.patch
+++ b/Spigot-Server-Patches/0183-Add-option-to-remove-invalid-statistics.patch
@ -1,11 +1,11 @@
-From 0669deb7227d69ad367ebeb8909d38276c5f26a3 Mon Sep 17 00:00:00 2001
+From b65841d8a709abafd2d9718ab97832770ab49ac2 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 20 Dec 2016 23:09:21 -0600
 Subject: [PATCH] Add option to remove invalid statistics


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index da0984a3..28917f63 100644
+index da0984a35..28917f63d 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -256,4 +256,13 @@ public class PaperConfig {
@ -23,7 +23,7 @@ index da0984a3..28917f63 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/ServerStatisticManager.java b/src/main/java/net/minecraft/server/ServerStatisticManager.java
-index 14af226f..e3d2c0ff 100644
+index 14af226f3..e3d2c0ff7 100644
 --- a/src/main/java/net/minecraft/server/ServerStatisticManager.java
 +++ b/src/main/java/net/minecraft/server/ServerStatisticManager.java
@@ -86,6 +86,7 @@ public class ServerStatisticManager extends StatisticManager {
@ -53,5 +53,5 @@ index 14af226f..e3d2c0ff 100644
         }
     }
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0184-IllegalPacketEvent.patch
+++ b/Spigot-Server-Patches/0184-IllegalPacketEvent.patch
@ -1,4 +1,4 @@
-From 5bea86c4a8652cb0ced1c338dae4141495bd9370 Mon Sep 17 00:00:00 2001
+From ff2be849ba11f9a48cf7c1f157cf31114231cb6f Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 23 Jun 2016 23:33:57 -0400
 Subject: [PATCH] IllegalPacketEvent
@ -6,7 +6,7 @@ Subject: [PATCH] IllegalPacketEvent
 Fired for invalid data from players that represents hacking attempts

 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 98a63dc0e..f82a81178 100644
+index 02b5e3cad..52e8458ab 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -56,6 +56,7 @@ import org.bukkit.inventory.CraftingInventory;
@ -68,5 +68,5 @@ index 98a63dc0e..f82a81178 100644
                     }
                     // CraftBukkit start
 -- 
-2.14.1
+2.14.2

--- a/Spigot-Server-Patches/0185-Properly-fix-item-duplication-bug.patch
+++ b/Spigot-Server-Patches/0185-Properly-fix-item-duplication-bug.patch
@ -1,4 +1,4 @@
-From 708d31da9dd0f79c0e0148ad106156691041b08a Mon Sep 17 00:00:00 2001
+From 2b98398add2b76cd4ee71f4f4733cf3fa8efdefa Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Tue, 27 Dec 2016 01:57:57 +0000
 Subject: [PATCH] Properly fix item duplication bug
@ -19,7 +19,7 @@ index 53147c6e2..5fbb99b7e 100644
 
     @Override
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index f82a81178..1dc9ddbb5 100644
+index 52e8458ab..bcc6c9707 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -2626,6 +2626,6 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -31,5 +31,5 @@ index f82a81178..1dc9ddbb5 100644
     }
 }
 -- 
-2.14.1
+2.14.2

--- a/Spigot-Server-Patches/0186-String-based-Action-Bar-API.patch
+++ b/Spigot-Server-Patches/0186-String-based-Action-Bar-API.patch
@ -1,4 +1,4 @@
-From 7a7a70f17bef67e3a2ef1aee652d0328cc38e8c8 Mon Sep 17 00:00:00 2001
+From 2a73ea267a6aa2b91a27fc0974decf7c14cca8e8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 15:02:42 -0500
 Subject: [PATCH] String based Action Bar API
@ -85,5 +85,5 @@ index 41330c2a2..f30613672 100644
     public void setPlayerListHeaderFooter(BaseComponent[] header, BaseComponent[] footer) {
         PacketPlayOutPlayerListHeaderFooter packet = new PacketPlayOutPlayerListHeaderFooter();
 -- 
-2.14.1
+2.14.2

--- a/Spigot-Server-Patches/0187-Activation-Range-Improvements.patch
+++ b/Spigot-Server-Patches/0187-Activation-Range-Improvements.patch
@ -1,4 +1,4 @@
-From 4f17df129d8d0f4f28ad092c8ca18517424aed37 Mon Sep 17 00:00:00 2001
+From 33f96c9d29daf8d704163555175bceb3bddb6d69 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 27 Dec 2016 22:38:06 -0500
 Subject: [PATCH] Activation Range Improvements
@ -6,7 +6,7 @@ Subject: [PATCH] Activation Range Improvements
 Fixes and adds new Immunities to improve gameplay behavior

 diff --git a/src/main/java/net/minecraft/server/EntityCreature.java b/src/main/java/net/minecraft/server/EntityCreature.java
-index 0c82c6f5..9659a45e 100644
+index 0c82c6f5b..9659a45ef 100644
 --- a/src/main/java/net/minecraft/server/EntityCreature.java
 +++ b/src/main/java/net/minecraft/server/EntityCreature.java
@@ -10,6 +10,7 @@ public abstract class EntityCreature extends EntityInsentient {
@ -18,7 +18,7 @@ index 0c82c6f5..9659a45e 100644
     private float b;
     private final float c;
 diff --git a/src/main/java/net/minecraft/server/EntityLiving.java b/src/main/java/net/minecraft/server/EntityLiving.java
-index e50f7a3c..194d55c3 100644
+index 3086a36f9..b437ebf26 100644
 --- a/src/main/java/net/minecraft/server/EntityLiving.java
 +++ b/src/main/java/net/minecraft/server/EntityLiving.java
@@ -73,7 +73,7 @@ public abstract class EntityLiving extends Entity {
@ -31,7 +31,7 @@ index e50f7a3c..194d55c3 100644
     protected int ticksFarFromPlayer;
     protected float aW;
 diff --git a/src/main/java/net/minecraft/server/EntityLlama.java b/src/main/java/net/minecraft/server/EntityLlama.java
-index dbda68dd..af49b727 100644
+index dbda68dd0..af49b7273 100644
 --- a/src/main/java/net/minecraft/server/EntityLlama.java
 +++ b/src/main/java/net/minecraft/server/EntityLlama.java
@@ -363,6 +363,7 @@ public class EntityLlama extends EntityHorseChestedAbstract implements IRangedEn
@ -43,7 +43,7 @@ index dbda68dd..af49b727 100644
         return this.bL != null;
     }
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoal.java b/src/main/java/net/minecraft/server/PathfinderGoal.java
-index 83d9c43f..1cb6652c 100644
+index 83d9c43f3..1cb6652c2 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoal.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoal.java
@@ -18,7 +18,10 @@ public abstract class PathfinderGoal {
@ -59,7 +59,7 @@ index 83d9c43f..1cb6652c 100644
     public void e() {}
 
 diff --git a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
-index e5b5e988..e3781f3a 100644
+index e5b5e9887..e3781f3a8 100644
 --- a/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
 +++ b/src/main/java/net/minecraft/server/PathfinderGoalGotoTarget.java
@@ -2,12 +2,21 @@ package net.minecraft.server;
@ -96,7 +96,7 @@ index e5b5e988..e3781f3a 100644
                         }
                     }
 diff --git a/src/main/java/org/spigotmc/ActivationRange.java b/src/main/java/org/spigotmc/ActivationRange.java
-index 47865c02..b0856461 100644
+index 47865c027..b08564618 100644
 --- a/src/main/java/org/spigotmc/ActivationRange.java
 +++ b/src/main/java/org/spigotmc/ActivationRange.java
@@ -20,6 +20,7 @@ import net.minecraft.server.EntityFireball;
@ -141,5 +141,5 @@ index 47865c02..b0856461 100644
             {
                 EntityAnimal animal = (EntityAnimal) entity;
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0188-Firework-API-s.patch
+++ b/Spigot-Server-Patches/0188-Firework-API-s.patch
@ -1,11 +1,11 @@
-From eec9365973ae5e3fde4b9a61cd2ea3b188ab20f9 Mon Sep 17 00:00:00 2001
+From 7638c8a37799c5840c91bad10444e8227b3f7fba Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 28 Dec 2016 01:18:33 -0500
 Subject: [PATCH] Firework API's


 diff --git a/src/main/java/net/minecraft/server/EntityFireworks.java b/src/main/java/net/minecraft/server/EntityFireworks.java
-index 48cdef5d..bd0ec95f 100644
+index 48cdef5db..bd0ec95f2 100644
 --- a/src/main/java/net/minecraft/server/EntityFireworks.java
 +++ b/src/main/java/net/minecraft/server/EntityFireworks.java
@@ -2,6 +2,8 @@ package net.minecraft.server;
@ -53,7 +53,7 @@ index 48cdef5d..bd0ec95f 100644
 
     public boolean bd() {
 diff --git a/src/main/java/net/minecraft/server/ItemFireworks.java b/src/main/java/net/minecraft/server/ItemFireworks.java
-index b0bb4aa2..44a99721 100644
+index b0bb4aa23..44a997215 100644
 --- a/src/main/java/net/minecraft/server/ItemFireworks.java
 +++ b/src/main/java/net/minecraft/server/ItemFireworks.java
@@ -9,6 +9,7 @@ public class ItemFireworks extends Item {
@ -73,7 +73,7 @@ index b0bb4aa2..44a99721 100644
                 if (!entityhuman.abilities.canInstantlyBuild) {
                     itemstack.subtract(1);
 diff --git a/src/main/java/net/minecraft/server/NBTTagCompound.java b/src/main/java/net/minecraft/server/NBTTagCompound.java
-index e15c2336..82c2537b 100644
+index e15c23367..82c2537b3 100644
 --- a/src/main/java/net/minecraft/server/NBTTagCompound.java
 +++ b/src/main/java/net/minecraft/server/NBTTagCompound.java
@@ -106,7 +106,7 @@ public class NBTTagCompound extends NBTBase {
@ -86,7 +86,7 @@ index e15c2336..82c2537b 100644
     }
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
-index 99746b3c..d4fbe31d 100644
+index 99746b3c2..d4fbe31d6 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftFirework.java
@@ -1,6 +1,7 @@
@ -129,5 +129,5 @@ index 99746b3c..d4fbe31d 100644
 +    // Paper end
 }
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0189-PlayerTeleportEndGatewayEvent.patch
+++ b/Spigot-Server-Patches/0189-PlayerTeleportEndGatewayEvent.patch
@ -1,4 +1,4 @@
-From 611173542ccfe256db8c7c694f65756b3ce582e0 Mon Sep 17 00:00:00 2001
+From 8af94befc901f7231aff3ae231dc24edc1efb011 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 31 Dec 2016 21:44:50 -0500
 Subject: [PATCH] PlayerTeleportEndGatewayEvent
@ -6,7 +6,7 @@ Subject: [PATCH] PlayerTeleportEndGatewayEvent
 Allows you to access the Gateway being used in a teleport event

 diff --git a/src/main/java/net/minecraft/server/TileEntityEndGateway.java b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
-index 9bde14d9..ab2cd176 100644
+index cfce9274a..ecbc48b0c 100644
 --- a/src/main/java/net/minecraft/server/TileEntityEndGateway.java
 +++ b/src/main/java/net/minecraft/server/TileEntityEndGateway.java
@@ -124,7 +124,7 @@ public class TileEntityEndGateway extends TileEntityEnderPortal implements ITick
@ -19,5 +19,5 @@ index 9bde14d9..ab2cd176 100644
                     if (teleEvent.isCancelled()) {
                         return;
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0190-ShulkerBox-Dupe-Prevention.patch
+++ b/Spigot-Server-Patches/0190-ShulkerBox-Dupe-Prevention.patch
@ -1,4 +1,4 @@
-From b5c690860be38f0bd135c1ee4d81b4cfee5470bd Mon Sep 17 00:00:00 2001
+From 26307196e5e2bd90c47e5bfaf53207645394b84d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 2 Jan 2017 16:32:56 -0500
 Subject: [PATCH] ShulkerBox Dupe Prevention
@ -7,7 +7,7 @@ This ensures that Shulker Boxes can never drop their contents twice, and
 that the inventory is cleared incase it some how also got saved to the world.

 diff --git a/src/main/java/net/minecraft/server/BlockShulkerBox.java b/src/main/java/net/minecraft/server/BlockShulkerBox.java
-index 8811eb3e..74e2e448 100644
+index 8811eb3e3..74e2e448f 100644
 --- a/src/main/java/net/minecraft/server/BlockShulkerBox.java
 +++ b/src/main/java/net/minecraft/server/BlockShulkerBox.java
@@ -112,6 +112,7 @@ public class BlockShulkerBox extends BlockTileEntity {
@ -19,5 +19,5 @@ index 8811eb3e..74e2e448 100644
 
             world.updateAdjacentComparators(blockposition, iblockdata.getBlock());
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0191-Provide-E-TE-Chunk-count-stat-methods.patch
+++ b/Spigot-Server-Patches/0191-Provide-E-TE-Chunk-count-stat-methods.patch
@ -1,4 +1,4 @@
-From 93739b3a2f79eea51937daf6631bb5b0760e7ea0 Mon Sep 17 00:00:00 2001
+From 966cd0280c47f9e6e0c4c587f0938e44002840e1 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:24:46 -0500
 Subject: [PATCH] Provide E/TE/Chunk count stat methods
@ -7,7 +7,7 @@ Provides counts without the ineffeciency of using .getEntities().size()
 which creates copy of the collections.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 416e86af..7ea64362 100644
+index 67cb2230b..00dd2976d 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -78,6 +78,29 @@ public class CraftWorld implements World {
@ -41,5 +41,5 @@ index 416e86af..7ea64362 100644
 
     public CraftWorld(WorldServer world, ChunkGenerator gen, Environment env) {
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0192-Enforce-Sync-Player-Saves.patch
+++ b/Spigot-Server-Patches/0192-Enforce-Sync-Player-Saves.patch
@ -1,4 +1,4 @@
-From 7c95b7c974a7cb9cf8bee918dd8b0e371c65856f Mon Sep 17 00:00:00 2001
+From 28c6896e630016522ca9be45820241542d22d62d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 15:41:58 -0500
 Subject: [PATCH] Enforce Sync Player Saves
@ -7,7 +7,7 @@ Saving players async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.

 diff --git a/src/main/java/net/minecraft/server/PlayerList.java b/src/main/java/net/minecraft/server/PlayerList.java
-index 73cf2e3d8..206068384 100644
+index 953e5f901..acec81a92 100644
 --- a/src/main/java/net/minecraft/server/PlayerList.java
 +++ b/src/main/java/net/minecraft/server/PlayerList.java
@@ -1243,6 +1243,7 @@ public abstract class PlayerList {
@ -27,5 +27,5 @@ index 73cf2e3d8..206068384 100644
     // Paper end
 
 -- 
-2.13.0
+2.14.2

--- a/Spigot-Server-Patches/0193-Enforce-Sync-Chunk-Unloads.patch
+++ b/Spigot-Server-Patches/0193-Enforce-Sync-Chunk-Unloads.patch
@ -1,4 +1,4 @@
-From 6e0cd666f07889663c8580bb0a8e3e3a2276937e Mon Sep 17 00:00:00 2001
+From e0ec8707f50d33935695640662191784cd43b345 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 Jan 2017 16:06:44 -0500
 Subject: [PATCH] Enforce Sync Chunk Unloads
@ -7,7 +7,7 @@ Unloading Chunks async is extremely dangerous. This will force it to main
 the same way we handle async chunk loads.

 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 7ea64362..a606f6ce 100644
+index 00dd2976d..1f37fa47e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -238,6 +238,7 @@ public class CraftWorld implements World {
@ -27,5 +27,5 @@ index 7ea64362..a606f6ce 100644
 
     public boolean regenerateChunk(int x, int z) {
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0194-Don-t-allow-entities-to-ride-themselves-572.patch
+++ b/Spigot-Server-Patches/0194-Don-t-allow-entities-to-ride-themselves-572.patch
@ -1,11 +1,11 @@
-From b2d462645494ca42d890cbf4d60a89e8112a33c7 Mon Sep 17 00:00:00 2001
+From 5871fd4ac3a324964d168dbd7803bb6370b9eda0 Mon Sep 17 00:00:00 2001
 From: Alfie Cleveland <alfeh@me.com>
 Date: Sun, 8 Jan 2017 04:31:36 +0000
 Subject: [PATCH] Don't allow entities to ride themselves - #572


 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 314d1df4..147f00fe 100644
+index e0ae1f7dd..b4318e4f7 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -1932,6 +1932,7 @@ public abstract class Entity implements ICommandListener {
@ -17,5 +17,5 @@ index 314d1df4..147f00fe 100644
             throw new IllegalStateException("Use x.startRiding(y), not y.addPassenger(x)");
         } else {
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0195-Fix-block-break-desync.patch
+++ b/Spigot-Server-Patches/0195-Fix-block-break-desync.patch
@ -1,11 +1,11 @@
-From cdcb9a66070a968b4d11d041b52e8f61c98e4f55 Mon Sep 17 00:00:00 2001
+From e681f1f46bb0f4af52cc431044b8c804f4b0d0b8 Mon Sep 17 00:00:00 2001
 From: Michael Himing <mhiming@gmail.com>
 Date: Sun, 8 Jan 2017 18:50:35 +1100
 Subject: [PATCH] Fix block break desync


 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index dd6cbe947..65b69574e 100644
+index bcc6c9707..751989f5a 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -868,6 +868,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -17,5 +17,5 @@ index dd6cbe947..65b69574e 100644
             } else if (blockposition.getY() >= this.minecraftServer.getMaxBuildHeight()) {
                 return;
 -- 
-2.14.1
+2.14.2

--- a/Spigot-Server-Patches/0196-Assign-the-World-in-WorldGenStronghold.patch
+++ b/Spigot-Server-Patches/0196-Assign-the-World-in-WorldGenStronghold.patch
@ -1,11 +1,11 @@
-From a1fd6bc296e1ae98223d0883f63e7eec6b96f1a1 Mon Sep 17 00:00:00 2001
+From 45c79ce60fe2ee66ce42a53b6ec1a24bd014fdbb Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 14 Jan 2017 01:22:07 -0600
 Subject: [PATCH] Assign the World in WorldGenStronghold


 diff --git a/src/main/java/net/minecraft/server/WorldGenStronghold.java b/src/main/java/net/minecraft/server/WorldGenStronghold.java
-index c9375470..a3b958e0 100644
+index c93754704..a3b958e01 100644
 --- a/src/main/java/net/minecraft/server/WorldGenStronghold.java
 +++ b/src/main/java/net/minecraft/server/WorldGenStronghold.java
@@ -56,6 +56,7 @@ public class WorldGenStronghold extends StructureGenerator {
@ -17,5 +17,5 @@ index c9375470..a3b958e0 100644
             this.c();
             this.b = true;
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0197-Add-fromBottle-flag-to-Experience-Orbs.patch
+++ b/Spigot-Server-Patches/0197-Add-fromBottle-flag-to-Experience-Orbs.patch
@ -1,11 +1,11 @@
-From 6bf0e558c5ce085401ad4b9fcfc09bcfb56ccd8f Mon Sep 17 00:00:00 2001
+From d6c8edab0e147098d8db6ac15bebbce4d9ef5b9f Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sat, 14 Jan 2017 16:15:26 -0600
 Subject: [PATCH] Add fromBottle flag to Experience Orbs


 diff --git a/src/main/java/net/minecraft/server/EntityExperienceOrb.java b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
-index ec23eb98..dab33b25 100644
+index ec23eb98c..dab33b25a 100644
 --- a/src/main/java/net/minecraft/server/EntityExperienceOrb.java
 +++ b/src/main/java/net/minecraft/server/EntityExperienceOrb.java
@@ -15,6 +15,14 @@ public class EntityExperienceOrb extends Entity {
@ -37,7 +37,7 @@ index ec23eb98..dab33b25 100644
         return false;
     }
 diff --git a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
-index 0255986f..28931295 100644
+index 0255986fd..289312950 100644
 --- a/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
 +++ b/src/main/java/net/minecraft/server/EntityThrownExpBottle.java
@@ -40,7 +40,7 @@ public class EntityThrownExpBottle extends EntityProjectile {
@ -50,7 +50,7 @@ index 0255986f..28931295 100644
 
             this.die();
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
-index 3a09cab3..61e3c6c3 100644
+index 3a09cab3d..61e3c6c3e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftExperienceOrb.java
@@ -18,6 +18,13 @@ public class CraftExperienceOrb extends CraftEntity implements ExperienceOrb {
@ -68,5 +68,5 @@ index 3a09cab3..61e3c6c3 100644
     public EntityExperienceOrb getHandle() {
         return (EntityExperienceOrb) entity;
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0198-Remove-the-Vanilla-Method-Profiler.patch
+++ b/Spigot-Server-Patches/0198-Remove-the-Vanilla-Method-Profiler.patch
@ -1,4 +1,4 @@
-From d0662dcab7314b3aa396ed533d59460ce144b153 Mon Sep 17 00:00:00 2001
+From 81ef5b2b4cecb9b4bbfe5bd8fa2fe473dfc9ab65 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 21 Jan 2017 08:00:33 +0100
 Subject: [PATCH] Remove the Vanilla Method Profiler
@ -84,5 +84,5 @@ index 480e2ca97..a76d50723 100644
     public static final class ProfilerInfo implements Comparable<MethodProfiler.ProfilerInfo> {
 
 -- 
-2.13.3.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0199-Cap-Entity-Collisions.patch
+++ b/Spigot-Server-Patches/0199-Cap-Entity-Collisions.patch
@ -1,4 +1,4 @@
-From 766b36dd128cf649b95adc019f16fad3fd2aa761 Mon Sep 17 00:00:00 2001
+From e94fb300d55b5e6c5fc12301b1d9833c1251a593 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 22 Jan 2017 18:07:56 -0500
 Subject: [PATCH] Cap Entity Collisions
@ -27,7 +27,7 @@ index 70af657f5..af953dda4 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 147f00fe8..d34ec4ff1 100644
+index b4318e4f7..d744477c9 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
@@ -169,6 +169,7 @@ public abstract class Entity implements ICommandListener {
@ -56,5 +56,5 @@ index b437ebf26..35e473a26 100644
                 this.C(entity);
             }
 -- 
-2.13.0
+2.14.2

--- a/Spigot-Server-Patches/0200-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
+++ b/Spigot-Server-Patches/0200-Do-not-allow-a-zero-max-height-in-BiomeJungle.patch
@ -1,11 +1,11 @@
-From 06e123778923dc16e27dd8d42f8a61f785f0dd7d Mon Sep 17 00:00:00 2001
+From 30fb8444934c9efb139a23e54c57dd0d05d5bf36 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Mon, 23 Jan 2017 15:10:25 -0600
 Subject: [PATCH] Do not allow a zero max height in BiomeJungle


 diff --git a/src/main/java/net/minecraft/server/BiomeJungle.java b/src/main/java/net/minecraft/server/BiomeJungle.java
-index 8f67cb36..8dc0b623 100644
+index 8f67cb36c..8dc0b6238 100644
 --- a/src/main/java/net/minecraft/server/BiomeJungle.java
 +++ b/src/main/java/net/minecraft/server/BiomeJungle.java
@@ -40,7 +40,11 @@ public class BiomeJungle extends BiomeBase {
@ -22,7 +22,7 @@ index 8f67cb36..8dc0b623 100644
         (new WorldGenMelon()).generate(world, random, blockposition.a(i, k, j));
         WorldGenVines worldgenvines = new WorldGenVines();
 diff --git a/src/main/java/net/minecraft/server/BlockPosition.java b/src/main/java/net/minecraft/server/BlockPosition.java
-index 6a0b3a62..38a7af58 100644
+index 6a0b3a62d..38a7af58c 100644
 --- a/src/main/java/net/minecraft/server/BlockPosition.java
 +++ b/src/main/java/net/minecraft/server/BlockPosition.java
@@ -42,6 +42,7 @@ public class BlockPosition extends BaseBlockPosition {
@ -34,5 +34,5 @@ index 6a0b3a62..38a7af58 100644
         return d0 == 0.0D && d1 == 0.0D && d2 == 0.0D ? this : new BlockPosition((double) this.getX() + d0, (double) this.getY() + d1, (double) this.getZ() + d2);
     }
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0201-Remove-CraftScheduler-Async-Task-Debugger.patch
+++ b/Spigot-Server-Patches/0201-Remove-CraftScheduler-Async-Task-Debugger.patch
@ -1,4 +1,4 @@
-From cf5f4d4909b05dd56c4e280828fd7990663998b3 Mon Sep 17 00:00:00 2001
+From 5c2cdd99564a0e4894ca0b76e97c09307c683567 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 00:04:04 -0500
 Subject: [PATCH] Remove CraftScheduler Async Task Debugger
@ -9,7 +9,7 @@ One report of a suspected memory leak with the system.
 This adds additional overhead to asynchronous task dispatching

 diff --git a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
-index e30cfb7b..448c27cc 100644
+index bce411288..e47f4cca2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
 +++ b/src/main/java/org/bukkit/craftbukkit/scheduler/CraftScheduler.java
@@ -80,8 +80,8 @@ public class CraftScheduler implements BukkitScheduler {
@ -58,5 +58,5 @@ index e30cfb7b..448c27cc 100644
 
     @Deprecated
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0202-Shame-on-you-Mojang.patch
+++ b/Spigot-Server-Patches/0202-Shame-on-you-Mojang.patch
@ -1,4 +1,4 @@
-From e6a0df56837d0047e48cdafe151bca094d389977 Mon Sep 17 00:00:00 2001
+From 8d0e4a252d430491007507e7c2dfe885d2d8024a Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 5 Feb 2017 19:17:28 -0500
 Subject: [PATCH] Shame on you Mojang
@ -12,7 +12,7 @@ This then triggers async chunk loads!
 What in the hell were you thinking?

 diff --git a/src/main/java/net/minecraft/server/BlockBeacon.java b/src/main/java/net/minecraft/server/BlockBeacon.java
-index f07ac018..21075974 100644
+index f07ac0186..21075974d 100644
 --- a/src/main/java/net/minecraft/server/BlockBeacon.java
 +++ b/src/main/java/net/minecraft/server/BlockBeacon.java
@@ -62,8 +62,8 @@ public class BlockBeacon extends BlockTileEntity {
@ -55,5 +55,5 @@ index f07ac018..21075974 100644
     }
 }
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0203-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
+++ b/Spigot-Server-Patches/0203-Make-targetSize-more-aggressive-in-the-chunk-unload-.patch
@ -1,11 +1,11 @@
-From 1605c8bc9c100986681de86c616968c0e689420e Mon Sep 17 00:00:00 2001
+From c210b1334ffc2e6972558b906a3ae7ef194dc5a4 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Tue, 7 Feb 2017 16:55:35 -0600
 Subject: [PATCH] Make targetSize more aggressive in the chunk unload queue


 diff --git a/src/main/java/net/minecraft/server/ChunkProviderServer.java b/src/main/java/net/minecraft/server/ChunkProviderServer.java
-index 9159ed02..e54f4f47 100644
+index 73554a518..2558ba8c3 100644
 --- a/src/main/java/net/minecraft/server/ChunkProviderServer.java
 +++ b/src/main/java/net/minecraft/server/ChunkProviderServer.java
@@ -325,7 +325,7 @@ public class ChunkProviderServer implements IChunkProvider {
@ -18,5 +18,5 @@ index 9159ed02..e54f4f47 100644
 
                 Iterator iterator = this.unloadQueue.iterator();
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0204-Do-not-let-armorstands-drown.patch
+++ b/Spigot-Server-Patches/0204-Do-not-let-armorstands-drown.patch
@ -1,11 +1,11 @@
-From 292babe90273d8107d09d1c0a3b331b616c67f58 Mon Sep 17 00:00:00 2001
+From ebcc56e4fd745a5aababc0303aebd049be413790 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 18 Feb 2017 19:29:58 -0600
 Subject: [PATCH] Do not let armorstands drown


 diff --git a/src/main/java/net/minecraft/server/EntityArmorStand.java b/src/main/java/net/minecraft/server/EntityArmorStand.java
-index 036498c09..f25ee9061 100644
+index fcbfcd6a9..7899324ed 100644
 --- a/src/main/java/net/minecraft/server/EntityArmorStand.java
 +++ b/src/main/java/net/minecraft/server/EntityArmorStand.java
@@ -772,5 +772,10 @@ public class EntityArmorStand extends EntityLiving {
@ -41,5 +41,5 @@ index 35e473a26..66b82bbfb 100644
                     if (this.getAirTicks() == -20) {
                         this.setAirTicks(0);
 -- 
-2.13.0
+2.14.2

--- a/Spigot-Server-Patches/0205-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
+++ b/Spigot-Server-Patches/0205-Fix-NFE-when-attempting-to-read-EMPTY-ItemStack.patch
@ -1,4 +1,4 @@
-From 8098d5fd980f97cb31ea4f8e4d30c0524a7b73cb Mon Sep 17 00:00:00 2001
+From ecf214d5296e6e15188e49b0511d750fd4f6c433 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Sun, 9 Apr 2017 23:50:15 -0700
 Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack
@ -6,7 +6,7 @@ Subject: [PATCH] Fix NFE when attempting to read EMPTY ItemStack
 Thanks @gabizou

 diff --git a/src/main/java/net/minecraft/server/ItemStack.java b/src/main/java/net/minecraft/server/ItemStack.java
-index 3aefb023..8c7f57bc 100644
+index 3aefb023e..8c7f57bc7 100644
 --- a/src/main/java/net/minecraft/server/ItemStack.java
 +++ b/src/main/java/net/minecraft/server/ItemStack.java
@@ -103,7 +103,7 @@ public final class ItemStack {
@ -19,5 +19,5 @@ index 3aefb023..8c7f57bc 100644
         // CraftBukkit start - Route through setData for filtering
         // this.damage = Math.max(0, nbttagcompound.getShort("Damage"));
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0206-Properly-handle-async-calls-to-restart-the-server.patch
+++ b/Spigot-Server-Patches/0206-Properly-handle-async-calls-to-restart-the-server.patch
@ -1,4 +1,4 @@
-From d57850c1c1fc99b04ae06c6720c10ec168bfbd67 Mon Sep 17 00:00:00 2001
+From c2307fa2a3c4d95037b7f4aba680079842fb6913 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Fri, 12 May 2017 23:34:11 -0500
 Subject: [PATCH] Properly handle async calls to restart the server
@ -30,7 +30,7 @@ will have plugins and worlds saving to the disk has a high potential to result
 in corruption/dataloss.

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 005e3449f..a4f44b39b 100644
+index 13c6b5ccd..908a5d273 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -71,6 +71,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -306,5 +306,5 @@ index 49768734d..d51636c8e 100644
     }
 }
 -- 
-2.13.3.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0207-Add-system-property-to-disable-book-size-limits.patch
+++ b/Spigot-Server-Patches/0207-Add-system-property-to-disable-book-size-limits.patch
@ -1,4 +1,4 @@
-From 73e0094ad1cd41089d16ffa3976d5aa1c71acc4e Mon Sep 17 00:00:00 2001
+From 7f9d61d370211a778162cdd1826cf0dc54c3437f Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sat, 13 May 2017 20:11:21 -0500
 Subject: [PATCH] Add system property to disable book size limits
@ -11,7 +11,7 @@ to make books with as much data as they want. Do not use this without
 limiting incoming data from packets in some other way.

 diff --git a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
-index 5d971f07..6a7d1034 100644
+index 5d971f07b..6a7d10344 100644
 --- a/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
 +++ b/src/main/java/org/bukkit/craftbukkit/inventory/CraftMetaBook.java
@@ -37,6 +37,7 @@ public class CraftMetaBook extends CraftMetaItem implements BookMeta {
@ -57,5 +57,5 @@ index 5d971f07..6a7d1034 100644
             }
 
 -- 
-2.13.1.windows.2
+2.14.2

--- a/Spigot-Server-Patches/0208-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
+++ b/Spigot-Server-Patches/0208-Add-option-to-make-parrots-stay-on-shoulders-despite.patch
@ -1,4 +1,4 @@
-From 87361eb607a71e11f1ae423d1848b24cb2d1a29a Mon Sep 17 00:00:00 2001
+From 7355a71bfae09f95306314f6191a65c0be0a71d0 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Tue, 16 May 2017 21:29:08 -0500
 Subject: [PATCH] Add option to make parrots stay on shoulders despite movement
@ -39,7 +39,7 @@ index 3cc13bdc4..a8f5117bc 100644
 
     }
 diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 65b69574e..5c8cd73ea 100644
+index 751989f5a..2b11f68f4 100644
 --- a/src/main/java/net/minecraft/server/PlayerConnection.java
 +++ b/src/main/java/net/minecraft/server/PlayerConnection.java
@@ -1509,6 +1509,13 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
@ -57,5 +57,5 @@ index 65b69574e..5c8cd73ea 100644
 
         case STOP_SNEAKING:
 -- 
-2.14.1
+2.14.2

--- a/Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch
+++ b/Spigot-Server-Patches/0209-Add-configuration-option-to-prevent-player-names-fro.patch
@ -1,4 +1,4 @@
-From b4f7fd881033978a4cf32a6d1c1f6170840ebdf7 Mon Sep 17 00:00:00 2001
+From 7562e2d3ed8337b1719e1657bc3aa47cb59fa525 Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Fri, 9 Jun 2017 07:24:34 -0700
 Subject: [PATCH] Add configuration option to prevent player names from being
@ -35,5 +35,5 @@ index 5bbb09c9d..5c36e7373 100644
     // Paper end
 }
 -- 
-2.14.1.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch
+++ b/Spigot-Server-Patches/0210-Use-TerminalConsoleAppender-for-console-improvements.patch
@ -1,4 +1,4 @@
-From 357c051b89138fb3d7ef74a0397852830ca9b69c Mon Sep 17 00:00:00 2001
+From 2d1ed0e054f43fe5f47c44baac200f17df5dc8c2 Mon Sep 17 00:00:00 2001
 From: Minecrell <dev@minecrell.net>
 Date: Fri, 9 Jun 2017 19:03:43 +0200
 Subject: [PATCH] Use TerminalConsoleAppender for console improvements
@ -633,5 +633,5 @@ index 5cee8f00e..08b6bb7f9 100644
             <AppenderRef ref="TerminalConsole" level="info"/>
         </Root>
 -- 
-2.14.1
+2.14.2

--- a/Spigot-Server-Patches/0211-provide-a-configurable-option-to-disable-creeper-lin.patch
+++ b/Spigot-Server-Patches/0211-provide-a-configurable-option-to-disable-creeper-lin.patch
@ -1,4 +1,4 @@
-From 7c3ffd3a5824fbccf2b98e41e73adfbb1d460b45 Mon Sep 17 00:00:00 2001
+From 5912a185958696e4222a37ad45e05a3b147f2f08 Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sun, 11 Jun 2017 21:01:18 +0100
 Subject: [PATCH] provide a configurable option to disable creeper lingering
@ -34,5 +34,5 @@ index 01e9ddc3d..b9580c65c 100644
 
             entityareaeffectcloud.setSource(this); // CraftBukkit
 -- 
-2.13.3.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0212-Item-canEntityPickup.patch
+++ b/Spigot-Server-Patches/0212-Item-canEntityPickup.patch
@ -1,4 +1,4 @@
-From 5af685a537a19865a59f78d62ce01c506f806ccd Mon Sep 17 00:00:00 2001
+From 3a72b4686dad77f25cc5390c94fc4610f571aad0 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Fri, 5 May 2017 03:57:17 -0500
 Subject: [PATCH] Item#canEntityPickup
@ -55,5 +55,5 @@ index a17a537d6..1df17f09b 100644
     public String toString() {
         return "CraftItem";
 -- 
-2.13.3
+2.14.2

--- a/Spigot-Server-Patches/0213-PlayerPickupItemEvent-setFlyAtPlayer.patch
+++ b/Spigot-Server-Patches/0213-PlayerPickupItemEvent-setFlyAtPlayer.patch
@ -1,4 +1,4 @@
-From 2f3f52a7ba8b8783d8d2e034b431cde5c3da87bb Mon Sep 17 00:00:00 2001
+From a110b0d8c776f31fcb06e03269cb7cf5cb2b89b5 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 7 May 2017 06:26:09 -0500
 Subject: [PATCH] PlayerPickupItemEvent#setFlyAtPlayer
@ -44,5 +44,5 @@ index 99dbb1393..ae4910b4b 100644
                     this.die();
                     itemstack.setCount(i);
 -- 
-2.13.3
+2.14.2

--- a/Spigot-Server-Patches/0214-PlayerAttemptPickupItemEvent.patch
+++ b/Spigot-Server-Patches/0214-PlayerAttemptPickupItemEvent.patch
@ -1,11 +1,11 @@
-From acb8885cb0b64c6a23c1a280e3c3273f59f94410 Mon Sep 17 00:00:00 2001
+From 5259d5af8c2d7a9357333588950b955ed4312eca Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 11 Jun 2017 16:30:30 -0500
 Subject: [PATCH] PlayerAttemptPickupItemEvent


 diff --git a/src/main/java/net/minecraft/server/EntityItem.java b/src/main/java/net/minecraft/server/EntityItem.java
-index fed1f4ab2..a580a5866 100644
+index ae4910b4b..b56d1a35e 100644
 --- a/src/main/java/net/minecraft/server/EntityItem.java
 +++ b/src/main/java/net/minecraft/server/EntityItem.java
@@ -8,6 +8,7 @@ import org.apache.logging.log4j.Logger;
@ -30,5 +30,5 @@ index fed1f4ab2..a580a5866 100644
             int canHold = entityhuman.inventory.canHold(itemstack);
             int remaining = i - canHold;
 -- 
-2.13.3
+2.14.2

--- a/Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch
+++ b/Spigot-Server-Patches/0215-Add-UnknownCommandEvent.patch
@ -1,4 +1,4 @@
-From 5d9e9c3c88db23fc1a46b0310f0ebf29901d8970 Mon Sep 17 00:00:00 2001
+From 5b2ed90994ae4807e6bebb72d1743bc11004989c Mon Sep 17 00:00:00 2001
 From: Sweepyoface <github@sweepy.pw>
 Date: Sat, 17 Jun 2017 18:48:21 -0400
 Subject: [PATCH] Add UnknownCommandEvent
@ -32,5 +32,5 @@ index cb4b78e0e..b42f4e9ee 100644
         // Spigot end
 
 -- 
-2.14.1.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch
+++ b/Spigot-Server-Patches/0216-Shoulder-Entities-Release-API.patch
@ -1,11 +1,11 @@
-From d233de90c6ccc3eefdc19e94caf44cffd8abd3a9 Mon Sep 17 00:00:00 2001
+From fd50e8c234f34928d2926eb6f8afb399d8846b27 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 15:18:30 -0400
 Subject: [PATCH] Shoulder Entities Release API


 diff --git a/src/main/java/net/minecraft/server/EntityHuman.java b/src/main/java/net/minecraft/server/EntityHuman.java
-index f5e25e63d..c74095554 100644
+index a8f5117bc..e9f48ecad 100644
 --- a/src/main/java/net/minecraft/server/EntityHuman.java
 +++ b/src/main/java/net/minecraft/server/EntityHuman.java
@@ -1717,21 +1717,48 @@ public abstract class EntityHuman extends EntityLiving {
@ -62,7 +62,7 @@ index f5e25e63d..c74095554 100644
     public abstract boolean isSpectator();
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
-index 25e1e5a3f..463dddc98 100644
+index 90df0ae1c..4cce0920e 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftHumanEntity.java
@@ -441,6 +441,32 @@ public class CraftHumanEntity extends CraftLivingEntity implements HumanEntity {
@ -99,5 +99,5 @@ index 25e1e5a3f..463dddc98 100644
     public org.bukkit.entity.Entity getShoulderEntityLeft() {
         if (!getHandle().getShoulderEntityLeft().isEmpty()) {
 -- 
-2.13.3
+2.14.2

--- a/Spigot-Server-Patches/0217-Profile-Lookup-Events.patch
+++ b/Spigot-Server-Patches/0217-Profile-Lookup-Events.patch
@ -1,4 +1,4 @@
-From a39ef5463e9991e0d4517352d0563ae6598e06d5 Mon Sep 17 00:00:00 2001
+From 56b9c394da0c9082dc598ea18fa2b9edf59e5e96 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 17 Jun 2017 17:00:32 -0400
 Subject: [PATCH] Profile Lookup Events
@ -7,7 +7,7 @@ Adds a Pre Lookup Event and a Post Lookup Event so that plugins may prefill in p
 profiles that had to be looked up.

 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ea2c57137..a2acf1b3e 100644
+index e8bddc171..0e255861d 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
@@ -1021,6 +1021,7 @@ public abstract class MinecraftServer implements ICommandListener, Runnable, IAs
@ -19,5 +19,5 @@ index ea2c57137..a2acf1b3e 100644
             final DedicatedServer dedicatedserver = new DedicatedServer(options, DataConverterRegistry.a(), yggdrasilauthenticationservice, minecraftsessionservice, gameprofilerepository, usercache);
 
 -- 
-2.13.3.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0218-Block-player-logins-during-server-shutdown.patch
+++ b/Spigot-Server-Patches/0218-Block-player-logins-during-server-shutdown.patch
@ -1,4 +1,4 @@
-From 22113031e03ae1a537f3b925401468157bde485c Mon Sep 17 00:00:00 2001
+From 8d44a70aa504dc035b022cef4c4866ae7c04a687 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 2 Jul 2017 21:35:56 -0500
 Subject: [PATCH] Block player logins during server shutdown
@ -22,5 +22,5 @@ index 2158fcd32..c5434e6ba 100644
             this.b();
         } else if (this.g == LoginListener.EnumProtocolState.DELAY_ACCEPT) {
 -- 
-2.13.3
+2.14.2

--- a/Spigot-Server-Patches/0219-Entity-fromMobSpawner.patch
+++ b/Spigot-Server-Patches/0219-Entity-fromMobSpawner.patch
@ -1,4 +1,4 @@
-From bc215bb3bae449d668c2a37c5739d6595919ec25 Mon Sep 17 00:00:00 2001
+From f18fa9055375d8a2c362a4a0f41ac414fe424279 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Sun, 18 Jun 2017 18:17:05 -0500
 Subject: [PATCH] Entity#fromMobSpawner()
@ -49,7 +49,7 @@ index 0562c6e34..06b064a78 100644
                         if ( entity.world.spigotConfig.nerfSpawnerMobs )
                         {
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
-index 437c3da11..0ada29f4f 100644
+index 9429ae1ab..248477661 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftEntity.java
@@ -788,5 +788,10 @@ public abstract class CraftEntity implements org.bukkit.entity.Entity {
@ -64,5 +64,5 @@ index 437c3da11..0ada29f4f 100644
     // Paper end
 }
 -- 
-2.13.4
+2.14.2

--- a/Spigot-Server-Patches/0220-Fix-Anvil-Level-sync-to-client.patch
+++ b/Spigot-Server-Patches/0220-Fix-Anvil-Level-sync-to-client.patch
@ -1,4 +1,4 @@
-From 284a9f0f38f2941e51414c9f3cbf537f340f4256 Mon Sep 17 00:00:00 2001
+From fb399ba3c219d0d63174c445afce0cbd4da3475c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 11 Jul 2017 23:17:57 -0400
 Subject: [PATCH] Fix Anvil Level sync to client
@ -10,7 +10,7 @@ Was done incorrectly and is now causing level desyncs to client.
 Always send current level to the client, and instead make setWindowProperty set the level.

 diff --git a/src/main/java/net/minecraft/server/ContainerAnvil.java b/src/main/java/net/minecraft/server/ContainerAnvil.java
-index 04f117ace..e3897a3f7 100644
+index 175753c5a..16ec67569 100644
 --- a/src/main/java/net/minecraft/server/ContainerAnvil.java
 +++ b/src/main/java/net/minecraft/server/ContainerAnvil.java
@@ -376,9 +376,9 @@ public class ContainerAnvil extends Container {
@ -26,7 +26,7 @@ index 04f117ace..e3897a3f7 100644
 
         this.lastLevelCost = this.levelCost;
 diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
-index 005c8a00b..c9a707e7e 100644
+index f30613672..6642001e7 100644
 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
 +++ b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
@@ -1282,6 +1282,11 @@ public class CraftPlayer extends CraftHumanEntity implements Player {
@ -42,5 +42,5 @@ index 005c8a00b..c9a707e7e 100644
         return true;
     }
 -- 
-2.13.3
+2.14.2

--- a/Spigot-Server-Patches/0221-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
+++ b/Spigot-Server-Patches/0221-Add-missing-coverages-for-getTileEntity-in-order-to-.patch
@ -1,4 +1,4 @@
-From 8b8ad3cdb51aaf4ba1ddaabbcc2042cb0a417857 Mon Sep 17 00:00:00 2001
+From bda3776e61c8f1859ad361f2a7a89d75c7971bff Mon Sep 17 00:00:00 2001
 From: Shane Freeder <theboyetronic@gmail.com>
 Date: Sat, 22 Jul 2017 15:22:59 +0100
 Subject: [PATCH] Add missing coverages for getTileEntity in order to attempt
@ -24,5 +24,5 @@ index 2ac5caaa4..c03be509f 100644
         return result;
     }
 -- 
-2.14.1
+2.14.2

--- a/Spigot-Server-Patches/0222-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch
+++ b/Spigot-Server-Patches/0222-Allow-Changing-of-Player-Sample-in-ServerListPingEve.patch
@ -1,4 +1,4 @@
-From 307a2e3cc7e023f101c020a6e9b74df70083e1bf Mon Sep 17 00:00:00 2001
+From 732782932a72f308e7271c035eaaf4a03ecdf9ce Mon Sep 17 00:00:00 2001
 From: willies952002 <admin@domnian.com>
 Date: Fri, 5 May 2017 18:59:22 -0400
 Subject: [PATCH] Allow Changing of Player Sample in ServerListPingEvent
@ -64,5 +64,5 @@ index 313bb0007..45d6984f7 100644
             playerSample.a(profiles.toArray(new GameProfile[profiles.size()]));
 
 -- 
-2.13.3.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0223-Improve-the-Saddle-API-for-Horses.patch
+++ b/Spigot-Server-Patches/0223-Improve-the-Saddle-API-for-Horses.patch
@ -1,4 +1,4 @@
-From d34fe4dbcbd8a661092351c2be434cbacd70e10e Mon Sep 17 00:00:00 2001
+From c4086c2d68e3524a7ab63dc946740925ac58ca3c Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 10 Dec 2016 16:24:06 -0500
 Subject: [PATCH] Improve the Saddle API for Horses
@ -83,5 +83,5 @@ index 000000000..615010c40
 +    }
 +}
 -- 
-2.13.3.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0224-Implement-ensureServerConversions-API.patch
+++ b/Spigot-Server-Patches/0224-Implement-ensureServerConversions-API.patch
@ -1,4 +1,4 @@
-From 70c9c339ad2d62a199d09706abb17f42e5f51a3c Mon Sep 17 00:00:00 2001
+From 7e748e9639b070df6acfe66f76e2b72dab3a4baf Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 22:43:12 -0400
 Subject: [PATCH] Implement ensureServerConversions API
@ -23,5 +23,5 @@ index 49ebad22e..eb6987338 100644
 +    // Paper end
 }
 -- 
-2.13.3.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0225-Implement-getI18NDisplayName.patch
+++ b/Spigot-Server-Patches/0225-Implement-getI18NDisplayName.patch
@ -1,4 +1,4 @@
-From 11d553a3a2d83a47dc49929978682109d43ecd97 Mon Sep 17 00:00:00 2001
+From 1039d73509176ddbdf74e2a946c27b175680fb9d Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 4 May 2016 23:59:38 -0400
 Subject: [PATCH] Implement getI18NDisplayName
@ -31,5 +31,5 @@ index eb6987338..c2f26577c 100644
     // Paper end
 }
 -- 
-2.14.1
+2.14.2

--- a/Spigot-Server-Patches/0226-GH-806-Respect-saving-disabled-before-unloading-all-.patch
+++ b/Spigot-Server-Patches/0226-GH-806-Respect-saving-disabled-before-unloading-all-.patch
@ -1,4 +1,4 @@
-From f67bc29fc988afd5221a35203c1ed6553b076ae9 Mon Sep 17 00:00:00 2001
+From f1b3a04ee35000049ad11a2c3cb107914f7582dd Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 27 Jul 2017 00:06:43 -0400
 Subject: [PATCH] GH-806: Respect saving disabled before unloading all chunks
@ -22,5 +22,5 @@ index 14ea89c91..08e0cdf6d 100644
             }
             } // Paper timing
 -- 
-2.13.3.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0227-ProfileWhitelistVerifyEvent.patch
+++ b/Spigot-Server-Patches/0227-ProfileWhitelistVerifyEvent.patch
@ -1,4 +1,4 @@
-From a45c6794444636e4c22d8aceabfc5131e49ab47a Mon Sep 17 00:00:00 2001
+From c78055b6f2994460aed039ab17c23a53df4ba435 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 3 Jul 2017 18:11:10 -0500
 Subject: [PATCH] ProfileWhitelistVerifyEvent
@ -48,5 +48,5 @@ index ebca377e5..c201e9cec 100644
     public boolean isOp(GameProfile gameprofile) {
         return this.operators.d(gameprofile) || this.server.R() && this.server.worlds.get(0).getWorldData().u() && this.server.Q().equalsIgnoreCase(gameprofile.getName()) || this.u; // CraftBukkit
 -- 
-2.13.3.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0228-Fix-this-stupid-bullshit.patch
+++ b/Spigot-Server-Patches/0228-Fix-this-stupid-bullshit.patch
@ -1,4 +1,4 @@
-From e5c42e6ed2f35ac31c40b422cd7a6a6b0ee8c999 Mon Sep 17 00:00:00 2001
+From f8e0a762773502754c1994b44909beccbfd1b4db Mon Sep 17 00:00:00 2001
 From: DemonWav <demonwav@gmail.com>
 Date: Sun, 6 Aug 2017 17:17:53 -0500
 Subject: [PATCH] Fix this stupid bullshit
@ -9,7 +9,7 @@ modified in order to prevent merge conflicts when Spigot changes/disables the wa
 and to provide some level of hint without being disruptive.

 diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
-index c9e8a8737..ae2c51f5d 100644
+index d3d848f8c..21628e196 100644
 --- a/src/main/java/org/bukkit/craftbukkit/Main.java
 +++ b/src/main/java/org/bukkit/craftbukkit/Main.java
@@ -209,10 +209,12 @@ public class Main {
@ -29,5 +29,5 @@ index c9e8a8737..ae2c51f5d 100644
                 }
 
 -- 
-2.14.1
+2.14.2

--- a/Spigot-Server-Patches/0229-Ocelot-despawns-should-honor-nametags-and-leash.patch
+++ b/Spigot-Server-Patches/0229-Ocelot-despawns-should-honor-nametags-and-leash.patch
@ -1,11 +1,11 @@
-From fff9aa7f3454f4c830481b7c206ec73af4ccf3d9 Mon Sep 17 00:00:00 2001
+From 7b1d1554b8d650b899c7a7ce9b9034644b611858 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:54:40 -0500
 Subject: [PATCH] Ocelot despawns should honor nametags and leash


 diff --git a/src/main/java/net/minecraft/server/EntityOcelot.java b/src/main/java/net/minecraft/server/EntityOcelot.java
-index 5a76821e..858bbef5 100644
+index 5a76821ea..858bbef5b 100644
 --- a/src/main/java/net/minecraft/server/EntityOcelot.java
 +++ b/src/main/java/net/minecraft/server/EntityOcelot.java
@@ -58,7 +58,7 @@ public class EntityOcelot extends EntityTameableAnimal {
@ -18,5 +18,5 @@ index 5a76821e..858bbef5 100644
 
     protected void initAttributes() {
 -- 
-2.11.0
+2.14.2

--- a/Spigot-Server-Patches/0230-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
+++ b/Spigot-Server-Patches/0230-Reset-spawner-timer-when-spawner-event-is-cancelled.patch
@ -1,4 +1,4 @@
-From cf0ed1a251680f2dfc1a50bc98978a395dc910d8 Mon Sep 17 00:00:00 2001
+From 886463be7f9b8db11b507becc9620e75dbc520d4 Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:45:19 -0500
 Subject: [PATCH] Reset spawner timer when spawner event is cancelled
@ -28,5 +28,5 @@ index 06b064a78..c29df55fa 100644
                 }
 
 -- 
-2.13.4
+2.14.2

--- a/Spigot-Server-Patches/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
+++ b/Spigot-Server-Patches/0231-MC-94186-Fix-dragon-egg-falling-in-lazy-chunks.patch
@ -1,4 +1,4 @@
-From 508f6e194029ca5a47d116688528c827c83dc8c7 Mon Sep 17 00:00:00 2001
+From 7d55175c4ac7f56aaf7118b64270dc86b7b75ba3 Mon Sep 17 00:00:00 2001
 From: Brokkonaut <hannos17@gmx.de>
 Date: Fri, 11 Aug 2017 03:29:26 +0200
 Subject: [PATCH] MC-94186 Fix dragon egg falling in lazy chunks
@ -8,7 +8,7 @@ Fixes falling dragon eggs in lazy chunks fall to the block below the last empty
 See also https://bugs.mojang.com/browse/MC-94186

 diff --git a/src/main/java/net/minecraft/server/BlockDragonEgg.java b/src/main/java/net/minecraft/server/BlockDragonEgg.java
-index ce186f8..291342c 100644
+index ce186f825..291342c90 100644
 --- a/src/main/java/net/minecraft/server/BlockDragonEgg.java
 +++ b/src/main/java/net/minecraft/server/BlockDragonEgg.java
@@ -44,7 +44,7 @@ public class BlockDragonEgg extends Block {
@ -21,5 +21,5 @@ index ce186f8..291342c 100644
             }
 
 -- 
-2.7.3.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0232-Fix-MC-117075-TE-Unload-Lag-Spike.patch
+++ b/Spigot-Server-Patches/0232-Fix-MC-117075-TE-Unload-Lag-Spike.patch
@ -1,4 +1,4 @@
-From cf26274e3d4eebb66781babe9364e228d1751371 Mon Sep 17 00:00:00 2001
+From 635b62974365f6ae0b039790b1725092c4508043 Mon Sep 17 00:00:00 2001
 From: mezz <tehgeek@gmail.com>
 Date: Wed, 9 Aug 2017 17:51:22 -0500
 Subject: [PATCH] Fix MC-117075: TE Unload Lag Spike
@ -34,5 +34,5 @@ index 30cf4a251..f690aaa10 100644
             this.tileEntityListUnload.clear();
         }
 -- 
-2.14.1
+2.14.2

--- a/Spigot-Server-Patches/0233-Allow-specifying-a-custom-authentication-servers-dow.patch
+++ b/Spigot-Server-Patches/0233-Allow-specifying-a-custom-authentication-servers-dow.patch
@ -1,4 +1,4 @@
-From 6a2d8a485c793db1a77da15bb41fc961568cd0ce Mon Sep 17 00:00:00 2001
+From e6cb0d297e7d941474c2bcc879adedbd5f5786ee Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Thu, 17 Aug 2017 16:08:20 -0700
 Subject: [PATCH] Allow specifying a custom "authentication servers down" kick
@ -6,7 +6,7 @@ Subject: [PATCH] Allow specifying a custom "authentication servers down" kick


 diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java
-index f4b23703..f5cb9799 100644
+index f4b237034..f5cb9799b 100644
 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java
 +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java
@@ -1,5 +1,6 @@
@ -27,7 +27,7 @@ index f4b23703..f5cb9799 100644
 +    }
 }
 diff --git a/src/main/java/net/minecraft/server/LoginListener.java b/src/main/java/net/minecraft/server/LoginListener.java
-index c5434e6b..75df9283 100644
+index c5434e6ba..75df92836 100644
 --- a/src/main/java/net/minecraft/server/LoginListener.java
 +++ b/src/main/java/net/minecraft/server/LoginListener.java
@@ -250,6 +250,10 @@ public class LoginListener implements PacketLoginInListener, ITickable {
@ -42,5 +42,5 @@ index c5434e6b..75df9283 100644
                             LoginListener.c.error("Couldn\'t verify username because servers are unavailable");
                         }
 -- 
-2.14.1
+2.14.2

--- a/Spigot-Server-Patches/0234-LivingEntity-setKiller.patch
+++ b/Spigot-Server-Patches/0234-LivingEntity-setKiller.patch
@ -1,4 +1,4 @@
-From 2b31d6190696de739cbbf6f5450d4fb2d3cc4117 Mon Sep 17 00:00:00 2001
+From e1494a3b11e1ee5bf25e227cb8a7118234101ffd Mon Sep 17 00:00:00 2001
 From: BillyGalbreath <Blake.Galbreath@GMail.com>
 Date: Mon, 31 Jul 2017 01:49:48 -0500
 Subject: [PATCH] LivingEntity#setKiller
@ -26,5 +26,5 @@ index 1eafdecb4..f81622a34 100644
         return addPotionEffect(effect, false);
     }
 -- 
-2.14.1.windows.1
+2.14.2

--- a/Spigot-Server-Patches/0235-Avoid-NPE-during-CraftBlockEntityState-load.patch
+++ b/Spigot-Server-Patches/0235-Avoid-NPE-during-CraftBlockEntityState-load.patch
@ -1,4 +1,4 @@
-From 220e3ea760acbe9b80893c45b55012089f55cc60 Mon Sep 17 00:00:00 2001
+From 4172ca19330956828839f51a3fb94d2e7c8ddcef Mon Sep 17 00:00:00 2001
 From: kashike <kashike@vq.lc>
 Date: Mon, 18 Sep 2017 13:38:40 -0700
 Subject: [PATCH] Avoid NPE during CraftBlockEntityState load
@ -38,5 +38,5 @@ index 266f87d7f..22dcaea72 100644
     }
 
 -- 
-2.14.1
+2.14.2

--- a/Spigot-Server-Patches/0236-Anti-Xray.patch
+++ b/Spigot-Server-Patches/0236-Anti-Xray.patch
--- a/scripts/importmcdev.sh
+++ b/scripts/importmcdev.sh
@ -60,6 +60,7 @@ import ControllerJump
 import DataBits
 import DataConverterMaterialId
 import DataInspectorBlockEntity
+import DataPalette
 import DefinedStructure
 import EntityLlama
 import EULA
@ -75,6 +76,7 @@ import NBTTagCompound
 import NBTTagList
 import PersistentScoreboard
 import PacketPlayInUseEntity
+import PacketPlayOutMapChunk
 import PacketPlayOutPlayerListHeaderFooter
 import PacketPlayOutScoreboardTeam
 import PacketPlayOutTitle
@ -87,6 +89,7 @@ import PathfinderWater
 import PersistentVillage
 import PlayerConnectionUtils
 import RegionFile
+import RegistryBlockID
 import RemoteControlListener
 import TileEntityEnderChest
 import TileEntityLootable