2016-08-27 23:41:58 +00:00
|
|
|
From f57909e23aa879da0c747ea91b472cac307980d9 Mon Sep 17 00:00:00 2001
|
2016-02-13 23:28:15 +00:00
|
|
|
From: Aikar <aikar@aikar.co>
|
2016-02-29 23:09:49 +00:00
|
|
|
Date: Mon, 29 Feb 2016 19:45:21 -0600
|
2016-02-13 23:28:15 +00:00
|
|
|
Subject: [PATCH] Automatically disable plugins that fail to load
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
2016-08-27 23:41:58 +00:00
|
|
|
index 6b159ed..a0c98c7 100644
|
2016-02-13 23:28:15 +00:00
|
|
|
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
|
|
|
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
2016-08-27 23:41:58 +00:00
|
|
|
@@ -330,6 +330,10 @@ public final class JavaPluginLoader implements PluginLoader {
|
2016-02-13 23:28:15 +00:00
|
|
|
jPlugin.setEnabled(true);
|
|
|
|
} catch (Throwable ex) {
|
|
|
|
server.getLogger().log(Level.SEVERE, "Error occurred while enabling " + plugin.getDescription().getFullName() + " (Is it up to date?)", ex);
|
2016-02-29 23:09:49 +00:00
|
|
|
+ // Paper start - Disable plugins that fail to load
|
2016-02-13 23:28:15 +00:00
|
|
|
+ disablePlugin(jPlugin);
|
|
|
|
+ return;
|
2016-02-29 23:09:49 +00:00
|
|
|
+ // Paper end
|
2016-02-13 23:28:15 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
// Perhaps abort here, rather than continue going, but as it stands,
|
|
|
|
--
|
2016-08-27 23:41:58 +00:00
|
|
|
2.9.2.windows.1
|
2016-02-13 23:28:15 +00:00
|
|
|
|