SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Brettflan 2011-06-27 03:06:09 -05:00
parent 7ae130a1b1
commit a7676429fe
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/org/mcteam/factions/Conf.java
View File

@ -43,7 +43,6 @@ public class Conf {
public static boolean CanLeaveWithNegativePower = true; public static boolean CanLeaveWithNegativePower = true;
// Configuration on the Faction tag in chat messages. // Configuration on the Faction tag in chat messages.
public static boolean preloadChatPlugins = true;
public static boolean chatTagEnabled = true; public static boolean chatTagEnabled = true;
public static transient boolean chatTagHandledByAnotherPlugin = false; public static transient boolean chatTagHandledByAnotherPlugin = false;
public static boolean chatTagRelationColored = true; public static boolean chatTagRelationColored = true;

19
src/org/mcteam/factions/Factions.java
View File

@ -118,14 +118,7 @@ public class Factions extends JavaPlugin {
setupPermissions(); setupPermissions();
// preload some chat plugins if they're on the server to prevent potential conflicts // preload could apparently cause issues; removed since "softdepend" is now available
// probably no longer necessary with softdepend list added to plugin.yml, but...
if (Conf.preloadChatPlugins) {
preloadPlugin("Essentials");
preloadPlugin("EssentialsChat");
preloadPlugin("HeroChat");
preloadPlugin("iChat");
}
// Register events // Register events
PluginManager pm = this.getServer().getPluginManager(); PluginManager pm = this.getServer().getPluginManager();
@ -184,16 +177,6 @@ public class Factions extends JavaPlugin {
Factions.log("Permission system not detected, defaulting to OP"); 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 // Functions for other plugins to hook into