Update from upstream SpigotMC

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

Bukkit-Patches/0016-Fix-Plugin-Message-API-Disconnects.patch

@@ -0,0 +1,30 @@
+From 769126463b7a3a296239b1109f4ce289125530f0 Mon Sep 17 00:00:00 2001
+From: md_5 <md_5@live.com.au>
+Date: Sat, 19 Oct 2013 12:59:42 +1100
+Subject: [PATCH] Fix Plugin Message API Disconnects
+
+
+diff --git a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
+index a906f8d..4c171e8 100644
+--- a/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
++++ b/src/main/java/org/bukkit/plugin/messaging/StandardMessenger.java
+@@ -421,7 +421,15 @@ public class StandardMessenger implements Messenger {
+         Set<PluginMessageListenerRegistration> registrations = getIncomingChannelRegistrations(channel);
+ 
+         for (PluginMessageListenerRegistration registration : registrations) {
+-            registration.getListener().onPluginMessageReceived(channel, source, message);
++            // Spigot Start
++            try
++            {
++                registration.getListener().onPluginMessageReceived( channel, source, message );
++            } catch ( Throwable t )
++            {
++                org.bukkit.Bukkit.getLogger().log( java.util.logging.Level.WARNING, "Could not pass incoming plugin message to " + registration.getPlugin(), t );
++            }
++            // Spigot End
+         }
+     }
+ 
+-- 
+2.1.0
+