2016-09-11 06:27:07 +02:00
|
|
|
From 90e6868ac669e61bc3b0e176b452181dcf078c2c Mon Sep 17 00:00:00 2001
|
2016-02-14 00:28:15 +01:00
|
|
|
From: Aikar <aikar@aikar.co>
|
2016-03-01 00:09:49 +01:00
|
|
|
Date: Mon, 29 Feb 2016 19:45:21 -0600
|
2016-02-14 00:28:15 +01: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-09-03 05:44:52 +02:00
|
|
|
index 759c461..d8b9c24 100644
|
2016-02-14 00:28:15 +01:00
|
|
|
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
|
|
|
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
2016-09-03 05:44:52 +02:00
|
|
|
@@ -329,6 +329,10 @@ public final class JavaPluginLoader implements PluginLoader {
|
2016-02-14 00:28:15 +01: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-03-01 00:09:49 +01:00
|
|
|
+ // Paper start - Disable plugins that fail to load
|
2016-02-14 00:28:15 +01:00
|
|
|
+ disablePlugin(jPlugin);
|
|
|
|
+ return;
|
2016-03-01 00:09:49 +01:00
|
|
|
+ // Paper end
|
2016-02-14 00:28:15 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
// Perhaps abort here, rather than continue going, but as it stands,
|
|
|
|
--
|
2016-09-11 06:27:07 +02:00
|
|
|
2.10.0.windows.1
|
2016-02-14 00:28:15 +01:00
|
|
|
|