Rx3/Factions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move economy plugin setup process over to the Econ class

Browse Source
This commit is contained in:
Brettflan 2011-08-08 04:51:06 -05:00
parent b45224fff0
commit 4e7aa893a3
2 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/com/massivecraft/factions/Econ.java
View File

@ -1,6 +1,7 @@
package com.massivecraft.factions; package com.massivecraft.factions;
import org.bukkit.event.Event; import org.bukkit.event.Event;
import org.bukkit.plugin.Plugin;
import com.massivecraft.factions.listeners.FactionsServerListener; import com.massivecraft.factions.listeners.FactionsServerListener;
@ -18,6 +19,25 @@ public class Econ {
Factions.instance.getServer().getPluginManager().registerEvent(Event.Type.PLUGIN_DISABLE, new FactionsServerListener(), Event.Priority.Monitor, Factions.instance); Factions.instance.getServer().getPluginManager().registerEvent(Event.Type.PLUGIN_DISABLE, new FactionsServerListener(), Event.Priority.Monitor, Factions.instance);
} }
public static void setup(Factions factions) {
if (enabled()) {
return;
}
if (!iConomyHooked()) {
Plugin plug = factions.getServer().getPluginManager().getPlugin("iConomy");
if (plug != null && plug.getClass().getName().equals("com.iConomy.iConomy") && plug.isEnabled()) {
iConomySet(true);
}
}
if (!essentialsEcoHooked()) {
Plugin plug = factions.getServer().getPluginManager().getPlugin("Essentials");
if (plug != null && plug.isEnabled()) {
essentialsEcoSet(true);
}
}
}
public static void iConomySet(boolean enable) { public static void iConomySet(boolean enable) {
iConomyUse = enable; iConomyUse = enable;
if (enable) { if (enable) {

26
src/com/massivecraft/factions/Factions.java
View File

@ -55,8 +55,8 @@ public class Factions extends JavaPlugin {
private final FactionsEntityListener entityListener = new FactionsEntityListener(); private final FactionsEntityListener entityListener = new FactionsEntityListener();
private final FactionsBlockListener blockListener = new FactionsBlockListener(); private final FactionsBlockListener blockListener = new FactionsBlockListener();
public static PermissionHandler Permissions; private static PermissionHandler Permissions;
public static EssentialsChat essChat; private static EssentialsChat essChat;
// Commands // Commands
public List<FBaseCommand> commands = new ArrayList<FBaseCommand>(); public List<FBaseCommand> commands = new ArrayList<FBaseCommand>();
@ -146,8 +146,7 @@ public class Factions extends JavaPlugin {
setupPermissions(); setupPermissions();
integrateEssentialsChat(); integrateEssentialsChat();
setupEcon(); Econ.setup(this);
Econ.monitorPlugins(); Econ.monitorPlugins();
// Register events // Register events
@ -214,25 +213,6 @@ public class Factions extends JavaPlugin {
} }
} }
private void setupEcon() {
if (Econ.enabled()) {
return;
}
if (!Econ.iConomyHooked()) {
Plugin plug = this.getServer().getPluginManager().getPlugin("iConomy");
if (plug != null && plug.getClass().getName().equals("com.iConomy.iConomy")) {
Econ.iConomySet(true);
}
}
if (!Econ.essentialsEcoHooked()) {
Plugin plug = this.getServer().getPluginManager().getPlugin("Essentials");
if (plug != null) {
Econ.essentialsEcoSet(true);
}
}
}
private void integrateEssentialsChat() { private void integrateEssentialsChat() {
if (essChat != null) { if (essChat != null) {
return; return;