diff --git a/src/main/java/com/massivecraft/factions/SavageFactions.java b/src/main/java/com/massivecraft/factions/SavageFactions.java index ad5722c4..570efe4e 100644 --- a/src/main/java/com/massivecraft/factions/SavageFactions.java +++ b/src/main/java/com/massivecraft/factions/SavageFactions.java @@ -358,7 +358,7 @@ public class SavageFactions extends MPlugin { } } - private void changeItemIDSInConfig() { + public void changeItemIDSInConfig() { log("Starting conversion of legacy material in config to 1.13 materials."); replaceStringInConfig("fperm-gui.relation.materials.recruit", "WOOD_SWORD", "WOODEN_SWORD"); diff --git a/src/main/java/com/massivecraft/factions/cmd/CmdReload.java b/src/main/java/com/massivecraft/factions/cmd/CmdReload.java index 825794f6..f9ba777d 100644 --- a/src/main/java/com/massivecraft/factions/cmd/CmdReload.java +++ b/src/main/java/com/massivecraft/factions/cmd/CmdReload.java @@ -1,46 +1,48 @@ -package com.massivecraft.factions.cmd; - -import com.massivecraft.factions.Conf; -import com.massivecraft.factions.SavageFactions; -import com.massivecraft.factions.struct.Permission; -import com.massivecraft.factions.util.Particles.ReflectionUtils; -import com.massivecraft.factions.zcore.util.TL; - -public class CmdReload extends FCommand { - - public CmdReload() { - super(); - this.aliases.add("reload"); - - this.permission = Permission.RELOAD.node; - this.disableOnLock = false; - - senderMustBePlayer = false; - senderMustBeMember = false; - senderMustBeModerator = false; - senderMustBeColeader = false; - senderMustBeAdmin = false; - } - - @Override - public void perform() { - long timeInitStart = System.currentTimeMillis(); - Conf.load(); - SavageFactions.plugin.reloadConfig(); - SavageFactions.plugin.loadLang(); - int version = Integer.parseInt(ReflectionUtils.PackageType.getServerVersion().split("_")[1]); - - - if (SavageFactions.plugin.getConfig().getBoolean("enable-faction-flight")) { - SavageFactions.plugin.factionsFlight = true; - } - long timeReload = (System.currentTimeMillis() - timeInitStart); - - msg(TL.COMMAND_RELOAD_TIME, timeReload); - } - - @Override - public TL getUsageTranslation() { - return TL.COMMAND_RELOAD_DESCRIPTION; - } -} +package com.massivecraft.factions.cmd; + +import com.massivecraft.factions.Conf; +import com.massivecraft.factions.SavageFactions; +import com.massivecraft.factions.struct.Permission; +import com.massivecraft.factions.util.Particles.ReflectionUtils; +import com.massivecraft.factions.zcore.util.TL; + +public class CmdReload extends FCommand { + + public CmdReload() { + super(); + this.aliases.add("reload"); + + this.permission = Permission.RELOAD.node; + this.disableOnLock = false; + + senderMustBePlayer = false; + senderMustBeMember = false; + senderMustBeModerator = false; + senderMustBeColeader = false; + senderMustBeAdmin = false; + } + + @Override + public void perform() { + long timeInitStart = System.currentTimeMillis(); + Conf.load(); + Conf.save(); + SavageFactions.plugin.reloadConfig(); + SavageFactions.plugin.changeItemIDSInConfig(); + SavageFactions.plugin.loadLang(); + int version = Integer.parseInt(ReflectionUtils.PackageType.getServerVersion().split("_")[1]); + + + if (SavageFactions.plugin.getConfig().getBoolean("enable-faction-flight")) { + SavageFactions.plugin.factionsFlight = true; + } + long timeReload = (System.currentTimeMillis() - timeInitStart); + + msg(TL.COMMAND_RELOAD_TIME, timeReload); + } + + @Override + public TL getUsageTranslation() { + return TL.COMMAND_RELOAD_DESCRIPTION; + } +}