testserver/Spigot-API-Patches/0014-Automatically-disable-...

25 lines
1.1 KiB
Diff
Raw Normal View History

2016-02-29 23:09:49 +00:00
From 9003dd80621ac325f76aab4af72047c9da57f691 Mon Sep 17 00:00:00 2001
From: Aikar <aikar@aikar.co>
2016-02-29 23:09:49 +00:00
Date: Mon, 29 Feb 2016 19:45:21 -0600
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-02-29 23:09:49 +00:00
index 4983ea8..93a43dd 100644
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
@@ -332,6 +332,10 @@ public final class JavaPluginLoader implements PluginLoader {
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
+ disablePlugin(jPlugin);
+ return;
2016-02-29 23:09:49 +00:00
+ // Paper end
}
// Perhaps abort here, rather than continue going, but as it stands,
--
2016-02-29 23:09:49 +00:00
2.7.2