diff --git a/Bukkit-Patches/0031-Skip-loading-of-plugins-which-are-not-1.8-compatible.patch b/Bukkit-Patches/0031-Skip-loading-of-plugins-which-are-not-1.8-compatible.patch deleted file mode 100644 index 1da81ef4..00000000 --- a/Bukkit-Patches/0031-Skip-loading-of-plugins-which-are-not-1.8-compatible.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 83e927d3f63812b935f753935940351b16b9ba34 Mon Sep 17 00:00:00 2001 -From: md_5 -Date: Mon, 1 Sep 2014 19:36:20 +1000 -Subject: [PATCH] Skip loading of plugins which are not 1.8 compatible. - -As they do not work with Spigot 1.8 builds! - -diff --git a/src/main/java/org/bukkit/plugin/SimplePluginManager.java b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -index 1d51908..b3002e8 100644 ---- a/src/main/java/org/bukkit/plugin/SimplePluginManager.java -+++ b/src/main/java/org/bukkit/plugin/SimplePluginManager.java -@@ -132,6 +132,13 @@ public final class SimplePluginManager implements PluginManager { - try { - description = loader.getPluginDescription(file); - String name = description.getName(); -+ // Spigot Start -+ if ( name.equalsIgnoreCase( "Orebfuscator" ) ) -+ { -+ server.getLogger().log( Level.WARNING, "Skipping loading of Orebfuscator as it does not work with Spigot 1.8 builds!" ); -+ continue; -+ } -+ // Spigot End - if (name.equalsIgnoreCase("bukkit") || name.equalsIgnoreCase("minecraft") || name.equalsIgnoreCase("mojang")) { - server.getLogger().log(Level.SEVERE, "Could not load '" + file.getPath() + "' in folder '" + directory.getPath() + "': Restricted Name"); - continue; --- -2.1.0 -