19972e09b8
5a0150f586ed3eb15fe6f1f596d1a5a7d806f0f9 Fix ITEM_BREAK e6a3911057bd94d8bd7021cbb4923fb84fb106d1 Upstream merge d1cdcf8d4c3639f956474f02ed662517cffbe23e Remove old patch 068df64aeee368377e1673667bffc7a6dcf90554 Rebuild all patches
31 lines
1.3 KiB
Diff
31 lines
1.3 KiB
Diff
From 12b7c52f44eefe1abc525c1075c83fca7e66107a 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
|
|
|