From 77c74e10ac515e439cf7199b0811ded977fa1570 Mon Sep 17 00:00:00 2001 From: DroppingAnvil Date: Thu, 17 Oct 2019 13:00:00 -0500 Subject: [PATCH] Adds ability to turn off dependency checks in conf.json --- .../java/com/massivecraft/factions/Conf.java | 3 ++- .../massivecraft/factions/FactionsPlugin.java | 25 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java index 19e68985..738d7475 100644 --- a/src/main/java/com/massivecraft/factions/Conf.java +++ b/src/main/java/com/massivecraft/factions/Conf.java @@ -226,7 +226,8 @@ public class Conf { /// Useful for HCF features. /// public static Set territoryBypassProtectedMaterials = EnumSet.noneOf(Material.class); - + // Dependency check + public static boolean dependencyCheck = true; // Economy settings public static boolean econEnabled = false; public static String econUniverseAccount = ""; diff --git a/src/main/java/com/massivecraft/factions/FactionsPlugin.java b/src/main/java/com/massivecraft/factions/FactionsPlugin.java index 28c857b5..50f99d66 100755 --- a/src/main/java/com/massivecraft/factions/FactionsPlugin.java +++ b/src/main/java/com/massivecraft/factions/FactionsPlugin.java @@ -168,18 +168,6 @@ public class FactionsPlugin extends MPlugin { mc114 = true; break; } - //Dependency checks - if (Bukkit.getPluginManager().isPluginEnabled("Vault") && Bukkit.getPluginManager().isPluginEnabled("Essentials")) { - RegisteredServiceProvider rsp = FactionsPlugin.this.getServer().getServicesManager().getRegistration(Economy.class); - FactionsPlugin.econ = rsp.getProvider(); - } else { - divider(); - System.out.println("You are missing dependencies!"); - System.out.println("Please verify EssentialsX and Vault are installed!"); - Bukkit.getPluginManager().disablePlugin(instance); - divider(); - return; - } migrateFPlayerLeaders(); log("==== End Setup ===="); @@ -194,7 +182,18 @@ public class FactionsPlugin extends MPlugin { } //Attempt to generate a permission list PermissionList.generateFile(); - + //Dependency checks + if (Conf.dependencyCheck && (Bukkit.getPluginManager().isPluginEnabled("Vault") && Bukkit.getPluginManager().isPluginEnabled("Essentials"))) { + RegisteredServiceProvider rsp = FactionsPlugin.this.getServer().getServicesManager().getRegistration(Economy.class); + FactionsPlugin.econ = rsp.getProvider(); + } else if (Conf.dependencyCheck) { + divider(); + System.out.println("You are missing dependencies!"); + System.out.println("Please verify EssentialsX and Vault are installed!"); + Bukkit.getPluginManager().disablePlugin(instance); + divider(); + return; + } // Load Conf from disk Conf.load(); com.massivecraft.factions.integration.Essentials.setup();