Update upstream and rebuild

Spigot-Server-Patches/0142-Improve-Minecraft-Hopper-Performance.patch

@@ -1,4 +1,4 @@
-From 10404e39ecb0b6f8c7218d9fd77f2a961bf0b29e Mon Sep 17 00:00:00 2001
+From ca73b2a000c37d9a4ce86949248160dbf9d2864e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Wed, 27 Apr 2016 22:09:52 -0400
 Subject: [PATCH] Improve Minecraft Hopper Performance

Spigot-Server-Patches/0142-Reimplement-PlayerEditBookEvent.patch

@@ -1,61 +0,0 @@
-From ee9f584a42f7ea0a771c35d252472f2fe8d66250 Mon Sep 17 00:00:00 2001
-From: willies952002 <admin@domnian.com>
-Date: Sat, 23 Apr 2016 19:51:19 -0400
-Subject: [PATCH] Reimplement PlayerEditBookEvent
-
-
-diff --git a/src/main/java/net/minecraft/server/PlayerConnection.java b/src/main/java/net/minecraft/server/PlayerConnection.java
-index 58b8468..2ce8aa9 100644
---- a/src/main/java/net/minecraft/server/PlayerConnection.java
-+++ b/src/main/java/net/minecraft/server/PlayerConnection.java
-@@ -2226,9 +2226,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
- 
-                 if (itemstack.getItem() == Items.WRITABLE_BOOK && itemstack.getItem() == itemstack1.getItem()) {
-                     itemstack1.a("pages", (NBTBase) itemstack.getTag().getList("pages", 8));
-+                    CraftEventFactory.handleEditBookEvent(player, itemstack1); // Paper
-                 }
-             } catch (Exception exception) {
-                 PlayerConnection.LOGGER.error("Couldn\'t handle book info", exception);
-+                this.disconnect("Invalid Book Data!"); // Paper
-             }
-         } else {
-             String s1;
-@@ -2266,9 +2268,11 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
- 
-                         itemstack1.a("pages", (NBTBase) nbttaglist);
-                         itemstack1.setItem(Items.WRITTEN_BOOK);
-+                        CraftEventFactory.handleEditBookEvent(player, itemstack1); // Paper
-                     }
-                 } catch (Exception exception1) {
-                     PlayerConnection.LOGGER.error("Couldn\'t sign book", exception1);
-+                    this.disconnect("Invalid Book Data!"); // Paper
-                 }
-             } else if ("MC|TrSel".equals(s)) {
-                 try {
-@@ -2329,6 +2333,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-                         }
-                     } catch (Exception exception3) {
-                         PlayerConnection.LOGGER.error("Couldn\'t set command block", exception3);
-+                        this.disconnect("Invalid Command Block Data!"); // Paper
-                     }
-                 } else if ("MC|AutoCmd".equals(s)) {
-                     if (!this.minecraftServer.getEnableCommandBlock()) {
-@@ -2396,6 +2401,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-                         }
-                     } catch (Exception exception4) {
-                         PlayerConnection.LOGGER.error("Couldn\'t set command block", exception4);
-+                        this.disconnect("Invalid Command Block Data!"); // Paper
-                     }
-                 } else {
-                     int k;
-@@ -2419,6 +2425,7 @@ public class PlayerConnection implements PacketListenerPlayIn, ITickable {
-                                 }
-                             } catch (Exception exception5) {
-                                 PlayerConnection.LOGGER.error("Couldn\'t set beacon", exception5);
-+                                this.disconnect("Invalid Beacon Data!"); // Paper
-                             }
-                         }
-                     } else if ("MC|ItemName".equals(s)) {
--- 
-2.8.3
-

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

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

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

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

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

@@ -1,4 +1,4 @@
-From 744f82fb919157bf90a78cf709d2e8323562f2d1 Mon Sep 17 00:00:00 2001
+From e3ccecb266de8fc701d6946f7d1012de931daa5e Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 1 May 2016 21:19:14 -0400
 Subject: [PATCH] LootTable API & Replenishable Lootables Feature

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

@@ -1,4 +1,4 @@
-From 968f37aa591a3ac4374f281aa5ecda4ca6d93f6f Mon Sep 17 00:00:00 2001
+From 7d4fbadd98b52010c07a13459a2098cff7f64653 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 19 Jan 2016 00:13:19 -0500
 Subject: [PATCH] Do not load chunks for pathfinding

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

@@ -1,4 +1,4 @@
-From 4d16dd81b9eaf63162d0a661336c4e5afbab6655 Mon Sep 17 00:00:00 2001
+From 0d61161de989e9ae402bb65db3b7627e5f1f7891 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 17 Jun 2013 01:24:00 -0400
 Subject: [PATCH] Entity Tracking Improvements
@@ -7,7 +7,7 @@ If any part of a Vehicle/Passenger relationship is visible to a player,
 send all passenger/vehicles to the player in the chain.
 
 diff --git a/src/main/java/net/minecraft/server/Entity.java b/src/main/java/net/minecraft/server/Entity.java
-index 0dc482f..e4a8271 100644
+index b9d9fb9..ef97ad1 100644
 --- a/src/main/java/net/minecraft/server/Entity.java
 +++ b/src/main/java/net/minecraft/server/Entity.java
 @@ -51,6 +51,7 @@ public abstract class Entity implements ICommandListener {

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

@@ -1,4 +1,4 @@
-From 6cb0cf10c7d0ac3ff18fe0801358a1d02b1cb2f9 Mon Sep 17 00:00:00 2001
+From 100738e2b451b4d1384c81daf52e674f7b80ec08 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sat, 7 May 2016 23:33:08 -0400
 Subject: [PATCH] Don't save empty scoreboard teams to scoreboard.dat

Spigot-Server-Patches/0149-Do-not-mark-chunks-as-active-for-neighbor-updates.patch

@@ -1,4 +1,4 @@
-From 40c1a13e6e107f3e86878c30efc65f75fd71c8a4 Mon Sep 17 00:00:00 2001
+From fe26adfec4886a22df18f29de7fa1928c065e272 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 12 May 2016 01:55:17 -0400
 Subject: [PATCH] Do not mark chunks as active for neighbor updates

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

@@ -1,4 +1,4 @@
-From 25ce57966db2f0d986068b1a966c4d804de9dfaf Mon Sep 17 00:00:00 2001
+From 2e031f803a8039b4c3ba62f85988853f7bd60a85 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Thu, 12 May 2016 02:03:56 -0400
 Subject: [PATCH] Fix Chunk Unload Queue Issues

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

@@ -1,4 +1,4 @@
-From 0d3bf0df3f420a3ff39755db792a998c5dc4450e Mon Sep 17 00:00:00 2001
+From a7f1a05e083620acef98c593a7d516b9cc52c589 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Thu, 12 May 2016 23:02:58 -0500
 Subject: [PATCH] System property for disabling watchdoge

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

@@ -1,4 +1,4 @@
-From 91c9a0d66c1c833712818903da7ca39103a315b1 Mon Sep 17 00:00:00 2001
+From e00ebba7cf3c6ad7f03357cbccc091b92cbe9ed2 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 13 May 2016 01:38:06 -0400
 Subject: [PATCH] Optimize EAR

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

@@ -1,4 +1,4 @@
-From 4f45714f089f8ea9d03d37857b56eca95eb3a5be Mon Sep 17 00:00:00 2001
+From 4dd64f1d27d32eea15fd05b0ae20dbaec71d8bb3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 20:47:41 -0400
 Subject: [PATCH] Optimize UserCache / Thread Safe
@@ -10,7 +10,7 @@ Additionally, move Saving of the User cache to be done async, incase
 the user never changed the default setting for Spigot's save on stop only.
 
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index 6cc02d5..ebc4116 100644
+index de67aca..e52b433 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -504,7 +504,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

Spigot-Server-Patches/0154-MC-99914-ensure-EntityItem-loads-before-EntityPotion.patch

@@ -1,4 +1,4 @@
-From d9f34cd060344c711f49ab18aa2ceb2595ac1aa2 Mon Sep 17 00:00:00 2001
+From b71eefcde3fa9de4d762a716db55797bfb7dc8d6 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 22:54:36 -0400
 Subject: [PATCH] MC-99914 - ensure EntityItem loads before EntityPotion
@@ -17,7 +17,7 @@ index 234c547..691a78b 100644
          return false;
      }
 diff --git a/src/main/java/net/minecraft/server/MinecraftServer.java b/src/main/java/net/minecraft/server/MinecraftServer.java
-index ebc4116..38865e5 100644
+index e52b433..19757c5 100644
 --- a/src/main/java/net/minecraft/server/MinecraftServer.java
 +++ b/src/main/java/net/minecraft/server/MinecraftServer.java
 @@ -136,6 +136,7 @@ public abstract class MinecraftServer implements Runnable, ICommandListener, IAs

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

@@ -1,4 +1,4 @@
-From 157a90c294c10d13c2d7f42696ea4b051ba7aed7 Mon Sep 17 00:00:00 2001
+From da12f836d19ce7256e68799d21cd0b0fc541ad91 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Mon, 16 May 2016 23:19:16 -0400
 Subject: [PATCH] Avoid blocking on Network Manager creation

Spigot-Server-Patches/0156-Optional-old-TNT-cannon-behaviors.patch

@@ -1,4 +1,4 @@
-From 00bc53747f941816d2efa36de8e48ebeff52d4b0 Mon Sep 17 00:00:00 2001
+From 6eeca920de7374cfc679c530eda2858b90ba6258 Mon Sep 17 00:00:00 2001
 From: Zach Brown <zach.brown@destroystokyo.com>
 Date: Sun, 22 May 2016 20:20:55 -0500
 Subject: [PATCH] Optional old TNT cannon behaviors

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

@@ -1,4 +1,4 @@
-From 2ce7ab8e6ae1908987a71ac6afe4d35b1c75e356 Mon Sep 17 00:00:00 2001
+From 7338723eb8b80227c14882e153ec78a59e8d4fab Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Mon, 23 May 2016 12:12:37 +0200
 Subject: [PATCH] Faster redstone torch rapid clock removal

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

@@ -1,4 +1,4 @@
-From e048fd363663d1dc5720b0e4ba51524483d2ef34 Mon Sep 17 00:00:00 2001
+From 3b28d1e03f75f2bf512febe3010910c24c091167 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 27 May 2016 21:41:26 -0400
 Subject: [PATCH] Ensure Chunks never ever load async

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

@@ -1,4 +1,4 @@
-From 2cb0af5560d8daa6198867a6129a7777d60baffa Mon Sep 17 00:00:00 2001
+From c37e2e1bc634866542e6c39644c3299b29e91891 Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Sat, 28 May 2016 16:54:03 +0200
 Subject: [PATCH] Add server-name parameter

Spigot-Server-Patches/0160-Re-add-tileEntityTick.startTiming-Spigot-removed.patch

@@ -1,4 +1,4 @@
-From d30566fe997995453f1c440dce49b2320444ebe9 Mon Sep 17 00:00:00 2001
+From 97887d847a6c09b29387a3cb9c71ecfcfc9497b8 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Fri, 27 May 2016 22:06:35 -0400
 Subject: [PATCH] Re-add tileEntityTick.startTiming Spigot removed

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

@@ -1,4 +1,4 @@
-From 2c8633e5149ccc9a84ef9df29eb625f29c4bd4bf Mon Sep 17 00:00:00 2001
+From 9adcc89bfa5cf4efea4dbf29280ace24cd00cb83 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Tue, 31 May 2016 22:53:50 -0400
 Subject: [PATCH] Only send Dragon/Wither Death sounds to same world

Spigot-Server-Patches/0162-Fix-FallingBlocks-being-stuck-on-fences.patch

@@ -1,4 +1,4 @@
-From b1b3aa6f0d4cd08b022930a60c4607dfd6da1185 Mon Sep 17 00:00:00 2001
+From 3d720d62112f2489ff4026922f27b1597a4fbf7f Mon Sep 17 00:00:00 2001
 From: Martin Panzer <postremus1996@googlemail.com>
 Date: Fri, 3 Jun 2016 23:13:39 +0200
 Subject: [PATCH] Fix FallingBlocks being stuck on fences

work/CraftBukkit

@@ -1 +1 @@
-Subproject commit 10c10b3124020862b6e912c63938a337dda693fe
+Subproject commit d5ecbd0e93a7a22d3631541c258635fdcc42a489