Merge branch 'master' into pre/1.13

Spigot-API-Patches/0072-AsyncTabCompleteEvent.patch

@@ -1,4 +1,4 @@
-From 8bffb1aba48a936533d74a68f400ae6303304909 Mon Sep 17 00:00:00 2001
+From 87499be0ee0fda808bf4d85547ccf0ad8f979ba3 Mon Sep 17 00:00:00 2001
 From: Aikar <aikar@aikar.co>
 Date: Sun, 26 Nov 2017 13:17:09 -0500
 Subject: [PATCH] AsyncTabCompleteEvent
@@ -13,7 +13,7 @@ completion, such as offline players.
 
 diff --git a/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
 new file mode 100644
-index 00000000..3071320e
+index 000000000..3c51aaf92
 --- /dev/null
 +++ b/src/main/java/com/destroystokyo/paper/event/server/AsyncTabCompleteEvent.java
 @@ -0,0 +1,168 @@
@@ -154,7 +154,7 @@ index 00000000..3071320e
 +     * If true, the standard process of calling {@link Command#tabComplete(CommandSender, String, String[])}
 +     * or current player names will not be called.
 +     *
-+     * @param handled
++     * @param handled if this completion should be marked as being handled
 +     */
 +    public void setHandled(boolean handled) {
 +        this.handled = handled;
@@ -170,7 +170,7 @@ index 00000000..3071320e
 +
 +    /**
 +     * Will provide no completions, and will not fire the synchronous process
-+     * @param cancelled
++     * @param cancelled true if you wish to cancel this event
 +     */
 +    @Override
 +    public void setCancelled(boolean cancelled) {
@@ -186,7 +186,7 @@ index 00000000..3071320e
 +    }
 +}
 diff --git a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
-index a6229839..f0bc3563 100644
+index a6229839c..f0bc3563f 100644
 --- a/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
 +++ b/src/main/java/org/bukkit/event/server/TabCompleteEvent.java
 @@ -1,5 +1,6 @@