Update from upstream SpigotMC

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

Bukkit-Patches/0010-Added-getAllSessionData-to-the-Conversation-API.patch

@@ -0,0 +1,28 @@
+From 9259c4a3c94e32c00f8caf68c3efcdcd75e2e962 Mon Sep 17 00:00:00 2001
+From: Alex Bennett <alex.eugene.bennett@gmail.com>
+Date: Thu, 11 Jul 2013 15:31:32 -0500
+Subject: [PATCH] Added getAllSessionData() to the Conversation API.
+
+
+diff --git a/src/main/java/org/bukkit/conversations/ConversationContext.java b/src/main/java/org/bukkit/conversations/ConversationContext.java
+index 4f33ff4..7390a77 100644
+--- a/src/main/java/org/bukkit/conversations/ConversationContext.java
++++ b/src/main/java/org/bukkit/conversations/ConversationContext.java
+@@ -46,6 +46,14 @@ public class ConversationContext {
+     }
+ 
+     /**
++     * Gets the entire sessionData map.
++     * @return The full sessionData map.
++     */
++    public Map<Object, Object> getAllSessionData() {
++        return sessionData;
++    }
++
++    /**
+      * Gets session data shared between all {@link Prompt} invocations. Use
+      * this as a way to pass data through each Prompt as the conversation
+      * develops.
+-- 
+2.1.0
+