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

Fixed F Show & Made SaberFacs not Require Essentials

This commit is contained in:
Driftay 2020-01-18 02:33:01 -05:00
parent 2412931122
commit 25515d863e
3 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/massivecraft/factions/FactionsPlugin.java
View File

@ -69,7 +69,6 @@ public class FactionsPlugin extends MPlugin {
// Plugins can check this boolean while hooking in have // Plugins can check this boolean while hooking in have
// a green light to use the api. // a green light to use the api.
public static boolean startupFinished = false; public static boolean startupFinished = false;
public static Economy econ = null;
public boolean PlaceholderApi; public boolean PlaceholderApi;
// Commands // Commands
public FCmdRoot cmdBase; public FCmdRoot cmdBase;
@ -182,10 +181,10 @@ public class FactionsPlugin extends MPlugin {
Conf.load(); Conf.load();
fLogManager = new FLogManager(); fLogManager = new FLogManager();
//Dependency checks //Dependency checks
if (Conf.dependencyCheck && (!Bukkit.getPluginManager().isPluginEnabled("Vault") && !Bukkit.getPluginManager().isPluginEnabled("Essentials"))) { if (Conf.dependencyCheck && (!Bukkit.getPluginManager().isPluginEnabled("Vault"))) {
divider(); divider();
System.out.println("You are missing dependencies!"); System.out.println("You are missing dependencies!");
System.out.println("Please verify EssentialsX and Vault are installed!"); System.out.println("Please verify and Vault are installed!");
Conf.save(); Conf.save();
Bukkit.getPluginManager().disablePlugin(instance); Bukkit.getPluginManager().disablePlugin(instance);
divider(); divider();
@ -194,7 +193,6 @@ public class FactionsPlugin extends MPlugin {
//Update their config if needed //Update their config if needed
// Updater.updateIfNeeded(getConfig()); // Updater.updateIfNeeded(getConfig());
RegisteredServiceProvider<Economy> rsp = FactionsPlugin.this.getServer().getServicesManager().getRegistration(Economy.class); RegisteredServiceProvider<Economy> rsp = FactionsPlugin.this.getServer().getServicesManager().getRegistration(Economy.class);
FactionsPlugin.econ = rsp.getProvider();
com.massivecraft.factions.integration.Essentials.setup(); com.massivecraft.factions.integration.Essentials.setup();
hookedPlayervaults = setupPlayervaults(); hookedPlayervaults = setupPlayervaults();
FPlayers.getInstance().load(); FPlayers.getInstance().load();

2
src/main/java/com/massivecraft/factions/cmd/tnt/CmdTntFill.java
View File

@ -62,7 +62,7 @@ public class CmdTntFill extends FCommand {
context.msg(TL.COMMAND_TNT_POSITIVE); context.msg(TL.COMMAND_TNT_POSITIVE);
return; return;
} }
if (radius > FactionsPlugin.getInstance().getConfig().getInt("Tntfill.max-radius")) { if (radius > FactionsPlugin.getInstance().getConfig().getInt("Tntfill.max-radius")) {
context.msg(TL.COMMAND_TNTFILL_RADIUSMAX.toString().replace("{max}", FactionsPlugin.getInstance().getConfig().getInt("Tntfill.max-radius") + "")); context.msg(TL.COMMAND_TNTFILL_RADIUSMAX.toString().replace("{max}", FactionsPlugin.getInstance().getConfig().getInt("Tntfill.max-radius") + ""));
return; return;

26
src/main/resources/config.yml
View File

@ -276,19 +276,19 @@ hcf:
show: show:
# First line can be {header} for default header, or any string (we recommend &m for smooth lines ;plugin) # First line can be {header} for default header, or any string (we recommend &m for smooth lines ;plugin)
- '&8&m--------------&7 &8<&e{faction}&8> &8&m--------------' - '&8&m--------------&7 &8<&e{faction}&8> &8&m--------------'
- '&4&l* &cOwner: &f{leader}' - '&4* &cOwner: &f{leader}'
- '&4&l* &cDescription: &f{description}' - '&4* &cDescription: &f{description}'
- '&4&l* &cLand / Power / Max Power: &f{chunks} &8/ &f{power} &8/ &f{maxPower}' - '&4* &cLand / Power / Max Power: &f{chunks} &8/ &f{power} &8/ &f{maxPower}'
- '&4&l* &cFaction Strikes: &f{strikes}' - '&4* &cFaction Strikes: &f{strikes}'
- '&4&l* &cFaction Points: &f{faction-points}' - '&4* &cFaction Points: &f{faction-points}'
- '&4&l* &cFounded: &f{create-date}' - '&4* &cFounded: &f{create-date}'
- '&4&l* &cBalance: &f{faction-balance}' - '&4* &cBalance: &f{faction-balance}'
- '&4&l* &cAllies: &a{allies-list}' - '&4* &cAllies: &a{allies-list}'
- '&4&l* &cEnemies: &4{enemies-list}' - '&4* &cEnemies: &4{enemies-list}'
- '&4&l* &cOnline Members: &8[&f{online}/{members}&8] &a{online-list}' - '&4* &cOnline Members: &8[&f{online}/{members}&8] &a{online-list}'
- '&4&l* &cOffline Members: &8[&f{offline}/{members}&8] &a{offline-list}' - '&4* &cOffline Members: &8[&f{offline}/{members}&8] &a{offline-list}'
- '&4&l* &cAlts: &f{alts}' - '&4* &cAlts: &f{alts}'
- '&4&l* &cBans: &f{faction-bancount}' - '&4* &cBans: &f{faction-bancount}'
- '&8&m----------------------------------------' - '&8&m----------------------------------------'
# For a /f show that does not display fancy messages that are essentially empty, use minimal-show # For a /f show that does not display fancy messages that are essentially empty, use minimal-show
minimal-show: false minimal-show: false