Update from upstream SpigotMC

a3168ab2ce4
9b45d9fa8d3
b43a31a5c25
a926b96d5d1
d6b5ba7ca03
bb782d07aed
5a74d55c678
47b1dff3e68 [M]

Bukkit-Patches/0013-Expand-Boolean-Prompt-Values.patch

@@ -0,0 +1,28 @@
+From e4e404f5b4be5017b2ded1163d757defc333f510 Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Sat, 3 Aug 2013 19:42:16 +1000
+Subject: [PATCH] Expand Boolean Prompt Values
+
+
+diff --git a/src/main/java/org/bukkit/conversations/BooleanPrompt.java b/src/main/java/org/bukkit/conversations/BooleanPrompt.java
+index 3f2c97f..81ef78c 100644
+--- a/src/main/java/org/bukkit/conversations/BooleanPrompt.java
++++ b/src/main/java/org/bukkit/conversations/BooleanPrompt.java
+@@ -15,12 +15,13 @@ public abstract class BooleanPrompt extends ValidatingPrompt{
+ 
+     @Override
+     protected boolean isInputValid(ConversationContext context, String input) {
+-        String[] accepted = {"true", "false", "on", "off", "yes", "no"};
++        String[] accepted = {"true", "false", "on", "off", "yes", "no" /* Spigot: */, "y", "n", "1", "0", "right", "wrong", "correct", "incorrect", "valid", "invalid"}; // Spigot
+         return ArrayUtils.contains(accepted, input.toLowerCase());
+     }
+ 
+     @Override
+     protected Prompt acceptValidatedInput(ConversationContext context, String input) {
++        if (input.equalsIgnoreCase("y") || input.equals("1") || input.equalsIgnoreCase("right") || input.equalsIgnoreCase("correct") || input.equalsIgnoreCase("valid")) input = "true"; // Spigot
+         return acceptValidatedInput(context, BooleanUtils.toBoolean(input));
+     }
+ 
+-- 
+2.1.0
+