From a7676429fee1a3ad455acdee868e406fd0225134 Mon Sep 17 00:00:00 2001 From: Brettflan Date: Mon, 27 Jun 2011 03:06:09 -0500 Subject: [PATCH] removed "preloadChatPlugins" option and related code, since that method could cause problems and since we've switched to using softdepend in the plugin.yml for preloading plugins --- src/org/mcteam/factions/Conf.java | 1 - src/org/mcteam/factions/Factions.java | 19 +------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/src/org/mcteam/factions/Conf.java b/src/org/mcteam/factions/Conf.java index e79525c5..68758e5d 100644 --- a/src/org/mcteam/factions/Conf.java +++ b/src/org/mcteam/factions/Conf.java @@ -43,7 +43,6 @@ public class Conf { public static boolean CanLeaveWithNegativePower = true; // Configuration on the Faction tag in chat messages. - public static boolean preloadChatPlugins = true; public static boolean chatTagEnabled = true; public static transient boolean chatTagHandledByAnotherPlugin = false; public static boolean chatTagRelationColored = true; diff --git a/src/org/mcteam/factions/Factions.java b/src/org/mcteam/factions/Factions.java index c1a1b125..d7441c7f 100644 --- a/src/org/mcteam/factions/Factions.java +++ b/src/org/mcteam/factions/Factions.java @@ -118,14 +118,7 @@ public class Factions extends JavaPlugin { setupPermissions(); - // preload some chat plugins if they're on the server to prevent potential conflicts - // probably no longer necessary with softdepend list added to plugin.yml, but... - if (Conf.preloadChatPlugins) { - preloadPlugin("Essentials"); - preloadPlugin("EssentialsChat"); - preloadPlugin("HeroChat"); - preloadPlugin("iChat"); - } + // preload could apparently cause issues; removed since "softdepend" is now available // Register events PluginManager pm = this.getServer().getPluginManager(); @@ -184,16 +177,6 @@ public class Factions extends JavaPlugin { Factions.log("Permission system not detected, defaulting to OP"); } } - - private void preloadPlugin(String pluginName) { - PluginManager pm = this.getServer().getPluginManager(); - Plugin prePlug = pm.getPlugin(pluginName); - - if (prePlug != null && !pm.isPluginEnabled(prePlug)) { - Factions.log("Preloading \"" + pluginName + "\" plugin to prevent conflicts."); - pm.enablePlugin(prePlug); - } - } // -------------------------------------------- // // Functions for other plugins to hook into