Starting Time Task for Shields

README.md

@@ -36,8 +36,8 @@ Moving forward we plan to take all suggestions into consideration, as they come
 We Plan on Releasing the latest and greatest factions/skyblock/prison plugins minecraft has to offer and wont settle for anything less
 
 ## Support
-Our Discord is Currently In Progress of a Massive Overhaul, but we still encourage our community to join and express any concerns/questions/suggestions they may have
+Our Discord is Currently In Progress of a Massive Overhaul, but we still encourage our community to join and express any concerns/questions/suggestions they may have!
-https://Discord.Saber.pw
+https://discord.gg/37JvmM
 
 Look forward to a bright future and a journey with all of you!
 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.massivecraft</groupId>
     <artifactId>Factions</artifactId>
-    <version>1.6.9.5-U0.2.1-2.2.3-STABLE</version>
+    <version>1.6.9.5-U0.2.1-2.0.6-STABLE</version>
     <packaging>jar</packaging>
 
     <name>SaberFactions</name>
@@ -41,10 +41,6 @@
                 <configuration>
                     <createDependencyReducedPom>false</createDependencyReducedPom>
                     <relocations>
-                        <relocation>
-                            <pattern>net.dv8tion</pattern>
-                            <shadedPattern>com.massivecraft.factions.shade.net.dv8tion</shadedPattern>
-                        </relocation>
                         <relocation>
                             <pattern>mkremins.fanciful</pattern>
                             <shadedPattern>com.massivecraft.factions.shade.mkremins.fanciful</shadedPattern>
@@ -105,7 +101,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.15.1-R0.1-SNAPSHOT</version>
+            <version>1.13-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>
@@ -391,6 +387,11 @@
             <version>1.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.codemc.worldguardwrapper</groupId>
+            <artifactId>worldguardwrapper</artifactId>
+            <version>1.1.6-SNAPSHOT</version>
+        </dependency>
         <dependency>
             <groupId>com.jagrosh</groupId>
             <artifactId>jda-utilities-commons</artifactId>

src/main/java/com/massivecraft/factions/Conf.java

@@ -1,7 +1,6 @@
 package com.massivecraft.factions;
 
 import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.massivecraft.factions.integration.dynmap.DynmapStyle;
 import com.massivecraft.factions.util.XMaterial;
 import com.massivecraft.factions.zcore.fperms.DefaultPermissions;
