Merge branch 'master' into pre/1.12

Spigot-Server-Patches/0214-Workaround-for-jansi-bug-with-Windows.patch

@@ -0,0 +1,29 @@
+From 7515b0a14c40747bdfd29e56590134b090e76521 Mon Sep 17 00:00:00 2001
+From: Shane Freeder <theboyetronic@gmail.com>
+Date: Wed, 17 May 2017 17:45:19 -0500
+Subject: [PATCH] Workaround for jansi bug with Windows
+
+When jansi attempts to extract its natives, by default it tries to extract a specific version
+using the loading class's implementation version. Normally this works completely fine
+however when on Windows certain characters such as - and : can trigger special behaviour.
+
+Furthermore this behaviour only occurs in specific combinations due to the parsing done by jansi.
+For example test-test works fine, but test-test-test does not! In order to avoid this all together but
+still keep our versions the same as they were, we set the override property to the essentially garbage version
+Paper. This version is only used when extracting the libraries to their temp folder.
+
+diff --git a/src/main/java/org/bukkit/craftbukkit/Main.java b/src/main/java/org/bukkit/craftbukkit/Main.java
+index dab983481..20902dc38 100644
+--- a/src/main/java/org/bukkit/craftbukkit/Main.java
++++ b/src/main/java/org/bukkit/craftbukkit/Main.java
+@@ -182,6 +182,7 @@ public class Main {
+                 }
+ 
+                 if (useJline) {
++                    System.setProperty( "library.jansi.version", "Paper" ); // Paper - set jansi library version to avoid crash
+                     AnsiConsole.systemInstall();
+                 } else {
+                     // This ensures the terminal literal will always match the jline implementation
+-- 
+2.13.0
+

work/Paperclip

@@ -1 +1 @@
-Subproject commit 13d77aaa277e3fb68fc0227d52e38e9226ca30c5
+Subproject commit 6dcb3241ca8e69fb8209e54fea507425c508915e