Upstream merge + remove 3 pulled patches.

By: md_5 <md_5@live.com.au>
2013-09-12 10:17:46 +10:00
parent 70387ed9d8
commit 754e2b5680
28 changed files with 42 additions and 231 deletions
--- a/Bukkit-Patches/0014-Catch-Conversation-API-Errors.patch
+++ b/Bukkit-Patches/0014-Catch-Conversation-API-Errors.patch
@@ -0,0 +1,34 @@
+From 8c044d475e5ebdf5ad41667d3db04a03cf4dc33f Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Mon, 22 Jul 2013 19:09:43 +1000
+Subject: [PATCH] Catch Conversation API Errors
+
+
+diff --git a/src/main/java/org/bukkit/conversations/Conversation.java b/src/main/java/org/bukkit/conversations/Conversation.java
+index a30745f..55c9785 100644
+--- a/src/main/java/org/bukkit/conversations/Conversation.java
+++ b/src/main/java/org/bukkit/conversations/Conversation.java
+@@ -193,6 +193,7 @@ public class Conversation {
+      * @param input The user's chat text.
+      */
+     public void acceptInput(String input) {
+        try { // Spigot
+         if (currentPrompt != null) {
+ 
+             // Echo the user's input
+@@ -212,6 +213,12 @@ public class Conversation {
+             currentPrompt = currentPrompt.acceptInput(context, input);
+             outputNextPrompt();
+         }
+        // Spigot Start
+        } catch ( Throwable t )
+        {
+            org.bukkit.Bukkit.getLogger().log( java.util.logging.Level.SEVERE, "Error handling conversation prompt", t );
+        }
+        // Spigot End
+     }
+ 
+     /**
+-- 
+1.8.1.2
+