@@ -99,33 +98,12 @@ public class Conf {
     public static boolean autoLeaveDeleteFPlayerData = true; // Let them just remove player from Faction.
     public static boolean worldGuardChecking = false;
     public static boolean worldGuardBuildPriority = false;
-    public static boolean factionsDrainEnabled = false;
-
-    //AUDIT
-    public static boolean useAuditSystem = true;
-
     //DISCORD
     public static boolean useDiscordSystem = false;
     public static String discordBotToken = "<token here>";
     public static String fromDiscordFactionChatPrefix = "&f[&dDiscord&f] ";
     public static String avatarUrl = "http://cravatar.eu/helmavatar/%uuid%.png";
     public static String webhookName = "SaberFactions Hook";
-    public static String mainGuildID = "<Discord Server ID here>";
-    public static String positiveReaction = "<Server emote here>";
-    public static String negativeReaction = "<Server emote here>";
-    public static Boolean restrictActionsWhenNotLinked = false;
-    public static Boolean leaderRoles = false;
-    public static String leaderRole = "<Leader Role ID>";
-    public static Boolean factionDiscordTags = false;
-    public static String factionTag = "(NAME) [FACTION]";
-    public static Boolean factionRoles = false;
-    public static List<Integer> factionRoleColor = new ArrayList<Integer>(){{
-        add(25);
-        add(162);
-        add(203);
-    }};
-    public static String factionRolePrefix = "✦";
-    public static String factionRoleSuffix = "✦";
     // server logging options
     public static boolean logFactionCreate = true;
     public static boolean logFactionDisband = true;
@@ -137,7 +115,6 @@ public class Conf {
     public static boolean logMoneyTransactions = true;
     public static boolean logPlayerCommands = true;
     // prevent some potential exploits
-    public static boolean denyFlightIfInNoClaimingWorld = false;
     public static boolean preventCreeperGlitch = true;
     public static boolean handleExploitObsidianGenerators = true;
     public static boolean handleExploitEnderPearlClipping = true;
@@ -242,7 +219,6 @@ public class Conf {
     public static boolean ownedMessageInsideTerritory = true;
     public static boolean ownedMessageByChunk = false;
     public static boolean pistonProtectionThroughDenyBuild = true;
-    public static Set<Material> loggableMaterials = EnumSet.noneOf(Material.class);
     public static Set<Material> territoryProtectedMaterials = EnumSet.noneOf(Material.class);
     public static Set<Material> territoryDenyUsageMaterials = EnumSet.noneOf(Material.class);
     public static Set<Material> territoryProtectedMaterialsWhenOffline = EnumSet.noneOf(Material.class);
@@ -255,11 +231,6 @@ public class Conf {
     public static Set<Material> territoryBypassProtectedMaterials = EnumSet.noneOf(Material.class);
     // Dependency check
     public static boolean dependencyCheck = true;
-
-    public static Set<Material> territoryCancelAndAllowItemUseMaterial = new HashSet<>();
-    public static Set<Material> territoryDenySwitchMaterials = new HashSet<>();
-    public static boolean allowCreeperEggingChests = true;
-
     // Economy settings
     public static boolean econEnabled = false;
     public static String econUniverseAccount = "";
@@ -372,7 +343,6 @@ public class Conf {
     // faction-<factionId>
     public static int defaultMaxVaults = 0;
     public static boolean disableFlightOnFactionClaimChange = true;
-    public static boolean sendFactionChangeMessage = true;
 
     public static Backend backEnd = Backend.JSON;
 
@@ -418,108 +388,11 @@ public class Conf {
         territoryEnemyDenyCommands.add("tpaccept");
         territoryEnemyDenyCommands.add("tpa");
 
-        territoryDenySwitchMaterials.add(XMaterial.ACACIA_FENCE_GATE.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.BIRCH_FENCE_GATE.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_FENCE_GATE.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.JUNGLE_FENCE_GATE.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.OAK_FENCE_GATE.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.SPRUCE_FENCE_GATE.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.ACACIA_DOOR.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.BIRCH_DOOR.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_DOOR.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.JUNGLE_DOOR.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.OAK_DOOR.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.SPRUCE_DOOR.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.DISPENSER.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.CHEST.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.TRAPPED_CHEST.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.ACACIA_BUTTON.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.BIRCH_BUTTON.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_BUTTON.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.JUNGLE_BUTTON.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.OAK_BUTTON.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.SPRUCE_BUTTON.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.DROPPER.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.HOPPER.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.ITEM_FRAME.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.ACACIA_TRAPDOOR.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.BIRCH_TRAPDOOR.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_TRAPDOOR.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.JUNGLE_TRAPDOOR.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.OAK_TRAPDOOR.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.SPRUCE_TRAPDOOR.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.LEVER.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.COMPARATOR.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.REPEATER.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.ACACIA_BUTTON.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.BIRCH_BUTTON.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_BUTTON.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.JUNGLE_BUTTON.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.OAK_BUTTON.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.SPRUCE_BUTTON.parseMaterial());
-
-        territoryDenySwitchMaterials.add(XMaterial.PURPLE_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.WHITE_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.MAGENTA_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.LIGHT_BLUE_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.CYAN_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.BLUE_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.BROWN_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.ORANGE_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.GREEN_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.RED_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.BLACK_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.GRAY_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.LIME_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.LIGHT_GRAY_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.PINK_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.YELLOW_SHULKER_BOX.parseMaterial());
-        territoryDenySwitchMaterials.add(XMaterial.SHULKER_BOX.parseMaterial());
-
-        // 1.14 Barrel is a container.
-        territoryDenySwitchMaterials.add(XMaterial.BARREL.parseMaterial());
-
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.GOLDEN_APPLE.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.APPLE.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.ENCHANTED_GOLDEN_APPLE.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_BEEF.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_MUTTON.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_CHICKEN.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_COD.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_PORKCHOP.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_RABBIT.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_SALMON.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.ENDER_PEARL.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.POTION.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.SPLASH_POTION.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.CREEPER_SPAWN_EGG.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.BOW.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_HELMET.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_CHESTPLATE.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_LEGGINGS.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_BOOTS.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_HELMET.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_CHESTPLATE.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_LEGGINGS.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_BOOTS.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_HELMET.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_CHESTPLATE.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_LEGGINGS.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_BOOTS.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_HELMET.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_CHESTPLATE.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_LEGGINGS.parseMaterial());
-        territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_BOOTS.parseMaterial());
-
-
         /// TODO: Consider removing this in a future release, as permissions works just fine now
         territoryProtectedMaterials.add(Material.BEACON);
 
         // Config is not loading if value is empty ???
         territoryBypassProtectedMaterials.add(Material.COOKIE);
-        territoryBypassProtectedMaterials.add(Material.CHEST);
-        territoryBypassProtectedMaterials.add(Material.TRAPPED_CHEST);
-
 
         territoryDenyUsageMaterials.add(XMaterial.FIRE_CHARGE.parseMaterial());
         territoryDenyUsageMaterials.add(Material.FLINT_AND_STEEL);
@@ -558,14 +431,11 @@ public class Conf {
         safeZoneNerfedCreatureTypes.add(EntityType.ZOMBIE);
 
         // Is this called lazy load?
+        defaultFactionPermissions.put("LEADER", new DefaultPermissions(true));
         defaultFactionPermissions.put("COLEADER", new DefaultPermissions(true));
         defaultFactionPermissions.put("MODERATOR", new DefaultPermissions(true));
         defaultFactionPermissions.put("NORMAL MEMBER", new DefaultPermissions(false));
         defaultFactionPermissions.put("RECRUIT", new DefaultPermissions(false));
-        defaultFactionPermissions.put("ALLY", new DefaultPermissions(false));
-        defaultFactionPermissions.put("ENEMY", new DefaultPermissions(false));
-        defaultFactionPermissions.put("TRUCE", new DefaultPermissions(false));
-        defaultFactionPermissions.put("NEUTRAL", new DefaultPermissions(false));
     }
 
     public static void load() {
@@ -576,8 +446,6 @@ public class Conf {
         FactionsPlugin.getInstance().persist.save(i);
     }
 
-    public static void saveSync() { FactionsPlugin.instance.persist.saveSync(i); }
-
     public enum Backend {
         JSON,
         //MYSQL,  TODO add MySQL storage

src/main/java/com/massivecraft/factions/FLocation.java

@@ -70,8 +70,8 @@ public class FLocation implements Serializable {
         String worldName = string.substring(start, index);
         start = index + 1;
         index = string.indexOf(",", start);
-        int x = Integer.parseInt(string.substring(start, index));
+        int x = Integer.valueOf(string.substring(start, index));
-        int y = Integer.parseInt(string.substring(index + 1, string.length() - 1));
+        int y = Integer.valueOf(string.substring(index + 1, string.length() - 1));
         return new FLocation(worldName, x, y);
     }
 
@@ -152,8 +152,6 @@ public class FLocation implements Serializable {
         return "" + x + "," + z;
     }
 
-    public String formatXAndZ(String splitter) { return chunkToBlock(this.x) + "x" + splitter + " " + chunkToBlock(this.z) + "z"; }
-
     //----------------------------------------------//
     // Misc Geometry
     //----------------------------------------------//

src/main/java/com/massivecraft/factions/FPlayer.java

@@ -7,7 +7,6 @@ import com.massivecraft.factions.struct.Relation;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.util.WarmUpUtil;
 import mkremins.fanciful.FancyMessage;
-import net.dv8tion.jda.core.entities.User;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.command.CommandSender;
@@ -31,48 +30,6 @@ public interface FPlayer extends EconomyParticipator {
 
     boolean hasNotificationsEnabled();
 
-    /**
-     * Get if a player has setup their Discord before
-     * @return if the player setup Discord as a boolean
-     */
-    boolean discordSetup();
-
-    /**
-     * Get the players Discord user ID
-     * @return players Discord user ID as a String
-     */
-    String discordUserID();
-
-    /**
-     * Set the players Boolean defining if the player has setup their Discord
-     * @param b Boolean for discordSetup to be defined to
-     */
-    void setDiscordSetup(Boolean b);
-
-    /**
-     * Set the players Discord user ID
-     * @param s String for their user ID to be set to
-     */
-    void setDiscordUserID(String s);
-
-    /**
-     * Get the players Discord user (If the player has not setup Discord it will return null!)
-     * @return User from players set Discord User ID
-     */
-    User discordUser();
-
-    /**
-     * Used to check if this player should be served titles
-     * @return if this FPlayer has titles enabled as a boolean
-     */
-    boolean hasTitlesEnabled();
-
-    /**
-     * Used to set if player should be served titles
-     * @param b Boolean to titlesEnabled to
-     */
-    void setTitlesEnabled(Boolean b);
-
     /**
      * Used to determine if a player is in their faction's chest
      * @return if player is in their faction's as a boolean
@@ -261,7 +218,7 @@ public interface FPlayer extends EconomyParticipator {
 
     int getDeaths();
 
-    boolean takeMoney(int amt);
+    void takeMoney(int amt);
 
     boolean hasMoney(int amt);
 

src/main/java/com/massivecraft/factions/Faction.java

@@ -4,6 +4,7 @@ import com.massivecraft.factions.event.FactionDisbandEvent.PlayerDisbandReason;
 import com.massivecraft.factions.iface.EconomyParticipator;
 import com.massivecraft.factions.iface.RelationParticipator;
 import com.massivecraft.factions.missions.Mission;
+import com.massivecraft.factions.shield.TimeFrame;
 import com.massivecraft.factions.struct.BanInfo;
 import com.massivecraft.factions.struct.Relation;
 import com.massivecraft.factions.struct.Role;
@@ -441,4 +442,10 @@ public interface Faction extends EconomyParticipator {
 
     void paypalSet(String paypal);
 
+
+    // shield
+
+    void setTimeFrame(TimeFrame timeFrame);
+    TimeFrame getTimeFrame();
+
 }

src/main/java/com/massivecraft/factions/FactionsPlugin.java

@@ -8,19 +8,17 @@ import com.massivecraft.factions.cmd.CmdAutoHelp;
 import com.massivecraft.factions.cmd.CommandContext;
 import com.massivecraft.factions.cmd.FCmdRoot;
 import com.massivecraft.factions.cmd.FCommand;
-import com.massivecraft.factions.cmd.audit.FChestListener;
-import com.massivecraft.factions.cmd.audit.FLogManager;
-import com.massivecraft.factions.cmd.audit.FLogType;
 import com.massivecraft.factions.cmd.check.CheckTask;
 import com.massivecraft.factions.cmd.check.WeeWooTask;
 import com.massivecraft.factions.cmd.chest.AntiChestListener;
-import com.massivecraft.factions.discord.Discord;
 import com.massivecraft.factions.discord.DiscordListener;
+import com.massivecraft.factions.discord.FactionChatHandler;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.integration.Worldguard;
 import com.massivecraft.factions.integration.dynmap.EngineDynmap;
 import com.massivecraft.factions.listeners.*;
 import com.massivecraft.factions.missions.MissionHandler;
+import com.massivecraft.factions.shield.TimeFrameTask;
 import com.massivecraft.factions.shop.ShopConfig;
 import com.massivecraft.factions.struct.ChatMode;
 import com.massivecraft.factions.struct.Relation;
@@ -92,8 +90,6 @@ public class FactionsPlugin extends MPlugin {
     private boolean mvdwPlaceholderAPIManager = false;
     private Listener[] eventsListener;
     public List<String> itemList = getConfig().getStringList("fchest.Items-Not-Allowed");
-    private Worldguard wg;
-    private FLogManager fLogManager;
 
 
     public FactionsPlugin() {
@@ -188,7 +184,6 @@ public class FactionsPlugin extends MPlugin {
         PermissionList.generateFile();
         // Load Conf from disk
         Conf.load();
-        fLogManager = new FLogManager();
         //Dependency checks
         if (Conf.dependencyCheck && (!Bukkit.getPluginManager().isPluginEnabled("Vault") && !Bukkit.getPluginManager().isPluginEnabled("Essentials"))) {
             divider();
@@ -200,7 +195,7 @@ public class FactionsPlugin extends MPlugin {
             return;
         }
         //Update their config if needed
-       // Updater.updateIfNeeded(getConfig());
+        Updater.updateIfNeeded(getConfig());
         RegisteredServiceProvider<Economy> rsp = FactionsPlugin.this.getServer().getServicesManager().getRegistration(Economy.class);
         FactionsPlugin.econ = rsp.getProvider();
         com.massivecraft.factions.integration.Essentials.setup();
@@ -236,7 +231,9 @@ public class FactionsPlugin extends MPlugin {
         Econ.setup();
         setupPermissions();
 
-        if (Conf.worldGuardChecking || Conf.worldGuardBuildPriority) wg = new Worldguard();
+        if (Conf.worldGuardChecking || Conf.worldGuardBuildPriority) {
+            Worldguard.init(this);
+        }
 
         EngineDynmap.getInstance().init();
 
@@ -264,19 +261,22 @@ public class FactionsPlugin extends MPlugin {
         }
         if (Conf.useCheckSystem) {
             int minute = 1200;
-            this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 3), 0L, minute * 3);
+            this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 3), 0L, (long) (minute * 3));
-            this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 5), 0L, minute * 5);
+            this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 5), 0L, (long) (minute * 5));
-            this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 10), 0L, minute * 10);
+            this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 10), 0L, (long) (minute * 10));
-            this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 15), 0L, minute * 15);
+            this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 15), 0L, (long) (minute * 15));
-            this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 30), 0L, minute * 30);
+            this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 30), 0L, (long) (minute * 30));
             this.getServer().getScheduler().runTaskTimer(this, CheckTask::cleanupTask, 0L, 1200L);
             this.getServer().getScheduler().runTaskTimerAsynchronously(this, new WeeWooTask(this), 600L, 600L);
+            this.getServer().getScheduler().runTaskTimerAsynchronously(this, new TimeFrameTask(), 1200, 1200); // every 1 minute...
+        }
+        if(Conf.useDiscordSystem && !Conf.discordBotToken.equals("<token here>")) {
+            new FactionChatHandler(this);
+        } else {
+            System.out.println("\n\n\n SABER-FACTIONS-DISCORD-INTEGRATION - You are not using Discord integration features, set conf.json option useDiscordSystem to true and put a valid token in before using!\n\n\n");
         }
-        //Setup Discord Bot
-        new Discord(this);
 
         ShopConfig.setup();
-        fLogManager.loadLogs(this);
 
         getServer().getPluginManager().registerEvents(factionsPlayerListener = new FactionsPlayerListener(), this);
 
@@ -289,8 +289,6 @@ public class FactionsPlugin extends MPlugin {
                 new FUpgradesGUI(),
                 new UpgradesListener(),
                 new MissionHandler(this),
-                new FChestListener(),
-                new MenuListener(),
                 new AntiChestListener()
         };
 
@@ -420,7 +418,7 @@ public class FactionsPlugin extends MPlugin {
                 .registerTypeAdapterFactory(EnumTypeAdapter.ENUM_FACTORY);
     }
 
-    public void divider() {
+    private void divider() {
         System.out.println("  .-.-.   .-.-.   .-.-.   .-.-.   .-.-.   .-.-.   .-.-.   .-.-");
         System.out.println(" / / \\ \\ / / \\ \\ / / \\ \\ / / \\ \\ / / \\ \\ / / \\ \\ / / \\ \\ / / \\");
         System.out.println("`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'");
@@ -430,7 +428,9 @@ public class FactionsPlugin extends MPlugin {
     public void onDisable() {
         // only save data if plugin actually completely loaded successfully
         if (this.loadSuccessful) {
-            Conf.saveSync();
+            // Dont save, as this is kind of pointless, as the /f config command manually saves.
+            // So any edits done are saved, this way manual edits to json can go through.
+            // Conf.save();
         }
 
         if (AutoLeaveTask != null) {
@@ -439,11 +439,6 @@ public class FactionsPlugin extends MPlugin {
         }
         DiscordListener.saveGuilds();
         super.onDisable();
-        try {
-            fLogManager.saveLogs();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
     }
 
     public void startAutoLeaveTask(boolean restartIfRunning) {
@@ -569,6 +564,22 @@ public class FactionsPlugin extends MPlugin {
         }
     }
 
+    public void createTimedHologram(final Location location, String text, Long timeout) {
+        ArmorStand as = (ArmorStand) location.add(0.5, 1, 0.5).getWorld().spawnEntity(location, EntityType.ARMOR_STAND); //Spawn the ArmorStand
+        as.setVisible(false); //Makes the ArmorStand invisible
+        as.setGravity(false); //Make sure it doesn't fall
+        as.setCanPickupItems(false); //I'm not sure what happens if you leave this as it is, but you might as well disable it
+        as.setCustomName(FactionsPlugin.instance.color(text)); //Set this to the text you want
+        as.setCustomNameVisible(true); //This makes the text appear no matter if your looking at the entity or not
+        final ArmorStand armorStand = as;
+
+        Bukkit.getScheduler().scheduleSyncDelayedTask(FactionsPlugin.instance, () -> {
+                    armorStand.remove();
+                    getLogger().info("Removing Hologram.");
+                }
+                , timeout * 20);
+    }
+
 
     // -------------------------------------------- //
     // Functions for other plugins to hook into
@@ -648,15 +659,6 @@ public class FactionsPlugin extends MPlugin {
         return tag;
     }
 
-
-    public FLogManager getFlogManager() {
-        return fLogManager;
-    }
-
-    public void logFactionEvent(Faction faction, FLogType type, String... arguments) {
-        this.fLogManager.log(faction, type, arguments);
-    }
-
     // Get a player's title within their faction, mainly for usage by chat plugins for local/channel chat
     public String getPlayerTitle(Player player) {
         if (player == null) {
@@ -740,8 +742,4 @@ public class FactionsPlugin extends MPlugin {
     public void debug(String s) {
         debug(Level.INFO, s);
     }
-
-    public Worldguard getWg() {
-        return wg;
-    }
 }

src/main/java/com/massivecraft/factions/cmd/BrigadierManager.java

@@ -15,10 +15,6 @@ import java.util.Map;
 
 public class BrigadierManager {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public Commodore commodore;
     public LiteralArgumentBuilder<Object> brigadier = LiteralArgumentBuilder.literal("factions");
 

src/main/java/com/massivecraft/factions/cmd/BrigadierProvider.java

@@ -4,10 +4,6 @@ import com.mojang.brigadier.builder.ArgumentBuilder;
 
 public interface BrigadierProvider {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     ArgumentBuilder<Object, ?> get(ArgumentBuilder<Object, ?> parent);
 
 }

src/main/java/com/massivecraft/factions/cmd/CmdAHome.java

@@ -8,10 +8,6 @@ import org.bukkit.event.player.PlayerTeleportEvent;
 
 public class CmdAHome extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdAHome() {
         super();
         this.aliases.add("ahome");

src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java

@@ -3,21 +3,14 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.Faction;
-import com.massivecraft.factions.FactionsPlugin;
-import com.massivecraft.factions.cmd.audit.FLogType;
 import com.massivecraft.factions.event.FPlayerJoinEvent;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 
 public class CmdAdmin extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdAdmin() {
         super();
         this.aliases.add("admin");
@@ -32,69 +25,59 @@ public class CmdAdmin extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
+        // Allows admins bypass this.
-            if (context.player == null) {
+        if (!context.fPlayer.isAdminBypassing() && !context.fPlayer.getRole().equals(Role.LEADER)) {
-                context.msg(TL.GENERIC_PLAYERONLY);
+            context.msg(TL.COMMAND_ADMIN_NOTADMIN);
-                return;
+            return;
-            }
+        }
-            // Allows admins bypass this.
+        FPlayer fyou = context.argAsBestFPlayerMatch(0);
-            if (!context.fPlayer.isAdminBypassing() && !context.fPlayer.getRole().equals(Role.LEADER)) {
+        if (fyou == null) {
-                context.msg(TL.COMMAND_ADMIN_NOTADMIN);
+            return;
-                return;
+        }
-            }
+
-            FPlayer fyou = context.argAsBestFPlayerMatch(0);
+        boolean permAny = Permission.ADMIN_ANY.has(context.sender, false);
-            if (fyou == null) {
+        Faction targetFaction = fyou.getFaction();
+
+        if (targetFaction != context.faction && !permAny) {
+            context.msg(TL.COMMAND_ADMIN_NOTMEMBER, fyou.describeTo(context.fPlayer, true));
+            return;
+        }
+
+        if (fyou == context.fPlayer && !permAny) {
+            context.msg(TL.COMMAND_ADMIN_TARGETSELF);
+            return;
+        }
+
+        // only perform a FPlayerJoinEvent when newLeader isn't actually in the faction
+        if (fyou.getFaction() != targetFaction) {
+            FPlayerJoinEvent event = new FPlayerJoinEvent(FPlayers.getInstance().getByPlayer(context.player), targetFaction, FPlayerJoinEvent.PlayerJoinReason.LEADER);
+            Bukkit.getServer().getPluginManager().callEvent(event);
+            if (event.isCancelled()) {
                 return;
             }
+        }
 
-            boolean permAny = Permission.ADMIN_ANY.has(context.sender, false);
+        FPlayer admin = targetFaction.getFPlayerAdmin();
-            Faction targetFaction = fyou.getFaction();
 
-            if (targetFaction != context.faction && !permAny) {
+        // if target player is currently admin, demote and replace him
-                context.msg(TL.COMMAND_ADMIN_NOTMEMBER, fyou.describeTo(context.fPlayer, true));
+        if (fyou == admin) {
-                return;
+            targetFaction.promoteNewLeader();
-            }
+            context.msg(TL.COMMAND_ADMIN_DEMOTES, fyou.describeTo(context.fPlayer, true));
+            fyou.msg(TL.COMMAND_ADMIN_DEMOTED, context.player == null ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(fyou, true));
+            return;
+        }
 
-            if (fyou == context.fPlayer && !permAny) {
+        // promote target player, and demote existing admin if one exists
-                context.msg(TL.COMMAND_ADMIN_TARGETSELF);
+        if (admin != null) {
-                return;
+            admin.setRole(Role.COLEADER);
-            }
+        }
+        fyou.setRole(Role.LEADER);
+        context.msg(TL.COMMAND_ADMIN_PROMOTES, fyou.describeTo(context.fPlayer, true));
 
-            // only perform a FPlayerJoinEvent when newLeader isn't actually in the faction
+        // Inform all players
-            if (fyou.getFaction() != targetFaction) {
+        for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
-                FPlayerJoinEvent event = new FPlayerJoinEvent(FPlayers.getInstance().getByPlayer(context.player), targetFaction, FPlayerJoinEvent.PlayerJoinReason.LEADER);
+            fplayer.msg(TL.COMMAND_ADMIN_PROMOTED, context.player == null ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(fplayer, true), fyou.describeTo(fplayer), targetFaction.describeTo(fplayer));
-                Bukkit.getServer().getPluginManager().callEvent(event);
+        }
-                if (event.isCancelled()) {
-                    return;
-                }
-            }
-
-            FPlayer admin = targetFaction.getFPlayerAdmin();
-
-            // if target player is currently admin, demote and replace him
-            if (fyou == admin) {
-                targetFaction.promoteNewLeader();
-                context.msg(TL.COMMAND_ADMIN_DEMOTES, fyou.describeTo(context.fPlayer, true));
-                fyou.msg(TL.COMMAND_ADMIN_DEMOTED, context.player == null ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(fyou, true));
-                return;
-            }
-
-            // promote target player, and demote existing admin if one exists
-            if (admin != null) {
-                admin.setRole(Role.COLEADER);
-            }
-            fyou.setRole(Role.LEADER);
-            context.msg(TL.COMMAND_ADMIN_PROMOTES, fyou.describeTo(context.fPlayer, true));
-
-            FactionsPlugin.instance.getFlogManager().log(targetFaction, FLogType.RANK_EDIT, context.fPlayer.getName(), fyou.getName(), ChatColor.RED + "Admin");
-
-            // Inform all players
-            for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
-                fplayer.msg(TL.COMMAND_ADMIN_PROMOTED,
-                        context.player == null ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(fplayer, true),
-                        fyou.describeTo(fplayer), targetFaction.describeTo(fplayer));
-            }
-        });
     }
 
     public TL getUsageTranslation() {

src/main/java/com/massivecraft/factions/cmd/CmdAnnounce.java

@@ -12,10 +12,6 @@ import org.bukkit.entity.Player;
 
 public class CmdAnnounce extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdAnnounce() {
         super();
         this.aliases.add("ann");

src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java

@@ -8,10 +8,6 @@ import java.util.ArrayList;
 
 public class CmdAutoHelp extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdAutoHelp() {
         this.aliases.add("?");
         this.aliases.add("h");

src/main/java/com/massivecraft/factions/cmd/CmdBan.java

@@ -2,11 +2,9 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FactionsPlugin;
-import com.massivecraft.factions.cmd.audit.FLogType;
 import com.massivecraft.factions.event.FPlayerLeaveEvent;
 import com.massivecraft.factions.struct.BanInfo;
 import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.util.CC;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
@@ -15,10 +13,6 @@ import java.util.logging.Level;
 
 public class CmdBan extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdBan() {
         super();
         this.aliases.add("ban");
@@ -81,7 +75,6 @@ public class CmdBan extends FCommand {
 
         // Lets inform the people!
         target.msg(TL.COMMAND_BAN_TARGET, context.faction.getTag(target.getFaction()));
-        FactionsPlugin.instance.logFactionEvent(context.faction, FLogType.BANS, context.fPlayer.getName(), CC.Green + "banned", target.getName());
         context.faction.msg(TL.COMMAND_BAN_BANNED, context.fPlayer.getName(), target.getName());
     }
 

src/main/java/com/massivecraft/factions/cmd/CmdBanlist.java

@@ -13,10 +13,6 @@ import java.util.List;
 
 public class CmdBanlist extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdBanlist() {
         super();
         this.aliases.add("banlist");

src/main/java/com/massivecraft/factions/cmd/CmdBanner.java

@@ -13,11 +13,6 @@ import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
 
 public class CmdBanner extends FCommand {
-
-    /**
-     * @author Illyria Team
-     */
-
     public CmdBanner() {
         this.aliases.add("banner");
         this.aliases.add("warbanner");
@@ -34,10 +29,12 @@ public class CmdBanner extends FCommand {
             context.msg(TL.COMMAND_BANNER_NOBANNER);
             return;
         }
-        if (!context.fPlayer.takeMoney(FactionsPlugin.getInstance().getConfig().getInt("fbanners.Banner-Cost", 5000))) {
+        if (!context.fPlayer.hasMoney(FactionsPlugin.getInstance().getConfig().getInt("fbanners.Banner-Cost", 5000))) {
             context.msg(TL.COMMAND_BANNER_NOTENOUGHMONEY);
             return;
         }
+        this.takeMoney(context.fPlayer, FactionsPlugin.getInstance().getConfig().getInt("fbanners.Banner-Cost", 5000));
+        this.takeMoney(context.fPlayer, FactionsPlugin.getInstance().getConfig().getInt("fbanners.Banner-Cost", 5000));
         ItemStack warBanner = context.fPlayer.getFaction().getBanner();
         ItemMeta warmeta = warBanner.getItemMeta();
         warmeta.setDisplayName(FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fbanners.Item.Name")));
@@ -47,7 +44,7 @@ public class CmdBanner extends FCommand {
         warBanner.setAmount(1);
         context.player.getInventory().addItem(warBanner);
     }
-    @Deprecated
+
     public boolean hasMoney(FPlayer fme, int amt) {
         Economy econ = FactionsPlugin.getInstance().getEcon();
         if (econ.getBalance(fme.getPlayer()) >= amt) {
@@ -56,10 +53,11 @@ public class CmdBanner extends FCommand {
         fme.msg(TL.COMMAND_BANNER_NOTENOUGHMONEY);
         return false;
     }
-    @Deprecated
+
     public void takeMoney(FPlayer fme, int amt) {
         if (this.hasMoney(fme, amt)) {
             Economy econ = FactionsPlugin.getInstance().getEcon();
+            econ.withdrawPlayer(fme.getPlayer(), (double) amt);
             fme.sendMessage(TL.COMMAND_BANNER_MONEYTAKE.toString().replace("{amount}", amt + ""));
         }
     }

src/main/java/com/massivecraft/factions/cmd/CmdBoom.java

@@ -6,10 +6,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdBoom extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdBoom() {
         super();
         this.aliases.add("noboom");

src/main/java/com/massivecraft/factions/cmd/CmdBypass.java

@@ -6,10 +6,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdBypass extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdBypass() {
         super();
         this.aliases.add("bypass");

src/main/java/com/massivecraft/factions/cmd/CmdChat.java

@@ -10,10 +10,6 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 
 public class CmdChat extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdChat() {
         super();
         this.aliases.add("c");

src/main/java/com/massivecraft/factions/cmd/CmdChatSpy.java

@@ -6,10 +6,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdChatSpy extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdChatSpy() {
         super();
         this.aliases.add("chatspy");

src/main/java/com/massivecraft/factions/cmd/CmdCheckpoint.java

@@ -6,11 +6,6 @@ import com.massivecraft.factions.util.WarmUpUtil;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdCheckpoint extends FCommand {
-
-    /**
-     * @author Illyria Team
-     */
-
     public CmdCheckpoint() {
         super();
         this.aliases.add("checkp");

src/main/java/com/massivecraft/factions/cmd/CmdColeader.java

@@ -3,8 +3,6 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Faction;
-import com.massivecraft.factions.FactionsPlugin;
-import com.massivecraft.factions.cmd.audit.FLogType;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.zcore.util.TL;
@@ -12,11 +10,6 @@ import mkremins.fanciful.FancyMessage;
 import org.bukkit.ChatColor;
 
 public class CmdColeader extends FCommand {
-
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdColeader() {
         super();
         this.aliases.add("co");
@@ -83,7 +76,6 @@ public class CmdColeader extends FCommand {
             you.setRole(Role.COLEADER);
             targetFaction.msg(TL.COMMAND_COLEADER_PROMOTED, you.describeTo(targetFaction, true));
             context.msg(TL.COMMAND_COLEADER_PROMOTES, you.describeTo(context.fPlayer, true));
-            FactionsPlugin.instance.getFlogManager().log(targetFaction, FLogType.RANK_EDIT, context.fPlayer.getName(), you.getName(), ChatColor.RED + "Co-Leader");
         }
     }
 

src/main/java/com/massivecraft/factions/cmd/CmdConvert.java

@@ -9,10 +9,6 @@ import org.bukkit.command.ConsoleCommandSender;
 
 public class CmdConvert extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdConvert() {
         this.aliases.add("convert");
         this.requiredArgs.add("[MYSQL|JSON]");

src/main/java/com/massivecraft/factions/cmd/CmdCoords.java

@@ -7,10 +7,6 @@ import org.bukkit.Location;
 
 public class CmdCoords extends FCommand {
 
-    /**
-     * @author Illyria Team
-     */
-
     public CmdCoords() {
         super();
         this.aliases.add("coords");

src/main/java/com/massivecraft/factions/cmd/CmdCreate.java

@@ -1,7 +1,6 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.*;
-import com.massivecraft.factions.discord.Discord;
 import com.massivecraft.factions.event.FPlayerJoinEvent;
 import com.massivecraft.factions.event.FactionCreateEvent;
 import com.massivecraft.factions.integration.Econ;
@@ -9,20 +8,13 @@ import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.util.MiscUtil;
 import com.massivecraft.factions.zcore.util.TL;
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.exceptions.HierarchyException;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 
 import java.util.ArrayList;
 
 
 public class CmdCreate extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdCreate() {
         super();
         this.aliases.add("create");
@@ -36,10 +28,6 @@ public class CmdCreate extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        if (Conf.restrictActionsWhenNotLinked && !context.fPlayer.discordSetup()) {
-            context.player.sendMessage(ChatColor.translateAlternateColorCodes('&', TL.DISCORD_LINK_REQUIRED.toString()));
-            return;
-        }
         String tag = context.argAsString(0);
 
         if (context.fPlayer.hasFaction()) {
@@ -90,6 +78,7 @@ public class CmdCreate extends FCommand {
         FPlayerJoinEvent joinEvent = new FPlayerJoinEvent(FPlayers.getInstance().getByPlayer(context.player), faction, FPlayerJoinEvent.PlayerJoinReason.CREATE);
         Bukkit.getServer().getPluginManager().callEvent(joinEvent);
         // join event cannot be cancelled or you'll have an empty faction
+
         // finish setting up the FPlayer
         context.fPlayer.setFaction(faction, false);
         // We should consider adding the role just AFTER joining the faction.
@@ -101,22 +90,6 @@ public class CmdCreate extends FCommand {
                 follower.msg(TL.COMMAND_CREATE_CREATED, context.fPlayer.getName(), faction.getTag(follower));
             }
         }
-        //Discord
-        try {
-            if (Discord.useDiscord && context.fPlayer.discordSetup() && Discord.isInMainGuild(context.fPlayer.discordUser()) && Discord.mainGuild != null) {
-                Member m = Discord.mainGuild.getMember(context.fPlayer.discordUser());
-                if (Conf.factionRoles) {
-                    Discord.mainGuild.getController().addSingleRoleToMember(m, Discord.createFactionRole(faction.getTag())).queue();
-                }
-                if (Conf.leaderRoles && Discord.leader != null) {
-                    Discord.mainGuild.getController().addSingleRoleToMember(m, Discord.leader).queue();
-                }
-                if (Conf.factionDiscordTags) {
-                    Discord.mainGuild.getController().setNickname(m, Discord.getNicknameString(context.fPlayer)).queue();
-                }
-            }
-        } catch (HierarchyException e) {System.out.print(e.getMessage());}
-        //End Discord
         context.msg(TL.COMMAND_CREATE_YOUSHOULD, FactionsPlugin.getInstance().cmdBase.cmdDescription.getUsageTemplate(context));
         if (Conf.econEnabled) Econ.setBalance(faction.getAccountId(), Conf.econFactionStartingBalance);
         if (Conf.logFactionCreate)

src/main/java/com/massivecraft/factions/cmd/CmdDebug.java

@@ -1,66 +0,0 @@
-package com.massivecraft.factions.cmd;
-
-import com.massivecraft.factions.FactionsPlugin;
-import com.massivecraft.factions.discord.Discord;
-import com.massivecraft.factions.discord.DiscordSetupAttempt;
-import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.zcore.util.TL;
-import org.bukkit.Bukkit;
-
-public class CmdDebug extends FCommand {
-    public CmdDebug() {
-        super();
-        this.aliases.add("debug");
-        this.requirements = new CommandRequirements.Builder(Permission.DEBUG).build();
-    }
-    @Override
-    public void perform(CommandContext context) {
-        FactionsPlugin.getInstance().divider();
-        System.out.print("----------Debug Info----------");
-        System.out.print("-------Main-------");
-        System.out.print("Server Version: " + FactionsPlugin.getInstance().getServer().getVersion());
-        System.out.print("Server Bukkit Version: " + FactionsPlugin.getInstance().getServer().getBukkitVersion());
-        System.out.print("SaberFactions Version: " + FactionsPlugin.getInstance().getDescription().getVersion());
-        System.out.print("Is Beta Version: " + (FactionsPlugin.getInstance().getDescription().getFullName().contains("BETA") ? "True" : "False"));
-        System.out.print("Players Online: " + Bukkit.getOnlinePlayers().size());
-        System.out.print("------Command------");
-        System.out.print("Discord Commands: " + FCmdRoot.instance.discordEnabled);
-        System.out.print("Check/WeeWoo Commands: " + FCmdRoot.instance.checkEnabled);
-        System.out.print("Mission Command: " + FCmdRoot.instance.missionsEnabled);
-        System.out.print("Shop Command: " + FCmdRoot.instance.fShopEnabled);
-        System.out.print("Inventory See Command: " + FCmdRoot.instance.invSeeEnabled);
-        System.out.print("Points Command: " + FCmdRoot.instance.fPointsEnabled);
-        System.out.print("Alts Command: " + FCmdRoot.instance.fAltsEnabled);
-        System.out.print("Grace Command: " + FCmdRoot.instance.fGraceEnabled);
-        System.out.print("Focus Command: " + FCmdRoot.instance.fFocusEnabled);
-        System.out.print("Fly Command: " + FCmdRoot.instance.fFlyEnabled);
-        System.out.print("PayPal Commands: " + FCmdRoot.instance.fPayPalEnabled);
-        System.out.print("Inspect Command: " + FCmdRoot.instance.coreProtectEnabled);
-        System.out.print("Internal FTOP Command: " + FCmdRoot.instance.internalFTOPEnabled);
-        System.out.print("----End Command----");
-        System.out.print("-----End Main-----");
-        System.out.print("------Discord------");
-        System.out.print("Discord Integration enabled in config: " + Discord.confUseDiscord);
-        System.out.print("Discord Integration enabled: " + Discord.useDiscord);
-        System.out.print("Setup attempts: " + Discord.setupLog.size());
-        System.out.print("FPlayers waiting to link: " + Discord.waitingLink.size());
-        System.out.print("Bot Token: " + (Discord.botToken == "<token here>" ? "Not Set" : "Set"));
-        System.out.print("JDA Null: " + (Discord.jda == null ? "True" : "False"));
-        System.out.print("Main Guild ID: " + Discord.mainGuildID);
-        System.out.print("Main Guild Null: " + (Discord.mainGuild == null ? "True" : "False"));
-        System.out.print("Emotes enabled: " + Discord.useEmotes);
-        System.out.print("Leader role null: " + (Discord.leader == null ? "True" : "False"));
-        System.out.print("Attempt Log:");
-        for (DiscordSetupAttempt d : Discord.setupLog) {System.out.print(d.getDifferentialFormatted() + " " + d.getSuccess() + " " + d.getReason());}
-        System.out.print("End Attempt Log");
-        System.out.print("----End Discord----");
-        System.out.print("--------End Debug Info--------");
-        FactionsPlugin.getInstance().divider();
-        context.fPlayer.msg(TL.COMMAND_DEBUG_PRINTED);
-    }
-
-    @Override
-    public TL getUsageTranslation() {
-        return TL.COMMAND_DEBUG_DESCRIPTION;
-    }
-}

src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java

@@ -14,10 +14,6 @@ import org.bukkit.ChatColor;
 
 public class CmdDeinvite extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdDeinvite() {
         super();
         this.aliases.add("deinvite");
@@ -32,47 +28,51 @@ public class CmdDeinvite extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-            if (context.args.size() == 0) {
+
-                FancyMessage msg = new FancyMessage(TL.COMMAND_DEINVITE_CANDEINVITE.toString()).color(ChatColor.GOLD);
+        // Check if arg 0 == null do you don't have
-                for (String id : context.faction.getInvites()) {
+        // `No player "null" could be found.` message.
-                    FPlayer fp = FPlayers.getInstance().getById(id);
+        if (context.args.get(0) == null) {
-                    String name = fp != null ? fp.getName() : id;
+            FancyMessage msg = new FancyMessage(TL.COMMAND_DEINVITE_CANDEINVITE.toString()).color(ChatColor.GOLD);
-                    msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_DEINVITE_CLICKTODEINVITE.format(name)).command("/" + Conf.baseCommandAliases.get(0) + " deinvite " + name);
+            for (String id : context.faction.getInvites()) {
-                }
+                FPlayer fp = FPlayers.getInstance().getById(id);
-                context.sendFancyMessage(msg);
+                String name = fp != null ? fp.getName() : id;
+                msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_DEINVITE_CLICKTODEINVITE.format(name)).command("/" + Conf.baseCommandAliases.get(0) + " deinvite " + name);
+            }
+            context.sendFancyMessage(msg);
+            return;
+        }
+
+        FPlayer you = context.argAsBestFPlayerMatch(0);
+        if (!context.fPlayer.isAdminBypassing()) {
+            Access access = context.faction.getAccess(context.fPlayer, PermissableAction.INVITE);
+            if (access != Access.ALLOW && context.fPlayer.getRole() != Role.LEADER) {
+                context.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage invites");
                 return;
             }
+        }
 
-            FPlayer you = context.argAsBestFPlayerMatch(0);
+        if (you == null) {
-            if (!context.fPlayer.isAdminBypassing()) {
+            FancyMessage msg = new FancyMessage(TL.COMMAND_DEINVITE_CANDEINVITE.toString()).color(ChatColor.GOLD);
-                Access access = context.faction.getAccess(context.fPlayer, PermissableAction.INVITE);
+            for (String id : context.faction.getInvites()) {
-                if (access != Access.ALLOW && context.fPlayer.getRole() != Role.LEADER) {
+                FPlayer fp = FPlayers.getInstance().getById(id);
-                    context.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage invites");
+                String name = fp != null ? fp.getName() : id;
-                    return;
+                msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_DEINVITE_CLICKTODEINVITE.format(name)).command("/" + Conf.baseCommandAliases.get(0) + " deinvite " + name);
-                }
             }
+            context.sendFancyMessage(msg);
+            return;
+        }
 
-            if (you == null) {
+        if (you.getFaction() == context.faction) {
-                FancyMessage msg = new FancyMessage(TL.COMMAND_DEINVITE_CANDEINVITE.toString()).color(ChatColor.GOLD);
+            context.msg(TL.COMMAND_DEINVITE_ALREADYMEMBER, you.getName(), context.faction.getTag());
-                for (String id : context.faction.getInvites()) {
+            context.msg(TL.COMMAND_DEINVITE_MIGHTWANT, FactionsPlugin.getInstance().cmdBase.cmdKick.getUsageTemplate(context));
-                    if (context.faction.getInvites().isEmpty()) return;
+            return;
-                    FPlayer fp = FPlayers.getInstance().getById(id);
+        }
-                    String name = fp != null ? fp.getName() : id;
-                    msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_DEINVITE_CLICKTODEINVITE.format(name)).command("/" + Conf.baseCommandAliases.get(0) + " deinvite " + name);
-                }
-                context.sendFancyMessage(msg);
-                return;
-            }
 
-            if (you.getFaction() == context.faction) {
+        context.faction.deinvite(you);
-                context.msg(TL.COMMAND_DEINVITE_ALREADYMEMBER, you.getName(), context.faction.getTag());
-                context.msg(TL.COMMAND_DEINVITE_MIGHTWANT, FactionsPlugin.getInstance().cmdBase.cmdKick.getUsageTemplate(context));
-                return;
-            }
 
-            context.faction.deinvite(you);
+        you.msg(TL.COMMAND_DEINVITE_REVOKED, context.fPlayer.describeTo(you), context.faction.describeTo(you));
-            you.msg(TL.COMMAND_DEINVITE_REVOKED, context.fPlayer.describeTo(you), context.faction.describeTo(you));
+
-            context.faction.msg(TL.COMMAND_DEINVITE_REVOKES, context.fPlayer.describeTo(context.faction), you.describeTo(context.faction));
+        context.faction.msg(TL.COMMAND_DEINVITE_REVOKES, context.fPlayer.describeTo(context.faction), you.describeTo(context.faction));
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/CmdDelFWarp.java

@@ -7,10 +7,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdDelFWarp extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdDelFWarp() {
         super();
         this.aliases.add("delwarp");

src/main/java/com/massivecraft/factions/cmd/CmdDescription.java

@@ -3,19 +3,12 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayers;
-import com.massivecraft.factions.FactionsPlugin;
-import com.massivecraft.factions.cmd.audit.FLogType;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 import com.massivecraft.factions.zcore.util.TextUtil;
-import org.bukkit.Bukkit;
 
 public class CmdDescription extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdDescription() {
         super();
         this.aliases.add("desc");
@@ -32,29 +25,26 @@ public class CmdDescription extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
+        // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
-            // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
+        if (!context.payForCommand(Conf.econCostDesc, TL.COMMAND_DESCRIPTION_TOCHANGE, TL.COMMAND_DESCRIPTION_FORCHANGE)) {
-            if (!context.payForCommand(Conf.econCostDesc, TL.COMMAND_DESCRIPTION_TOCHANGE, TL.COMMAND_DESCRIPTION_FORCHANGE)) {
+            return;
-                return;
+        }
-            }
 
-            // since "&" color tags seem to work even through plain old FPlayer.sendMessage() for some reason, we need to break those up
+        // since "&" color tags seem to work even through plain old FPlayer.sendMessage() for some reason, we need to break those up
-            // And replace all the % because it messes with string formatting and this is easy way around that.
+        // And replace all the % because it messes with string formatting and this is easy way around that.
-            String desc = TextUtil.implode(context.args, " ").replaceAll("%", "").replaceAll("(&([a-f0-9klmnor]))", "& $2");
+        context.faction.setDescription(TextUtil.implode(context.args, " ").replaceAll("%", "").replaceAll("(&([a-f0-9klmnor]))", "& $2"));
-            context.faction.setDescription(desc);
-            Bukkit.getScheduler().scheduleSyncDelayedTask(FactionsPlugin.instance, () -> FactionsPlugin.instance.logFactionEvent(context.faction, FLogType.FDESC_EDIT, context.fPlayer.getName(), desc));
-            if (!Conf.broadcastDescriptionChanges) {
-                context.msg(TL.COMMAND_DESCRIPTION_CHANGED, context.faction.describeTo(context.fPlayer));
-                context.sendMessage(context.faction.getDescription());
-                return;
-            }
 
-            // Broadcast the description to everyone
+        if (!Conf.broadcastDescriptionChanges) {
-            for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
+            context.msg(TL.COMMAND_DESCRIPTION_CHANGED, context.faction.describeTo(context.fPlayer));
-                fplayer.msg(TL.COMMAND_DESCRIPTION_CHANGES, context.faction.describeTo(fplayer));
+            context.sendMessage(context.faction.getDescription());
-                fplayer.sendMessage(context.faction.getDescription());  // players can inject "&" or "`" or "<i>" or whatever in their description; &k is particularly interesting looking
+            return;
-            }
+        }
-        });
+
+        // Broadcast the description to everyone
+        for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
+            fplayer.msg(TL.COMMAND_DESCRIPTION_CHANGES, context.faction.describeTo(fplayer));
+            fplayer.sendMessage(context.faction.getDescription());  // players can inject "&" or "`" or "<i>" or whatever in their description; &k is particularly interesting looking
+        }
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/CmdDisband.java

@@ -16,10 +16,6 @@ import java.util.HashMap;
 
 public class CmdDisband extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
 
     private static HashMap<String, String> disbandMap = new HashMap<>();
 
@@ -82,23 +78,18 @@ public class CmdDisband extends FCommand {
             if (FactionsPlugin.getInstance().getConfig().getBoolean("faction-disband-broadcast", true)) {
                 for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers()) {
                     String amountString = context.sender instanceof ConsoleCommandSender ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(follower);
+                    UtilFly.checkFly(context.fPlayer, Board.getInstance().getFactionAt(new FLocation(follower)));
                     if (follower.getFaction() == faction) {
                         follower.msg(TL.COMMAND_DISBAND_BROADCAST_YOURS, amountString);
-                        if (!follower.canFlyAtLocation()) {
-                            follower.setFFlying(false, false);
-                        }
                     } else {
                         follower.msg(TL.COMMAND_DISBAND_BROADCAST_NOTYOURS, amountString, faction.getTag(follower));
                     }
                 }
-                context.fPlayer.setFFlying(false, false);
+                faction.disband(context.player, PlayerDisbandReason.COMMAND);
             } else {
+                faction.disband(context.player, PlayerDisbandReason.COMMAND);
                 context.player.sendMessage(String.valueOf(TL.COMMAND_DISBAND_PLAYER));
             }
-            faction.disband(context.player, PlayerDisbandReason.COMMAND);
-            if (!context.fPlayer.canFlyAtLocation()) {
-                context.fPlayer.setFFlying(false, false);
-            }
         }
     }
 

src/main/java/com/massivecraft/factions/cmd/CmdDiscord.java

@@ -1,40 +0,0 @@
-package com.massivecraft.factions.cmd;
-
-import com.massivecraft.factions.discord.Discord;
-import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.zcore.util.TL;
-
-import java.util.Random;
-
-public class CmdDiscord extends FCommand {
-    public CmdDiscord() {
-        super();
-        this.aliases.add("discord");
-        this.requirements = new CommandRequirements.Builder(Permission.DISCORD)
-                .playerOnly()
-                .build();
-    }
-    @Override
-    public void perform(CommandContext context) {
-        if (context.fPlayer.discordSetup()) {
-            context.fPlayer.msg(TL.DISCORD_ALREADY_LINKED, context.fPlayer.discordUser().getName());
-        } else {
-            if (Discord.waitingLink.containsValue(context.fPlayer)) {
-                context.fPlayer.msg(TL.DISCORD_CODE_SENT, Discord.waitingLinkk.get(context.fPlayer), Discord.mainGuild.getSelfMember().getEffectiveName());
-                return;
-            }
-            Integer random = new Random().nextInt(9999);
-            while (Discord.waitingLink.containsValue(random)) {
-                random = new Random().nextInt(9999);
-            }
-            Discord.waitingLink.put(random, context.fPlayer);
-            Discord.waitingLinkk.put(context.fPlayer, random);
-            context.fPlayer.msg(TL.DISCORD_CODE_SENT, String.valueOf(random));
-        }
-    }
-
-    @Override
-    public TL getUsageTranslation() {
-        return TL.COMMAND_DISCORD_DESCRIPTION;
-    }
-}

src/main/java/com/massivecraft/factions/cmd/CmdDrain.java

@@ -1,64 +0,0 @@
-package com.massivecraft.factions.cmd;
-
-import com.massivecraft.factions.Conf;
-import com.massivecraft.factions.FPlayer;
-import com.massivecraft.factions.FPlayers;
-import com.massivecraft.factions.FactionsPlugin;
-import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.zcore.fperms.PermissableAction;
-import com.massivecraft.factions.zcore.util.TL;
-import org.bukkit.entity.Player;
-
-import java.text.DecimalFormat;
-
-/**
- * @author Saser
- */
-public class CmdDrain extends FCommand{
-    public CmdDrain(){
-        this.aliases.add("drain");
-        this.requirements = new CommandRequirements.Builder(Permission.DRAIN)
-                .playerOnly()
-                .memberOnly()
-                .withAction(PermissableAction.DRAIN)
-                .build();
-    }
-
-
-    @Override
-    public void perform(CommandContext context) {
-        if (!Conf.factionsDrainEnabled) {
-            context.fPlayer.msg(TL.GENERIC_DISABLED, "Factions Drain");
-            return;
-        }
-
-        double totalBalance = 0;
-
-        for(FPlayer fPlayer : context.faction.getFPlayers()) {
-            if(context.faction.getFPlayers().size() == 1){
-                context.fPlayer.msg(TL.COMMAND_DRAIN_NO_PLAYERS);
-                return;
-            }
-            if (FPlayers.getInstance().getByPlayer(context.player).equals(fPlayer)){
-                continue; // skip the command executor
-            }
-            double balance = FactionsPlugin.getInstance().getEcon().getBalance(fPlayer.getPlayer());
-            if (balance > 0) {
-                FactionsPlugin.getInstance().getEcon().depositPlayer(context.player, balance);
-                FactionsPlugin.getInstance().getEcon().withdrawPlayer(fPlayer.getPlayer(), balance);
-                totalBalance = (totalBalance + balance);
-            }
-        }
-        context.fPlayer.msg(TL.COMMAND_DRAIN_RECIEVED_AMOUNT, commas(totalBalance));
-    }
-
-    public String commas(final double amount) {
-        final DecimalFormat formatter = new DecimalFormat("#,###.00");
-        return formatter.format(amount);
-    }
-
-    @Override
-    public TL getUsageTranslation() {
-        return TL.COMMAND_DRAIN_DESCRIPTION;
-    }
-}

src/main/java/com/massivecraft/factions/cmd/CmdFGlobal.java

@@ -9,10 +9,6 @@ import java.util.UUID;
 
 public class CmdFGlobal extends FCommand {
 
-    /**
-     * @author Trent
-     */
-
     public static List<UUID> toggled = new ArrayList<>();
 
     public CmdFGlobal() {

src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java

@@ -14,10 +14,6 @@ import java.util.UUID;
 
 public class CmdFWarp extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdFWarp() {
         super();
         this.aliases.add("warp");

src/main/java/com/massivecraft/factions/cmd/CmdFly.java

@@ -19,10 +19,6 @@ import java.util.concurrent.ConcurrentHashMap;
 
 public class CmdFly extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
 
     public static ConcurrentHashMap<String, Boolean> flyMap = new ConcurrentHashMap<>();
     public static BukkitTask particleTask = null;
@@ -101,9 +97,6 @@ public class CmdFly extends FCommand {
     }
 
     public static boolean checkBypassPerms(FPlayer fme, Player me, Faction toFac) {
-        if (Conf.denyFlightIfInNoClaimingWorld && !Conf.worldsNoClaiming.isEmpty() && Conf.worldsNoClaiming.stream().anyMatch(me.getWorld().getName()::equalsIgnoreCase))
-            return false;
-
         if (toFac != fme.getFaction()) {
             if (!me.hasPermission(Permission.FLY_WILD.node) && toFac.isWilderness() || !me.hasPermission(Permission.FLY_SAFEZONE.node) && toFac.isSafeZone() || !me.hasPermission(Permission.FLY_WARZONE.node) && toFac.isWarZone()) {
                 fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
@@ -123,7 +116,7 @@ public class CmdFly extends FCommand {
                 return false;
             }
 
-            if (!(me.hasPermission(Permission.FLY_NEUTRAL.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.NEUTRAL && !toFac.isSystemFaction()) {
+            if (!(me.hasPermission(Permission.FLY_NEUTRAL.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.NEUTRAL && !isSystemFaction(toFac)) {
                 fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
                 return false;
             }
@@ -132,6 +125,11 @@ public class CmdFly extends FCommand {
         return true;
     }
 
+    public static Boolean isSystemFaction(Faction faction) {
+        return faction.isSafeZone() ||
+                faction.isWarZone() ||
+                faction.isWilderness();
+    }
 
     public static void checkTaskState() {
         if (flyMap.isEmpty()) {
@@ -189,7 +187,7 @@ public class CmdFly extends FCommand {
         }
 
 
-        if (fme.canFlyAtLocation()) {
+        if (fme.canFlyAtLocation())
             context.doWarmUp(WarmUpUtil.Warmup.FLIGHT, TL.WARMUPS_NOTIFY_FLIGHT, "Fly", () -> {
                 fme.setFlying(true);
                 flyMap.put(fme.getPlayer().getName(), true);
@@ -201,9 +199,6 @@ public class CmdFly extends FCommand {
                     startFlyCheck();
                 }
             }, FactionsPlugin.getInstance().getConfig().getLong("warmups.f-fly", 0));
-        } else {
-            fme.msg(TL.COMMAND_FLY_NO_ACCESS, Board.getInstance().getFactionAt(fme.getLastStoodAt()).getTag());
-        }
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/CmdFocus.java

@@ -7,11 +7,6 @@ import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdFocus extends FCommand {
-
-    /**
-     * @author Driftay
-     */
-
     public CmdFocus() {
         aliases.add("focus");
 
@@ -26,7 +21,7 @@ public class CmdFocus extends FCommand {
     @Override
     public void perform(CommandContext context) {
         if (!FactionsPlugin.getInstance().getConfig().getBoolean("ffocus.Enabled")) {
-            context.msg(TL.GENERIC_DISABLED, "Faction Focus");
+            context.msg(TL.GENERIC_DISABLED);
             return;
         }
         FPlayer target = context.argAsFPlayer(0);

src/main/java/com/massivecraft/factions/cmd/CmdGetVault.java

@@ -9,11 +9,6 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
 public class CmdGetVault extends FCommand {
-
-    /**
-     * @author Illyria Team
-     */
-
     public CmdGetVault() {
         super();
         this.aliases.add("getvault");
@@ -27,7 +22,7 @@ public class CmdGetVault extends FCommand {
     @Override
     public void perform(CommandContext context) {
         if (!FactionsPlugin.getInstance().getConfig().getBoolean("fvault.Enabled")) {
-            context.fPlayer.msg(TL.GENERIC_DISABLED, "Faction Vaults");
+            context.fPlayer.sendMessage("This command is disabled!");
             return;
         }
         Location vaultLocation = context.faction.getVault();
@@ -47,9 +42,9 @@ public class CmdGetVault extends FCommand {
             return;
         }
 
-        if (!context.fPlayer.takeMoney(amount)) {return;}
 
         //success :)
+        context.fPlayer.takeMoney(amount);
         context.player.getInventory().addItem(vault);
         context.fPlayer.msg(TL.COMMAND_GETVAULT_RECEIVE);
 

src/main/java/com/massivecraft/factions/cmd/CmdHelp.java

@@ -13,10 +13,6 @@ import java.util.List;
 
 public class CmdHelp extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public ArrayList<ArrayList<String>> helpPages;
 
     public CmdHelp() {

src/main/java/com/massivecraft/factions/cmd/CmdHome.java

@@ -20,10 +20,6 @@ import java.util.List;
 
 public class CmdHome extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdHome() {
         super();
         this.aliases.add("home");

src/main/java/com/massivecraft/factions/cmd/CmdInspect.java

@@ -4,11 +4,6 @@ import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdInspect extends FCommand {
-
-    /**
-     * @author Illyria Team
-     */
-
     public CmdInspect() {
         super();
         this.aliases.add("inspect");

src/main/java/com/massivecraft/factions/cmd/CmdInventorySee.java

@@ -16,10 +16,6 @@ import java.util.Objects;
 
 public class CmdInventorySee extends FCommand {
 
-    /**
-     * @author Driftay
-     */
-
     public CmdInventorySee() {
         super();
 
@@ -36,7 +32,7 @@ public class CmdInventorySee extends FCommand {
     @Override
     public void perform(CommandContext context) {
         if (!FactionsPlugin.getInstance().getConfig().getBoolean("f-inventory-see.Enabled")) {
-            context.msg(TL.GENERIC_DISABLED, "Inventory See");
+            context.msg(TL.GENERIC_DISABLED);
             return;
         }
 

src/main/java/com/massivecraft/factions/cmd/CmdInvite.java

@@ -3,9 +3,7 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FactionsPlugin;
-import com.massivecraft.factions.cmd.audit.FLogType;
 import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.util.CC;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
 import mkremins.fanciful.FancyMessage;
@@ -13,10 +11,6 @@ import org.bukkit.ChatColor;
 
 public class CmdInvite extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdInvite() {
         super();
         this.aliases.add("invite");
@@ -70,10 +64,11 @@ public class CmdInvite extends FCommand {
                     .command("/" + Conf.baseCommandAliases.get(0) + " join " + context.faction.getTag())
                     .then(context.faction.describeTo(target)).tooltip(TL.COMMAND_INVITE_CLICKTOJOIN.toString())
                     .command("/" + Conf.baseCommandAliases.get(0) + " join " + context.faction.getTag());
+
             message.send(target.getPlayer());
         }
+
         context.faction.msg(TL.COMMAND_INVITE_INVITED, context.fPlayer.describeTo(context.faction, true), target.describeTo(context.faction));
-        FactionsPlugin.instance.logFactionEvent(context.faction, FLogType.INVITES, context.fPlayer.getName(), CC.Green + "invited", target.getName());
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/CmdJoin.java

@@ -1,25 +1,14 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.*;
-import com.massivecraft.factions.cmd.audit.FLogType;
-import com.massivecraft.factions.discord.Discord;
 import com.massivecraft.factions.event.FPlayerJoinEvent;
 import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.util.CC;
 import com.massivecraft.factions.zcore.fupgrades.UpgradeType;
 import com.massivecraft.factions.zcore.util.TL;
-import net.dv8tion.jda.core.entities.Member;
-import net.dv8tion.jda.core.exceptions.HierarchyException;
 import org.bukkit.Bukkit;
 
-import java.util.Objects;
-
 public class CmdJoin extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdJoin() {
         super();
         this.aliases.add("join");
@@ -127,19 +116,7 @@ public class CmdJoin extends FCommand {
         }
 
         faction.deinvite(fplayer);
-        try {
+        context.fPlayer.setRole(faction.getDefaultRole());
-            context.fPlayer.setRole(faction.getDefaultRole());
-            FactionsPlugin.instance.logFactionEvent(faction, FLogType.INVITES, context.fPlayer.getName(), CC.Green + "joined", "the faction");
-            if (Discord.useDiscord && context.fPlayer.discordSetup() && Discord.isInMainGuild(context.fPlayer.discordUser()) && Discord.mainGuild != null) {
-                Member m = Discord.mainGuild.getMember(context.fPlayer.discordUser());
-                if (Conf.factionRoles) {
-                    Discord.mainGuild.getController().addSingleRoleToMember(m, Objects.requireNonNull(Discord.createFactionRole(faction.getTag()))).queue();
-                }
-                if (Conf.factionDiscordTags) {
-                    Discord.mainGuild.getController().setNickname(m, Discord.getNicknameString(context.fPlayer)).queue();
-                }
-            }
-        } catch (HierarchyException e) {System.out.print(e.getMessage());}
 
         if (Conf.logFactionJoin) {
             if (samePlayer) {

src/main/java/com/massivecraft/factions/cmd/CmdKick.java

@@ -4,11 +4,9 @@ import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FactionsPlugin;
-import com.massivecraft.factions.cmd.audit.FLogType;
 import com.massivecraft.factions.event.FPlayerLeaveEvent;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
-import com.massivecraft.factions.util.CC;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
 import mkremins.fanciful.FancyMessage;
@@ -18,10 +16,6 @@ import org.bukkit.command.ConsoleCommandSender;
 
 public class CmdKick extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdKick() {
         super();
         this.aliases.add("kick");
@@ -124,7 +118,6 @@ public class CmdKick extends FCommand {
         if (toKick.getRole() == Role.LEADER) {
             toKickFaction.promoteNewLeader();
         }
-        FactionsPlugin.instance.logFactionEvent(toKickFaction, FLogType.INVITES, context.fPlayer.getName(), CC.Red + "kicked", toKick.getName());
         toKickFaction.deinvite(toKick);
         toKick.resetFactionData();
     }

src/main/java/com/massivecraft/factions/cmd/CmdKillHolograms.java

@@ -4,11 +4,6 @@ import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdKillHolograms extends FCommand {
-
-    /**
-     * @author Illyria Team
-     */
-
     public CmdKillHolograms() {
         super();
         this.aliases.add("killholos");

src/main/java/com/massivecraft/factions/cmd/CmdLeave.java

@@ -1,16 +1,10 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
-import org.bukkit.ChatColor;
 
 public class CmdLeave extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdLeave() {
         super();
         this.aliases.add("leave");

src/main/java/com/massivecraft/factions/cmd/CmdList.java

@@ -14,10 +14,6 @@ import java.util.List;
 
 public class CmdList extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     private String[] defaults = new String[3];
 
     public CmdList() {
@@ -43,76 +39,74 @@ public class CmdList extends FCommand {
         // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
         if (!context.payForCommand(Conf.econCostList, "to list the factions", "for listing the factions"))
             return;
-        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
 
-            ArrayList<Faction> factionList = Factions.getInstance().getAllFactions();
+        ArrayList<Faction> factionList = Factions.getInstance().getAllFactions();
-            factionList.remove(Factions.getInstance().getWilderness());
+        factionList.remove(Factions.getInstance().getWilderness());
-            factionList.remove(Factions.getInstance().getSafeZone());
+        factionList.remove(Factions.getInstance().getSafeZone());
-            factionList.remove(Factions.getInstance().getWarZone());
+        factionList.remove(Factions.getInstance().getWarZone());
 
-            // remove exempt factions
+        // remove exempt factions
-            if (context.fPlayer != null && context.fPlayer.getPlayer() != null && !context.fPlayer.getPlayer().hasPermission("factions.show.bypassexempt")) {
+        if (context.fPlayer != null && context.fPlayer.getPlayer() != null && !context.fPlayer.getPlayer().hasPermission("factions.show.bypassexempt")) {
-                List<String> exemptFactions = FactionsPlugin.getInstance().getConfig().getStringList("show-exempt");
+            List<String> exemptFactions = FactionsPlugin.getInstance().getConfig().getStringList("show-exempt");
 
-                factionList.removeIf(next -> exemptFactions.contains(next.getTag()));
+            factionList.removeIf(next -> exemptFactions.contains(next.getTag()));
+        }
+
+        // Sort by total followers first
+        factionList.sort((f1, f2) -> {
+            int f1Size = f1.getFPlayers().size();
+            int f2Size = f2.getFPlayers().size();
+            if (f1Size < f2Size) {
+                return 1;
+            } else if (f1Size > f2Size) {
+                return -1;
             }
-
+            return 0;
-            // Sort by total followers first
-            factionList.sort((f1, f2) -> {
-                int f1Size = f1.getFPlayers().size();
-                int f2Size = f2.getFPlayers().size();
-                if (f1Size < f2Size) {
-                    return 1;
-                } else if (f1Size > f2Size) {
-                    return -1;
-                }
-                return 0;
-            });
-
-            // Then sort by how many members are online now
-            factionList.sort((f1, f2) -> {
-                int f1Size = f1.getFPlayersWhereOnline(true).size();
-                int f2Size = f2.getFPlayersWhereOnline(true).size();
-                if (f1Size < f2Size) {
-                    return 1;
-                } else if (f1Size > f2Size) {
-                    return -1;
-                }
-                return 0;
-            });
-
-            ArrayList<String> lines = new ArrayList<>();
-
-            factionList.add(0, Factions.getInstance().getWilderness());
-
-            final int pageheight = 9;
-            int pagenumber = context.argAsInt(0, 1);
-            int pagecount = (factionList.size() / pageheight) + 1;
-            if (pagenumber > pagecount) {
-                pagenumber = pagecount;
-            } else if (pagenumber < 1) {
-                pagenumber = 1;
-            }
-            int start = (pagenumber - 1) * pageheight;
-            int end = start + pageheight;
-            if (end > factionList.size()) {
-                end = factionList.size();
-            }
-
-
-            String header = FactionsPlugin.getInstance().getConfig().getString("list.header", defaults[0]);
-            header = header.replace("{pagenumber}", String.valueOf(pagenumber)).replace("{pagecount}", String.valueOf(pagecount));
-            lines.add(FactionsPlugin.getInstance().txt.parse(header));
-
-            for (Faction faction : factionList.subList(start, end)) {
-                if (faction.isWilderness()) {
-                    lines.add(FactionsPlugin.getInstance().txt.parse(TagUtil.parsePlain(faction, FactionsPlugin.getInstance().getConfig().getString("list.factionless", defaults[1]))));
-                    continue;
-                }
-                lines.add(FactionsPlugin.getInstance().txt.parse(TagUtil.parsePlain(faction, context.fPlayer, FactionsPlugin.getInstance().getConfig().getString("list.entry", defaults[2]))));
-            }
-            context.sendMessage(lines);
         });
+
+        // Then sort by how many members are online now
+        factionList.sort((f1, f2) -> {
+            int f1Size = f1.getFPlayersWhereOnline(true).size();
+            int f2Size = f2.getFPlayersWhereOnline(true).size();
+            if (f1Size < f2Size) {
+                return 1;
+            } else if (f1Size > f2Size) {
+                return -1;
+            }
+            return 0;
+        });
+
+        ArrayList<String> lines = new ArrayList<>();
+
+        factionList.add(0, Factions.getInstance().getWilderness());
+
+        final int pageheight = 9;
+        int pagenumber = context.argAsInt(0, 1);
+        int pagecount = (factionList.size() / pageheight) + 1;
+        if (pagenumber > pagecount) {
+            pagenumber = pagecount;
+        } else if (pagenumber < 1) {
+            pagenumber = 1;
+        }
+        int start = (pagenumber - 1) * pageheight;
+        int end = start + pageheight;
+        if (end > factionList.size()) {
+            end = factionList.size();
+        }
+
+
+        String header = FactionsPlugin.getInstance().getConfig().getString("list.header", defaults[0]);
+        header = header.replace("{pagenumber}", String.valueOf(pagenumber)).replace("{pagecount}", String.valueOf(pagecount));
+        lines.add(FactionsPlugin.getInstance().txt.parse(header));
+
+        for (Faction faction : factionList.subList(start, end)) {
+            if (faction.isWilderness()) {
+                lines.add(FactionsPlugin.getInstance().txt.parse(TagUtil.parsePlain(faction, FactionsPlugin.getInstance().getConfig().getString("list.factionless", defaults[1]))));
+                continue;
+            }
+            lines.add(FactionsPlugin.getInstance().txt.parse(TagUtil.parsePlain(faction, context.fPlayer, FactionsPlugin.getInstance().getConfig().getString("list.entry", defaults[2]))));
+        }
+        context.sendMessage(lines);
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/CmdLock.java

@@ -6,10 +6,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdLock extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     // TODO: This solution needs refactoring.
     /*
        factions.lock:

src/main/java/com/massivecraft/factions/cmd/CmdLogins.java

@@ -5,10 +5,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdLogins extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdLogins() {
         super();
         this.aliases.add("login");

src/main/java/com/massivecraft/factions/cmd/CmdLookup.java

@@ -1,54 +0,0 @@
-package com.massivecraft.factions.cmd;
-
-import com.massivecraft.factions.Board;
-import com.massivecraft.factions.FLocation;
-import com.massivecraft.factions.Faction;
-import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.zcore.util.TL;
-
-import java.text.DecimalFormat;
-import java.util.Set;
-
-/**
- * @author Saser
- */
-public class CmdLookup extends FCommand {
-
-    private DecimalFormat format = new DecimalFormat("#.#");
-
-    public CmdLookup() {
-        super();
-        this.aliases.add("lookup");
-        this.requiredArgs.add("faction name");
-
-        this.requirements = new CommandRequirements.Builder(Permission.LOOKUP)
-                .playerOnly()
-                .build();
-    }
-
-    @Override
-    public void perform(CommandContext context) {
-        Faction faction = context.argAsFaction(0);
-        if (faction == null) {
-            context.msg(TL.COMMAND_LOOKUP_INVALID);
-            return;
-        }
-        if (faction.isNormal()) {
-            if (faction.getHome() != null) {
-                context.msg(TL.COMMAND_LOOKUP_FACTION_HOME, this.format.format(faction.getHome().getX()), this.format.format(faction.getHome().getY()), this.format.format(faction.getHome().getZ()));
-            }
-            Set<FLocation> locations = Board.getInstance().getAllClaims(faction);
-            context.msg(TL.COMMAND_LOOKUP_CLAIM_COUNT, locations.size(), faction.getTag());
-            for (FLocation flocation : locations) {
-                context.msg(TL.COMMAND_LOOKUP_CLAIM_LIST, flocation.getWorldName(), flocation.getX() * 16L, flocation.getZ() * 16L);
-            }
-        } else {
-            context.msg(TL.COMMAND_LOOKUP_ONLY_NORMAL);
-        }
-    }
-
-    @Override
-    public TL getUsageTranslation() {
-        return TL.COMMAND_LOOKUP_DESCRIPTION;
-    }
-}

src/main/java/com/massivecraft/factions/cmd/CmdLowPower.java

@@ -7,10 +7,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdLowPower extends FCommand {
 
-    /**
-     * @author Illyria Team
-     */
-
     public CmdLowPower() {
         super();
         this.aliases.add("lowpower");

src/main/java/com/massivecraft/factions/cmd/CmdMap.java

@@ -9,10 +9,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdMap extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdMap() {
         super();
         this.aliases.add("map");

src/main/java/com/massivecraft/factions/cmd/CmdMapHeight.java

@@ -5,10 +5,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdMapHeight extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdMapHeight() {
         super();
 

src/main/java/com/massivecraft/factions/cmd/CmdMod.java

@@ -3,8 +3,6 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Faction;
-import com.massivecraft.factions.FactionsPlugin;
-import com.massivecraft.factions.cmd.audit.FLogType;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.zcore.util.TL;
@@ -13,10 +11,6 @@ import org.bukkit.ChatColor;
 
 public class CmdMod extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdMod() {
         super();
         this.aliases.add("mod");
@@ -34,53 +28,51 @@ public class CmdMod extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-            FPlayer you = context.argAsBestFPlayerMatch(0);
+        FPlayer you = context.argAsBestFPlayerMatch(0);
-            if (you == null) {
+        if (you == null) {
-                FancyMessage msg = new FancyMessage(TL.COMMAND_MOD_CANDIDATES.toString()).color(ChatColor.GOLD);
+            FancyMessage msg = new FancyMessage(TL.COMMAND_MOD_CANDIDATES.toString()).color(ChatColor.GOLD);
-                for (FPlayer player : context.faction.getFPlayersWhereRole(Role.NORMAL)) {
+            for (FPlayer player : context.faction.getFPlayersWhereRole(Role.NORMAL)) {
-                    String s = player.getName();
+                String s = player.getName();
-                    msg.then(s + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_MOD_CLICKTOPROMOTE.toString() + s).command("/" + Conf.baseCommandAliases.get(0) + " mod " + s);
+                msg.then(s + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_MOD_CLICKTOPROMOTE.toString() + s).command("/" + Conf.baseCommandAliases.get(0) + " mod " + s);
-                }
-
-                context.sendFancyMessage(msg);
-                return;
             }
 
-            boolean permAny = Permission.MOD_ANY.has(context.sender, false);
+            context.sendFancyMessage(msg);
-            Faction targetFaction = you.getFaction();
+            return;
-            if (targetFaction != context.faction && !permAny) {
+        }
-                context.msg(TL.COMMAND_MOD_NOTMEMBER, you.describeTo(context.fPlayer, true));
-                return;
-            }
 
-            if (context.fPlayer != null && context.fPlayer.getRole() != Role.LEADER && !permAny) {
+        boolean permAny = Permission.MOD_ANY.has(context.sender, false);
-                context.msg(TL.COMMAND_MOD_NOTADMIN);
+        Faction targetFaction = you.getFaction();
-                return;
+        if (targetFaction != context.faction && !permAny) {
-            }
+            context.msg(TL.COMMAND_MOD_NOTMEMBER, you.describeTo(context.fPlayer, true));
+            return;
+        }
 
-            if (you == context.fPlayer && !permAny) {
+        if (context.fPlayer != null && context.fPlayer.getRole() != Role.LEADER && !permAny) {
-                context.msg(TL.COMMAND_MOD_SELF);
+            context.msg(TL.COMMAND_MOD_NOTADMIN);
-                return;
+            return;
-            }
+        }
 
-            if (you.getRole() == Role.LEADER) {
+        if (you == context.fPlayer && !permAny) {
-                context.msg(TL.COMMAND_MOD_TARGETISADMIN);
+            context.msg(TL.COMMAND_MOD_SELF);
-                return;
+            return;
-            }
+        }
 
-            if (you.getRole() == Role.MODERATOR) {
+        if (you.getRole() == Role.LEADER) {
-                // Revoke
+            context.msg(TL.COMMAND_MOD_TARGETISADMIN);
-                you.setRole(Role.NORMAL);
+            return;
-                targetFaction.msg(TL.COMMAND_MOD_REVOKED, you.describeTo(targetFaction, true));
+        }
-                context.msg(TL.COMMAND_MOD_REVOKES, you.describeTo(context.fPlayer, true));
-            } else {
-                // Give
-                you.setRole(Role.MODERATOR);
-                targetFaction.msg(TL.COMMAND_MOD_PROMOTED, you.describeTo(targetFaction, true));
-                context.msg(TL.COMMAND_MOD_PROMOTES, you.describeTo(context.fPlayer, true));
-                FactionsPlugin.instance.getFlogManager().log(targetFaction, FLogType.RANK_EDIT, context.fPlayer.getName(), you.getName(), ChatColor.LIGHT_PURPLE + "Mod");
 
-            }
+        if (you.getRole() == Role.MODERATOR) {
+            // Revoke
+            you.setRole(Role.NORMAL);
+            targetFaction.msg(TL.COMMAND_MOD_REVOKED, you.describeTo(targetFaction, true));
+            context.msg(TL.COMMAND_MOD_REVOKES, you.describeTo(context.fPlayer, true));
+        } else {
+            // Give
+            you.setRole(Role.MODERATOR);
+            targetFaction.msg(TL.COMMAND_MOD_PROMOTED, you.describeTo(targetFaction, true));
+            context.msg(TL.COMMAND_MOD_PROMOTES, you.describeTo(context.fPlayer, true));
+        }
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/CmdModifyPower.java

@@ -6,10 +6,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdModifyPower extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdModifyPower() {
         super();
 

src/main/java/com/massivecraft/factions/cmd/CmdNear.java

@@ -9,11 +9,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
 public class CmdNear extends FCommand {
-
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdNear() {
         super();
         this.aliases.add("near");

src/main/java/com/massivecraft/factions/cmd/CmdOpen.java

@@ -3,17 +3,12 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayers;
-import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdOpen extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdOpen() {
         super();
         this.aliases.add("open");
@@ -28,25 +23,23 @@ public class CmdOpen extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
+        // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
-            // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
+        if (!context.payForCommand(Conf.econCostOpen, TL.COMMAND_OPEN_TOOPEN, TL.COMMAND_OPEN_FOROPEN)) {
-            if (!context.payForCommand(Conf.econCostOpen, TL.COMMAND_OPEN_TOOPEN, TL.COMMAND_OPEN_FOROPEN)) {
+            return;
-                return;
+        }
+
+        context.faction.setOpen(context.argAsBool(0, !context.faction.getOpen()));
+
+        String open = context.faction.getOpen() ? TL.COMMAND_OPEN_OPEN.toString() : TL.COMMAND_OPEN_CLOSED.toString();
+
+        // Inform
+        for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
+            if (fplayer.getFactionId().equals(context.faction.getId())) {
+                fplayer.msg(TL.COMMAND_OPEN_CHANGES, context.fPlayer.getName(), open);
+                continue;
             }
-
+            fplayer.msg(TL.COMMAND_OPEN_CHANGED, context.faction.getTag(fplayer.getFaction()), open);
-            context.faction.setOpen(context.argAsBool(0, !context.faction.getOpen()));
+        }
-
-            String open = context.faction.getOpen() ? TL.COMMAND_OPEN_OPEN.toString() : TL.COMMAND_OPEN_CLOSED.toString();
-
-            // Inform
-            for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
-                if (fplayer.getFactionId().equals(context.faction.getId())) {
-                    fplayer.msg(TL.COMMAND_OPEN_CHANGES, context.fPlayer.getName(), open);
-                    continue;
-                }
-                fplayer.msg(TL.COMMAND_OPEN_CHANGED, context.faction.getTag(fplayer.getFaction()), open);
-            }
-        });
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/CmdOwner.java

@@ -8,10 +8,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdOwner extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdOwner() {
         super();
         this.aliases.add("owner");

src/main/java/com/massivecraft/factions/cmd/CmdOwnerList.java

@@ -9,10 +9,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdOwnerList extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdOwnerList() {
         super();
         this.aliases.add("ownerlist");

src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java

@@ -6,11 +6,6 @@ import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdPaypalSee extends FCommand {
-
-    /**
-     * @author Driftay
-     */
-
     public CmdPaypalSee() {
         this.aliases.add("seepaypal");
         this.aliases.add("paypal");
@@ -25,7 +20,7 @@ public class CmdPaypalSee extends FCommand {
     @Override
     public void perform(CommandContext context) {
         if (!FactionsPlugin.getInstance().getConfig().getBoolean("fpaypal.Enabled")) {
-            context.msg(TL.GENERIC_DISABLED, "Faction Paypals");
+            context.msg(TL.GENERIC_DISABLED);
             return;
         }
 

src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java

@@ -8,10 +8,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdPaypalSet extends FCommand {
 
-    /**
-     * @author Driftay
-     */
-
     public CmdPaypalSet() {
         this.aliases.add("setpaypal");
 
@@ -29,7 +25,7 @@ public class CmdPaypalSet extends FCommand {
     @Override
     public void perform(CommandContext context) {
         if (!FactionsPlugin.getInstance().getConfig().getBoolean("fpaypal.Enabled")) {
-            context.fPlayer.msg(TL.GENERIC_DISABLED, "Faction Paypals");
+            context.fPlayer.msg(TL.GENERIC_DISABLED);
             return;
         }
         if (context.fPlayer.getRole() != Role.LEADER && !context.fPlayer.isAdminBypassing()) {

src/main/java/com/massivecraft/factions/cmd/CmdPeaceful.java

@@ -8,10 +8,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdPeaceful extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdPeaceful() {
         super();
         this.aliases.add("peaceful");

src/main/java/com/massivecraft/factions/cmd/CmdPerm.java

@@ -17,10 +17,6 @@ import java.util.Set;
 
 public class CmdPerm extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdPerm() {
         super();
         this.aliases.add("perm");

src/main/java/com/massivecraft/factions/cmd/CmdPermanent.java

@@ -10,10 +10,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdPermanent extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdPermanent() {
         super();
         this.aliases.add("permanent");

src/main/java/com/massivecraft/factions/cmd/CmdPermanentPower.java

@@ -6,11 +6,6 @@ import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdPermanentPower extends FCommand {
-
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdPermanentPower() {
         super();
         this.aliases.add("permanentpower");

src/main/java/com/massivecraft/factions/cmd/CmdPlayerTitleToggle.java

@@ -1,21 +0,0 @@
-package com.massivecraft.factions.cmd;
-
-import com.massivecraft.factions.FactionsPlugin;
-import com.massivecraft.factions.struct.Permission;
-import com.massivecraft.factions.zcore.util.TL;
-
-public class CmdPlayerTitleToggle extends FCommand {
-    public CmdPlayerTitleToggle() {
-        super();
-        this.aliases.add("titles");
-        this.requirements = new CommandRequirements.Builder(Permission.TOGGLE_TITLES)
-                .build();
-    }
-    @Override
-    public void perform(CommandContext context) {
-        context.fPlayer.setTitlesEnabled(!context.fPlayer.hasTitlesEnabled());
-        context.msg(TL.COMMAND_TITLETOGGLE_TOGGLED, context.fPlayer.hasTitlesEnabled() ? FactionsPlugin.getInstance().color("&dEnabled") : FactionsPlugin.getInstance().color("&dDisabled"));
-    }
-    @Override
-    public TL getUsageTranslation() {return TL.COMMAND_TITLETOGGLE_DESCRIPTION;}
-}

src/main/java/com/massivecraft/factions/cmd/CmdPower.java

@@ -7,10 +7,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdPower extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdPower() {
         super();
         this.aliases.add("power");

src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java

@@ -9,10 +9,6 @@ import org.bukkit.command.ConsoleCommandSender;
 
 public class CmdPowerBoost extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdPowerBoost() {
         super();
         this.aliases.add("powerboost");

src/main/java/com/massivecraft/factions/cmd/CmdReload.java

@@ -2,7 +2,6 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FactionsPlugin;
-import com.massivecraft.factions.discord.Discord;
 import com.massivecraft.factions.listeners.FactionsPlayerListener;
 import com.massivecraft.factions.shop.ShopConfig;
 import com.massivecraft.factions.struct.Permission;
@@ -10,10 +9,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdReload extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdReload() {
         super();
         this.aliases.add("reload");
@@ -31,7 +26,7 @@ public class CmdReload extends FCommand {
         FactionsPlugin.getInstance().loadLang();
 
 
-        if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight", false)) {
+        if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) {
             FactionsPlugin.getInstance().factionsFlight = true;
         }
 
@@ -39,10 +34,6 @@ public class CmdReload extends FCommand {
             FactionsPlayerListener.loadCorners();
         }
 
-        Discord.setupDiscord();
-        //Recheck if commands should truly be disabled and rebuild.
-        FCmdRoot.instance.addVariableCommands();
-        FCmdRoot.instance.rebuild();
         long timeReload = (System.currentTimeMillis() - timeInitStart);
 
         context.msg(TL.COMMAND_RELOAD_TIME, timeReload);

src/main/java/com/massivecraft/factions/cmd/CmdRules.java

@@ -8,11 +8,6 @@ import java.util.HashMap;
 import java.util.List;
 
 public class CmdRules extends FCommand {
-
-    /**
-     * @author Illyria Team
-     */
-
     public CmdRules() {
         super();
         aliases.add("r");

src/main/java/com/massivecraft/factions/cmd/CmdSB.java

@@ -6,10 +6,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSB extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdSB() {
         this.aliases.add("sb");
         this.aliases.add("scoreboard");

src/main/java/com/massivecraft/factions/cmd/CmdSaveAll.java

@@ -1,16 +1,15 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.*;
+import com.massivecraft.factions.Board;
+import com.massivecraft.factions.Conf;
+import com.massivecraft.factions.FPlayers;
+import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.shop.ShopConfig;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSaveAll extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdSaveAll() {
         super();
         this.aliases.add("saveall");
@@ -26,11 +25,6 @@ public class CmdSaveAll extends FCommand {
         Factions.getInstance().forceSave(false);
         Board.getInstance().forceSave(false);
         Conf.save();
-        try {
-            FactionsPlugin.instance.getFlogManager().saveLogs();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
         ShopConfig.saveShop();
         context.msg(TL.COMMAND_SAVEALL_SUCCESS);
     }

src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java

@@ -15,10 +15,6 @@ import java.util.HashMap;
 
 public class CmdSeeChunk extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     //Used a hashmap cuz imma make a particle selection gui later, will store it where the boolean is rn.
     public static HashMap<String, Boolean> seeChunkMap = new HashMap<>();
     private long interval;

src/main/java/com/massivecraft/factions/cmd/CmdSeeDiscord.java

@@ -7,10 +7,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSeeDiscord extends FCommand{
 
-    /**
-     * @author Driftay
-     */
-
     public CmdSeeDiscord() {
         this.aliases.add("seediscord");
         this.aliases.add("discord");
@@ -25,7 +21,7 @@ public class CmdSeeDiscord extends FCommand{
     @Override
     public void perform(CommandContext context) {
         if (!FactionsPlugin.getInstance().getConfig().getBoolean("fdiscord.Enabled")) {
-            context.msg(TL.GENERIC_DISABLED, "Faction Discords");
+            context.msg(TL.GENERIC_DISABLED);
             return;
         }
 

src/main/java/com/massivecraft/factions/cmd/CmdSetBanner.java

@@ -5,10 +5,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSetBanner extends FCommand {
 
-    /**
-     * @author Illyria Team
-     */
-
     public CmdSetBanner() {
         super();
         aliases.add("setbanner");

src/main/java/com/massivecraft/factions/cmd/CmdSetDefaultRole.java

@@ -6,10 +6,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSetDefaultRole extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdSetDefaultRole() {
         super();
 

src/main/java/com/massivecraft/factions/cmd/CmdSetDiscord.java

@@ -8,10 +8,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSetDiscord extends FCommand {
 
-    /**
-     * @author Driftay
-     */
-
     public CmdSetDiscord(){
         super();
         this.aliases.add("setdiscord");

src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java

@@ -9,11 +9,6 @@ import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSetFWarp extends FCommand {
-
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdSetFWarp() {
         this.aliases.add("setwarp");
         this.aliases.add("sw");

src/main/java/com/massivecraft/factions/cmd/CmdSetMaxVaults.java

@@ -7,10 +7,6 @@ import org.bukkit.ChatColor;
 
 public class CmdSetMaxVaults extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdSetMaxVaults() {
         this.aliases.add("setmaxvaults");
         this.aliases.add("smv");

src/main/java/com/massivecraft/factions/cmd/CmdSethome.java

@@ -7,10 +7,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSethome extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdSethome() {
         this.aliases.add("sethome");
         this.optionalArgs.put("faction tag", "mine");
@@ -24,38 +20,36 @@ public class CmdSethome extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
+        if (!Conf.homesEnabled) {
-            if (!Conf.homesEnabled) {
+            context.msg(TL.COMMAND_SETHOME_DISABLED);
-                context.msg(TL.COMMAND_SETHOME_DISABLED);
+            return;
-                return;
+        }
-            }
 
-            Faction faction = context.argAsFaction(0, context.faction);
+        Faction faction = context.argAsFaction(0, context.faction);
-            if (faction == null) {
+        if (faction == null) {
-                return;
+            return;
-            }
+        }
 
-            // Can the player set the faction home HERE?
+        // Can the player set the faction home HERE?
-            if (!Permission.BYPASS.has(context.player) &&
+        if (!Permission.BYPASS.has(context.player) &&
-                    Conf.homesMustBeInClaimedTerritory &&
+                Conf.homesMustBeInClaimedTerritory &&
-                    Board.getInstance().getFactionAt(new FLocation(context.player)) != faction) {
+                Board.getInstance().getFactionAt(new FLocation(context.player)) != faction) {
-                context.msg(TL.COMMAND_SETHOME_NOTCLAIMED);
+            context.msg(TL.COMMAND_SETHOME_NOTCLAIMED);
-                return;
+            return;
-            }
+        }
 
-            // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
+        // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
-            if (!context.payForCommand(Conf.econCostSethome, TL.COMMAND_SETHOME_TOSET, TL.COMMAND_SETHOME_FORSET)) {
+        if (!context.payForCommand(Conf.econCostSethome, TL.COMMAND_SETHOME_TOSET, TL.COMMAND_SETHOME_FORSET)) {
-                return;
+            return;
-            }
+        }
 
-            faction.setHome(context.player.getLocation());
+        faction.setHome(context.player.getLocation());
 
-            faction.msg(TL.COMMAND_SETHOME_SET, context.fPlayer.describeTo(context.faction, true));
+        faction.msg(TL.COMMAND_SETHOME_SET, context.fPlayer.describeTo(context.faction, true));
-            faction.sendMessage(FactionsPlugin.getInstance().cmdBase.cmdHome.getUsageTemplate(context));
+        faction.sendMessage(FactionsPlugin.getInstance().cmdBase.cmdHome.getUsageTemplate(context));
-            if (faction != context.faction) {
+        if (faction != context.faction) {
-                context.msg(TL.COMMAND_SETHOME_SETOTHER, faction.getTag(context.fPlayer));
+            context.msg(TL.COMMAND_SETHOME_SETOTHER, faction.getTag(context.fPlayer));
-            }
+        }
-        });
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/CmdShow.java

@@ -14,10 +14,6 @@ import java.util.List;
 
 public class CmdShow extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     List<String> defaults = new ArrayList<>();
 
     public CmdShow() {

src/main/java/com/massivecraft/factions/cmd/CmdShowClaims.java

@@ -8,10 +8,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdShowClaims extends FCommand {
 
-    /**
-     * @author Illyria Team
-     */
-
     public CmdShowClaims() {
         this.aliases.add("showclaims");
         this.aliases.add("showclaim");

src/main/java/com/massivecraft/factions/cmd/CmdShowInvites.java

@@ -3,7 +3,6 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayers;
-import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 import mkremins.fanciful.FancyMessage;
@@ -11,10 +10,6 @@ import org.bukkit.ChatColor;
 
 public class CmdShowInvites extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdShowInvites() {
         super();
         aliases.add("showinvites");
@@ -28,12 +23,14 @@ public class CmdShowInvites extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-            FancyMessage msg = new FancyMessage(TL.COMMAND_SHOWINVITES_PENDING.toString()).color(ChatColor.GOLD);
+        FancyMessage msg = new FancyMessage(TL.COMMAND_SHOWINVITES_PENDING.toString()).color(ChatColor.GOLD);
-            for (String id : context.faction.getInvites()) {
+        for (String id : context.faction.getInvites()) {
-                FPlayer fp = FPlayers.getInstance().getById(id);
+            FPlayer fp = FPlayers.getInstance().getById(id);
-                String name = fp != null ? fp.getName() : id;
+            String name = fp != null ? fp.getName() : id;
-                msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_SHOWINVITES_CLICKTOREVOKE.format(name)).command("/" + Conf.baseCommandAliases.get(0) + " deinvite " + name);
+            msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_SHOWINVITES_CLICKTOREVOKE.format(name)).command("/" + Conf.baseCommandAliases.get(0) + " deinvite " + name);
-            }
+        }
+
+        context.sendFancyMessage(msg);
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/CmdSpawnerLock.java

@@ -7,10 +7,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSpawnerLock extends FCommand {
 
-    /**
-     * @author Illyria Team
-     */
-
     public CmdSpawnerLock(){
         super();
         this.aliases.add("lockspawners");

src/main/java/com/massivecraft/factions/cmd/CmdStatus.java

@@ -10,10 +10,6 @@ import java.util.ArrayList;
 
 public class CmdStatus extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdStatus() {
         super();
         this.aliases.add("status");

src/main/java/com/massivecraft/factions/cmd/CmdStealth.java

@@ -4,11 +4,6 @@ import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdStealth extends FCommand {
-
-    /**
-     * @author Driftay
-     */
-
     public CmdStealth() {
         this.aliases.add("ninja");
         this.aliases.add("stealth");

src/main/java/com/massivecraft/factions/cmd/CmdStrikes.java

@@ -6,9 +6,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdStrikes extends FCommand {
 
-    /**
-     * @author Driftay
-     */
 
     public CmdStrikesGive cmdStrikesGive = new CmdStrikesGive();
     public CmdStrikesInfo cmdStrikesInfo = new CmdStrikesInfo();

src/main/java/com/massivecraft/factions/cmd/CmdStrikesGive.java

@@ -6,9 +6,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdStrikesGive extends FCommand {
 
-    /**
-     * @author Driftay
-     */
 
     public CmdStrikesGive() {
         super();

src/main/java/com/massivecraft/factions/cmd/CmdStrikesInfo.java

@@ -6,10 +6,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdStrikesInfo extends FCommand {
 
-    /**
-     * @author Driftay
-     */
-
     public CmdStrikesInfo() {
         super();
         this.aliases.add("info");

src/main/java/com/massivecraft/factions/cmd/CmdStrikesSet.java

@@ -6,10 +6,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdStrikesSet extends FCommand {
 
-    /**
-     * @author Driftay
-     */
-
     public CmdStrikesSet() {
         super();
         this.aliases.add("set");

src/main/java/com/massivecraft/factions/cmd/CmdStrikesTake.java

@@ -6,9 +6,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdStrikesTake extends FCommand {
 
-    /**
-     * @author Driftay
-     */
 
     public CmdStrikesTake() {
         super();

src/main/java/com/massivecraft/factions/cmd/CmdStuck.java

@@ -13,10 +13,6 @@ import org.bukkit.entity.Player;
 
 public class CmdStuck extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdStuck() {
         super();
         this.aliases.add("stuck");

src/main/java/com/massivecraft/factions/cmd/CmdTag.java

@@ -1,8 +1,6 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.*;
-import com.massivecraft.factions.cmd.audit.FLogType;
-import com.massivecraft.factions.discord.Discord;
 import com.massivecraft.factions.event.FactionRenameEvent;
 import com.massivecraft.factions.scoreboards.FTeamWrapper;
 import com.massivecraft.factions.struct.Permission;
@@ -15,10 +13,6 @@ import java.util.ArrayList;
 
 public class CmdTag extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdTag() {
         this.aliases.add("tag");
         this.aliases.add("rename");
@@ -34,59 +28,55 @@ public class CmdTag extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
+        String tag = context.argAsString(0);
 
-            String tag = context.argAsString(0);
+        // TODO does not first test cover selfcase?
+        if (Factions.getInstance().isTagTaken(tag) && !MiscUtil.getComparisonString(tag).equals(context.faction.getComparisonTag())) {
+            context.msg(TL.COMMAND_TAG_TAKEN);
+            return;
+        }
 
-            // TODO does not first test cover selfcase?
+        ArrayList<String> errors = MiscUtil.validateTag(tag);
-            if (Factions.getInstance().isTagTaken(tag) && !MiscUtil.getComparisonString(tag).equals(context.faction.getComparisonTag())) {
+        if (errors.size() > 0) {
-                context.msg(TL.COMMAND_TAG_TAKEN);
+            context.sendMessage(errors);
-                return;
+            return;
+        }
+
+        // if economy is enabled, they're not on the bypass list, and this command has a cost set, make sure they can pay
+        if (!context.canAffordCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE.toString())) {
+            return;
+        }
+
+        // trigger the faction rename event (cancellable)
+        FactionRenameEvent renameEvent = new FactionRenameEvent(context.fPlayer, tag);
+        Bukkit.getServer().getPluginManager().callEvent(renameEvent);
+        if (renameEvent.isCancelled()) {
+            return;
+        }
+
+        // then make 'em pay (if applicable)
+        if (!context.payForCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE, TL.COMMAND_TAG_FORCHANGE)) {
+            return;
+        }
+
+        String oldtag = context.faction.getTag();
+        context.faction.setTag(tag);
+
+        // Inform
+        for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
+            if (fplayer.getFactionId().equals(context.faction.getId())) {
+                fplayer.msg(TL.COMMAND_TAG_FACTION, context.fPlayer.describeTo(context.faction, true), context.faction.getTag(context.faction));
+                continue;
             }
 
-            ArrayList<String> errors = MiscUtil.validateTag(tag);
+            // Broadcast the tag change (if applicable)
-            if (errors.size() > 0) {
+            if (Conf.broadcastTagChanges) {
-                context.sendMessage(errors);
+                Faction faction = fplayer.getFaction();
-                return;
+                fplayer.msg(TL.COMMAND_TAG_CHANGED, context.fPlayer.getColorTo(faction) + oldtag, context.faction.getTag(faction));
             }
+        }
 
-            // if economy is enabled, they're not on the bypass list, and this command has a cost set, make sure they can pay
+        FTeamWrapper.updatePrefixes(context.faction);
-            if (!context.canAffordCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE.toString())) {
-                return;
-            }
-
-            // trigger the faction rename event (cancellable)
-            FactionRenameEvent renameEvent = new FactionRenameEvent(context.fPlayer, tag);
-            Bukkit.getServer().getPluginManager().callEvent(renameEvent);
-            if (renameEvent.isCancelled()) {
-                return;
-            }
-
-            // then make 'em pay (if applicable)
-            if (!context.payForCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE, TL.COMMAND_TAG_FORCHANGE)) {
-                return;
-            }
-
-            String oldtag = context.faction.getTag();
-            context.faction.setTag(tag);
-            Discord.changeFactionTag(context.faction, oldtag);
-            FactionsPlugin.instance.logFactionEvent(context.faction, FLogType.FTAG_EDIT, context.fPlayer.getName(), tag);
-
-
-            // Inform
-            for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
-                if (fplayer.getFactionId().equals(context.faction.getId())) {
-                    fplayer.msg(TL.COMMAND_TAG_FACTION, context.fPlayer.describeTo(context.faction, true), context.faction.getTag(context.faction));
-                    continue;
-                }
-                // Broadcast the tag change (if applicable)
-                if (Conf.broadcastTagChanges) {
-                    Faction faction = fplayer.getFaction();
-                    fplayer.msg(TL.COMMAND_TAG_CHANGED, context.fPlayer.getColorTo(faction) + oldtag, context.faction.getTag(faction));
-                }
-            }
-            FTeamWrapper.updatePrefixes(context.faction);
-        });
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/CmdTitle.java

@@ -2,17 +2,12 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
-import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 import com.massivecraft.factions.zcore.util.TextUtil;
 
 public class CmdTitle extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdTitle() {
         this.aliases.add("title");
         this.requiredArgs.add("player name");
@@ -25,19 +20,16 @@ public class CmdTitle extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
+        FPlayer you = context.argAsBestFPlayerMatch(0);
-            FPlayer you = context.argAsBestFPlayerMatch(0);
+        if (you == null) return;
-            if (you == null) return;
+        context.args.remove(0);
-            context.args.remove(0);
+        String title = TextUtil.implode(context.args, " ");
-            String title = TextUtil.implode(context.args, " ");
+        if (!context.canIAdministerYou(context.fPlayer, you)) return;
-            if (!context.canIAdministerYou(context.fPlayer, you)) return;
+        // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
-            // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
+        if (!context.payForCommand(Conf.econCostTitle, TL.COMMAND_TITLE_TOCHANGE, TL.COMMAND_TITLE_FORCHANGE)) return;
-            if (!context.payForCommand(Conf.econCostTitle, TL.COMMAND_TITLE_TOCHANGE, TL.COMMAND_TITLE_FORCHANGE))
+        you.setTitle(context.sender, title);
-                return;
+        // Inform
-            you.setTitle(context.sender, title);
+        context.faction.msg(TL.COMMAND_TITLE_CHANGED, context.fPlayer.describeTo(context.faction, true), you.describeTo(context.faction, true));
-            // Inform
-            context.faction.msg(TL.COMMAND_TITLE_CHANGED, context.fPlayer.describeTo(context.faction, true), you.describeTo(context.faction, true));
-        });
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/CmdToggleAllianceChat.java

@@ -6,10 +6,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdToggleAllianceChat extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdToggleAllianceChat() {
         super();
         this.aliases.add("tac");

src/main/java/com/massivecraft/factions/cmd/CmdTop.java

@@ -12,10 +12,6 @@ import java.util.ArrayList;
 
 public class CmdTop extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdTop() {
         super();
         this.aliases.add("top");

src/main/java/com/massivecraft/factions/cmd/CmdTpBanner.java

@@ -9,10 +9,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdTpBanner extends FCommand {
 
-    /**
-     * @author Illyria Team
-     */
-
     public CmdTpBanner() {
         super();
         this.aliases.add("tpbanner");
@@ -29,6 +25,8 @@ public class CmdTpBanner extends FCommand {
             return;
         }
 
+        final FactionsPlayerListener fpl = new FactionsPlayerListener();
+
         if (FactionsBlockListener.bannerLocations.containsKey(context.fPlayer.getTag())) {
             context.msg(TL.COMMAND_TPBANNER_SUCCESS);
             context.doWarmUp(WarmUpUtil.Warmup.BANNER, TL.WARMUPS_NOTIFY_TELEPORT, "Banner", () -> {

src/main/java/com/massivecraft/factions/cmd/CmdUnban.java

@@ -8,10 +8,6 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdUnban extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdUnban() {
         super();
         this.aliases.add("unban");

src/main/java/com/massivecraft/factions/cmd/CmdUpgrades.java

@@ -6,11 +6,6 @@ import com.massivecraft.factions.zcore.fupgrades.FUpgradesGUI;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdUpgrades extends FCommand {
-
-    /**
-     * @author Illyria Team
-     */
-
     public CmdUpgrades() {
         super();
         this.aliases.add("upgrades");
@@ -26,7 +21,7 @@ public class CmdUpgrades extends FCommand {
     @Override
     public void perform(CommandContext context) {
         if (!FactionsPlugin.getInstance().getConfig().getBoolean("fupgrades.Enabled")) {
-            context.fPlayer.msg(TL.COMMAND_UPGRADES_DISABLED);
+            context.fPlayer.sendMessage("This command is disabled!");
             return;
         }
         new FUpgradesGUI().openMainMenu(context.fPlayer);

src/main/java/com/massivecraft/factions/cmd/CmdVault.java

@@ -13,10 +13,6 @@ import org.bukkit.inventory.Inventory;
 
 public class CmdVault extends FCommand {
 
-    /**
-     * @author Illyria Team
-     */
-
     public CmdVault() {
         this.aliases.add("vault");
 
@@ -32,7 +28,7 @@ public class CmdVault extends FCommand {
     public void perform(CommandContext context) {
 
         if (!FactionsPlugin.getInstance().getConfig().getBoolean("fvault.Enabled")) {
-            context.fPlayer.msg(TL.GENERIC_DISABLED, "Faction Vaults");
+            context.fPlayer.sendMessage("This command is disabled!");
             return;
         }