From 755645cc239059254aeda9be9511656b5212d38a Mon Sep 17 00:00:00 2001
From: md_5 <md_5@live.com.au>
Date: Mon, 22 Jul 2013 19:10:02 +1000
Subject: [PATCH] Catch conversation API errors so that plugins don't silently
 malfunction.

---
 .../0015-Catch-Conversation-API-Errors.patch  | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)
 create mode 100644 Bukkit-Patches/0015-Catch-Conversation-API-Errors.patch

diff --git a/Bukkit-Patches/0015-Catch-Conversation-API-Errors.patch b/Bukkit-Patches/0015-Catch-Conversation-API-Errors.patch
new file mode 100644
index 0000000000..292132f687
--- /dev/null
+++ b/Bukkit-Patches/0015-Catch-Conversation-API-Errors.patch
@@ -0,0 +1,34 @@
+From 516fc890c3adab13a5432549d0767f07849c4611 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 43cc362..219e13e 100644
+--- a/src/main/java/org/bukkit/conversations/Conversation.java
++++ b/src/main/java/org/bukkit/conversations/Conversation.java
+@@ -181,6 +181,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
+@@ -200,6 +201,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
+