From 3682e8ba3a399e214e612025c212dba749415595 Mon Sep 17 00:00:00 2001 From: md_5 Date: Sun, 28 Apr 2013 17:45:25 +1000 Subject: [PATCH] Catch throwable not exception for enabling plugins --- .../main/java/net/md_5/bungee/api/plugin/PluginManager.java | 4 ++-- proxy/src/main/java/net/md_5/bungee/UserConnection.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java index c2e3289f..99d8758c 100644 --- a/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java +++ b/api/src/main/java/net/md_5/bungee/api/plugin/PluginManager.java @@ -199,9 +199,9 @@ public class PluginManager { plugin.getDescription().getName(), plugin.getDescription().getVersion(), plugin.getDescription().getAuthor() } ); - } catch ( Exception ex ) + } catch ( Throwable t ) { - ProxyServer.getInstance().getLogger().log( Level.WARNING, "Exception encountered when loading plugin: " + plugin.getDescription().getName(), ex ); + ProxyServer.getInstance().getLogger().log( Level.WARNING, "Exception encountered when loading plugin: " + plugin.getDescription().getName(), t ); status = false; } } diff --git a/proxy/src/main/java/net/md_5/bungee/UserConnection.java b/proxy/src/main/java/net/md_5/bungee/UserConnection.java index dffba90b..1d2f990b 100644 --- a/proxy/src/main/java/net/md_5/bungee/UserConnection.java +++ b/proxy/src/main/java/net/md_5/bungee/UserConnection.java @@ -14,7 +14,6 @@ import java.util.Collections; import java.util.HashSet; import java.util.Objects; import java.util.logging.Level; -import lombok.AccessLevel; import lombok.Getter; import lombok.NonNull; import lombok.RequiredArgsConstructor;