SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Upstream merge

Browse Source 
By: md_5 <md_5@live.com.au>
This commit is contained in:
Spigot
2013-08-07 17:16:57 +10:00
parent fe5a2d46bd
commit 3eb0f032f0
13 changed files with 48 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Bukkit-Patches/0015-Catch-Conversation-API-Errors.patch
View File

@@ -1,14 +1,14 @@
From 516fc890c3adab13a5432549d0767f07849c4611 Mon Sep 17 00:00:00 2001
From fb52162279c4bf3d6c38cf9f731e60addeffb073 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
index a30745f..55c9785 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 {
@@ -193,6 +193,7 @@ public class Conversation {
* @param input The user's chat text.
*/
public void acceptInput(String input) {
@@ -16,7 +16,7 @@ index 43cc362..219e13e 100644
if (currentPrompt != null) {
// Echo the user's input
@@ -200,6 +201,12 @@ public class Conversation {
@@ -212,6 +213,12 @@ public class Conversation {
currentPrompt = currentPrompt.acceptInput(context, input);
outputNextPrompt();
}