mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-12 09:51:12 +01:00
22 lines
1.1 KiB
Diff
22 lines
1.1 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Aikar <aikar@aikar.co>
|
||
|
|
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
|
||
|
|
index cf2f517765d8f2a23cc4a17d9ee2dcd81f841b1b..2e306c7b984a02e12a74fac14589bf29ab6488bf 100644
|
||
|
|
--- a/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||
|
|
+++ b/src/main/java/org/bukkit/plugin/java/JavaPluginLoader.java
|
||
|
|
@@ -335,6 +335,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);
|
||
|
|
+ // Paper start - Disable plugins that fail to load
|
||
|
|
+ disablePlugin(jPlugin);
|
||
|
|
+ return;
|
||
|
|
+ // Paper end
|
||
|
|
}
|
||
|
|
|
||
|
|
// Perhaps abort here, rather than continue going, but as it stands,
|