more audit things

P.S HardCoded for Beta Testing :D

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-2.2.6-RC</version>
+    <version>1.6.9.5-U0.2.1-2.1.0-BETA</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>
@@ -385,12 +381,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>com.mojang</groupId>
-            <artifactId>authlib</artifactId>
-            <version>1.5.21</version>
-            <scope>compile</scope>
-        </dependency>
         <dependency>
             <groupId>me.rayzr522</groupId>
             <artifactId>jsonmessage</artifactId>
@@ -411,10 +401,6 @@
             <name>bintray</name>
             <url>http://jcenter.bintray.com</url>
         </repository>
-        <repository>
-            <id>mojang-repo</id>
-            <url>https://libraries.minecraft.net/</url>
-        </repository>
         <repository>
             <id>net.coreprotect</id>
             <url>http://maven.playpro.com/</url>

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,34 +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;
-    //RESERVE
-    public static boolean useReserveSystem = true;
-    //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;
@@ -243,7 +220,10 @@ public class Conf {
     public static boolean ownedMessageInsideTerritory = true;
     public static boolean ownedMessageByChunk = false;
     public static boolean pistonProtectionThroughDenyBuild = true;
+
+    //logs
     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);
@@ -259,6 +239,7 @@ public class Conf {
 
     public static Set<Material> territoryCancelAndAllowItemUseMaterial = new HashSet<>();
     public static Set<Material> territoryDenySwitchMaterials = new HashSet<>();
+    public static Set<Material> territoryBypasssProtectedMaterials = EnumSet.noneOf(Material.class);
     public static boolean allowCreeperEggingChests = true;
 
     // Economy settings
@@ -559,6 +540,7 @@ 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));

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

@@ -14,6 +14,7 @@ import java.util.Set;
 public class FLocation implements Serializable {
     private static final long serialVersionUID = -8292915234027387983L;
     private static final boolean worldBorderSupport;
+
     static {
         boolean worldBorderClassPresent = false;
         try {
@@ -21,6 +22,7 @@ public class FLocation implements Serializable {
             worldBorderClassPresent = true;
         } catch (ClassNotFoundException ignored) {
         }
+
         worldBorderSupport = worldBorderClassPresent;
     }
 
@@ -43,7 +45,7 @@ public class FLocation implements Serializable {
     }
 
     public FLocation(Location location) {
-        this(Objects.requireNonNull(location.getWorld()).getName(), blockToChunk(location.getBlockX()), blockToChunk(location.getBlockZ()));
+        this(location.getWorld().getName(), blockToChunk(location.getBlockX()), blockToChunk(location.getBlockZ()));
     }
 
     public FLocation(Player player) {
@@ -68,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);
     }
 
@@ -150,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
     //----------------------------------------------//
@@ -178,9 +178,9 @@ public class FLocation implements Serializable {
     }
 
     public boolean isInChunk(Location loc) {
-        if(loc == null) return false;
+        if (loc == null) {
-        if(loc.getWorld() == null) return false;
+            return false;
-
+        }
         Chunk chunk = loc.getChunk();
         return loc.getWorld().getName().equalsIgnoreCase(getWorldName()) && chunk.getX() == x && chunk.getZ() == z;
     }
@@ -192,23 +192,18 @@ public class FLocation implements Serializable {
      * @return whether this location is outside of the border
      */
     public boolean isOutsideWorldBorder(int buffer) {
-        if (!worldBorderSupport) return false;
+        if (!worldBorderSupport) {
+            return false;
+        }
+
         WorldBorder border = getWorld().getWorldBorder();
-        Location center = border.getCenter();
+        Chunk chunk = border.getCenter().getChunk();
-        double size = border.getSize();
 
-        int bufferBlocks = buffer << 4;
+        int lim = FLocation.chunkToRegion((int) border.getSize()) - buffer;
+        int diffX = chunk.getX() - x;
+        int diffZ = chunk.getZ() - z;
 
-        double borderMinX = (center.getX() - size / 2.0D) + bufferBlocks;
+        return (diffX > lim || diffZ > lim) || (-diffX >= lim || -diffZ >= lim);
-        double borderMinZ = (center.getZ() - size / 2.0D) + bufferBlocks;
-        double borderMaxX = (center.getX() + size / 2.0D) - bufferBlocks;
-        double borderMaxZ = (center.getZ() + size / 2.0D) - bufferBlocks;
-
-        int chunkMinX = this.x << 4;
-        int chunkMaxX = chunkMinX | 15;
-        int chunkMinZ = this.z << 4;
-        int chunkMaxZ = chunkMinZ | 15;
-        return (chunkMinX >= borderMaxX) || (chunkMinZ >= borderMaxZ) || (chunkMaxX <= borderMinX) || (chunkMaxZ <= borderMinZ);
     }
 
     //----------------------------------------------//
@@ -218,7 +213,10 @@ public class FLocation implements Serializable {
         double radiusSquared = radius * radius;
 
         Set<FLocation> ret = new LinkedHashSet<>();
-        if (radius <= 0) return ret;
+        if (radius <= 0) {
+            return ret;
+        }
+
         int xfrom = (int) Math.floor(this.x - radius);
         int xto = (int) Math.ceil(this.x + radius);
         int zfrom = (int) Math.floor(this.z - radius);
@@ -232,6 +230,7 @@ public class FLocation implements Serializable {
                 }
             }
         }
+
         return ret;
     }
 
@@ -245,10 +244,19 @@ public class FLocation implements Serializable {
         return (this.x << 9) + this.z + (this.worldName != null ? this.worldName.hashCode() : 0);
     }
 
+    public String formatXAndZ(String splitter) {
+        return chunkToBlock(this.x) + "x" + splitter + " " + chunkToBlock(this.z) + "z";
+    }
+
     @Override
     public boolean equals(Object obj) {
-        if (obj == this) return true;
+        if (obj == this) {
-        if (!(obj instanceof FLocation)) return false;
+            return true;
+        }
+        if (!(obj instanceof FLocation)) {
+            return false;
+        }
+
         FLocation that = (FLocation) obj;
         return this.x == that.x && this.z == that.z && (Objects.equals(this.worldName, that.worldName));
     }

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,49 +30,6 @@ public interface FPlayer extends EconomyParticipator {
 
     boolean hasNotificationsEnabled();
 
-    /**
-     * Determine if a player has enemies nearby based on the enemy check task in CmdFly
-     * NOTE: THIS VALUE IS ONLY UPDATED WHEN A USER IS USING FLY
-     * @return enemiesNearby as a boolean
-     */
-    boolean hasEnemiesNearby();
-
-    /**
-     * Set if this FPlayer has an enemy nearby
-     * @param b enemiesNearby
-     */
-    void setEnemiesNearby(Boolean b);
-
-    /**
-     * 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
@@ -274,7 +230,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

@@ -441,7 +441,4 @@ public interface Faction extends EconomyParticipator {
 
     void paypalSet(String paypal);
 
-    // -------------------------------
-    // Shields
-    // -------------------------------
 }

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

@@ -4,21 +4,21 @@ import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAddon;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
-import com.massivecraft.factions.cmd.*;
+import com.massivecraft.factions.cmd.CmdAutoHelp;
-import com.massivecraft.factions.cmd.audit.FChestListener;
+import com.massivecraft.factions.cmd.CommandContext;
-import com.massivecraft.factions.cmd.audit.FLogManager;
+import com.massivecraft.factions.cmd.FCmdRoot;
-import com.massivecraft.factions.cmd.audit.FLogType;
+import com.massivecraft.factions.cmd.FCommand;
 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.cmd.reserve.ListParameterizedType;
+import com.massivecraft.factions.cmd.chest.FChestListener;
-import com.massivecraft.factions.cmd.reserve.ReserveObject;
-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.listeners.menu.MenuListener;
 import com.massivecraft.factions.missions.MissionHandler;
 import com.massivecraft.factions.shop.ShopConfig;
 import com.massivecraft.factions.struct.ChatMode;
@@ -28,10 +28,12 @@ import com.massivecraft.factions.util.*;
 import com.massivecraft.factions.util.Particles.ReflectionUtils;
 import com.massivecraft.factions.zcore.CommandVisibility;
 import com.massivecraft.factions.zcore.MPlugin;
+import com.massivecraft.factions.zcore.faudit.FLogManager;
+import com.massivecraft.factions.zcore.faudit.FLogType;
 import com.massivecraft.factions.zcore.fperms.Access;
 import com.massivecraft.factions.zcore.fperms.Permissable;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
-import com.massivecraft.factions.zcore.fupgrades.UpgradesListener;
+import com.massivecraft.factions.zcore.fupgrades.*;
 import com.massivecraft.factions.zcore.util.TextUtil;
 import me.lucko.commodore.CommodoreProvider;
 import net.milkbowl.vault.economy.Economy;
@@ -39,6 +41,8 @@ import net.milkbowl.vault.permission.Permission;
 import org.bukkit.*;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
+import org.bukkit.entity.ArmorStand;
+import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 import org.bukkit.event.player.AsyncPlayerChatEvent;
@@ -51,8 +55,6 @@ import org.bukkit.plugin.RegisteredServiceProvider;
 import java.io.*;
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.logging.Level;
@@ -92,8 +94,7 @@ public class FactionsPlugin extends MPlugin {
     private Listener[] eventsListener;
     public List<String> itemList = getConfig().getStringList("fchest.Items-Not-Allowed");
     private Worldguard wg;
-    private FLogManager fLogManager;
+    private FLogManager flogManager;
-    private List<ReserveObject> reserveObjects;
 
 
     public FactionsPlugin() {
@@ -123,19 +124,25 @@ public class FactionsPlugin extends MPlugin {
     }
 
     public void playSoundForAll(String sound) {
-        for (Player pl : Bukkit.getOnlinePlayers()) playSound(pl, sound);
+        for (Player pl : Bukkit.getOnlinePlayers()) {
+            playSound(pl, sound);
+        }
     }
 
     public void playSoundForAll(List<String> sounds) {
-        for (Player pl : Bukkit.getOnlinePlayers()) playSound(pl, sounds);
+        for (Player pl : Bukkit.getOnlinePlayers()) {
+            playSound(pl, sounds);
+        }
     }
 
     public void playSound(Player p, List<String> sounds) {
-        for (String sound : sounds) playSound(p, sound);
+        for (String sound : sounds) {
+            playSound(p, sound);
+        }
     }
 
     public void playSound(Player p, String sound) {
-        float pitch = Float.parseFloat(sound.split(":")[1]);
+        float pitch = Float.valueOf(sound.split(":")[1]);
         sound = sound.split(":")[0];
         p.playSound(p.getLocation(), Sound.valueOf(sound), pitch, 5.0F);
     }
@@ -169,7 +176,9 @@ public class FactionsPlugin extends MPlugin {
         migrateFPlayerLeaders();
         log("==== End Setup ====");
 
-        if (!preEnable()) return;
+        if (!preEnable()) {
+            return;
+        }
         this.loadSuccessful = false;
 
         if (!new File(this.getDataFolder() + "/config.yml").exists()) {
@@ -180,7 +189,8 @@ public class FactionsPlugin extends MPlugin {
         PermissionList.generateFile();
         // Load Conf from disk
         Conf.load();
-        fLogManager = new FLogManager();
+        flogManager = new FLogManager();
+
         //Dependency checks
         if (Conf.dependencyCheck && (!Bukkit.getPluginManager().isPluginEnabled("Vault") && !Bukkit.getPluginManager().isPluginEnabled("Essentials"))) {
             divider();
@@ -192,7 +202,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();
@@ -207,15 +217,20 @@ public class FactionsPlugin extends MPlugin {
                 fPlayer.resetFactionData(false);
                 continue;
             }
-            if (fPlayer.isAlt()) faction.addAltPlayer(fPlayer);
+            if (fPlayer.isAlt()) {
-            else faction.addFPlayer(fPlayer);
+                faction.addAltPlayer(fPlayer);
+            } else {
+                faction.addFPlayer(fPlayer);
+            }
         }
 
+        if (getConfig().getBoolean("enable-faction-flight", true)) {
+            UtilFly.run();
+        }
 
         Board.getInstance().load();
         Board.getInstance().clean();
-        //Load command aliases
+
-        Aliases.load();
         // Add Base Commands
         this.cmdBase = new FCmdRoot();
         this.cmdAutoHelp = new CmdAutoHelp();
@@ -235,7 +250,9 @@ public class FactionsPlugin extends MPlugin {
             log("Minecraft Version 1.9 or higher found, using non packet based particle API");
         }
 
-        if (getConfig().getBoolean("enable-faction-flight")) factionsFlight = true;
+        if (getConfig().getBoolean("enable-faction-flight")) {
+            factionsFlight = true;
+        }
 
         if (getServer().getPluginManager().getPlugin("Skript") != null) {
             log("Skript was found! Registering FactionsPlugin Addon...");
@@ -249,20 +266,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);
         }
-        //Setup Discord Bot
+        if(Conf.useDiscordSystem && !Conf.discordBotToken.equals("<token here>")) {
-        new Discord(this);
+            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");
+        }
 
         ShopConfig.setup();
-        fLogManager.loadLogs(this);
+        flogManager.loadLogs(this);
-
         getServer().getPluginManager().registerEvents(factionsPlayerListener = new FactionsPlayerListener(), this);
 
         // Register Event Handlers
@@ -271,6 +290,7 @@ public class FactionsPlugin extends MPlugin {
                 new FactionsEntityListener(),
                 new FactionsExploitListener(),
                 new FactionsBlockListener(),
+                new FUpgradesGUI(),
                 new UpgradesListener(),
                 new MissionHandler(this),
                 new FChestListener(),
@@ -284,25 +304,7 @@ public class FactionsPlugin extends MPlugin {
         this.getCommand(refCommand).setExecutor(cmdBase);
 
         if (!CommodoreProvider.isSupported()) this.getCommand(refCommand).setTabCompleter(this);
-        reserveObjects = new ArrayList<>();
+
-        String path = Paths.get(this.getDataFolder().getAbsolutePath()).toAbsolutePath().toString() + File.separator + "reserves.json";
-        File file = new File(path);
-        try {
-            String json;
-            if (!file.exists()) {
-                file.getParentFile().mkdirs();
-                file.createNewFile();
-            }
-            json = String.join("", Files.readAllLines(Paths.get(file.getPath()))).replace("\n", "").replace("\r", "");
-            if (json.equalsIgnoreCase("")) {
-                Files.write(Paths.get(path), "[]".getBytes());
-                json = "[]";
-            }
-            reserveObjects = this.getGsonBuilder().create().fromJson(json, new ListParameterizedType(ReserveObject.class));
-            if (reserveObjects == null) reserveObjects = new ArrayList<>();
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
         if (getDescription().getFullName().contains("BETA")) {
             divider();
             System.out.println("You are using a BETA version of the plugin!");
@@ -359,6 +361,7 @@ public class FactionsPlugin extends MPlugin {
         try {
             BufferedReader br = new BufferedReader(new FileReader(fplayerFile));
             System.out.println("Migrating old players.json file.");
+
             String line;
             while ((line = br.readLine()) != null) {
                 if (line.contains("\"role\": \"ADMIN\"")) {
@@ -390,7 +393,9 @@ public class FactionsPlugin extends MPlugin {
     private boolean setupPermissions() {
         try {
             RegisteredServiceProvider<Permission> rsp = getServer().getServicesManager().getRegistration(Permission.class);
-            if (rsp != null) perms = rsp.getProvider();
+            if (rsp != null) {
+                perms = rsp.getProvider();
+            }
         } catch (NoClassDefFoundError ex) {
             return false;
         }
@@ -419,7 +424,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("`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'");
@@ -428,20 +433,19 @@ public class FactionsPlugin extends MPlugin {
     @Override
     public void onDisable() {
         // only save data if plugin actually completely loaded successfully
-        if (this.loadSuccessful) Conf.saveSync();
+        if (this.loadSuccessful) {
-
+            Conf.saveSync();
+        }
 
         if (AutoLeaveTask != null) {
             this.getServer().getScheduler().cancelTask(AutoLeaveTask);
             AutoLeaveTask = null;
         }
         DiscordListener.saveGuilds();
-        if (Discord.jda != null) {
-            Discord.jda.shutdownNow();
-        }
         super.onDisable();
+
         try {
-            fLogManager.saveLogs();
+            flogManager.saveLogs();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -449,7 +453,9 @@ public class FactionsPlugin extends MPlugin {
 
     public void startAutoLeaveTask(boolean restartIfRunning) {
         if (AutoLeaveTask != null) {
-            if (!restartIfRunning) return;
+            if (!restartIfRunning) {
+                return;
+            }
             this.getServer().getScheduler().cancelTask(AutoLeaveTask);
         }
 
@@ -501,7 +507,9 @@ public class FactionsPlugin extends MPlugin {
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] split) {
-        if (split.length == 0) return handleCommand(sender, "/f help", false);
+        if (split.length == 0) {
+            return handleCommand(sender, "/f help", false);
+        }
 
         // otherwise, needs to be handled; presumably another plugin directly ran the command
         String cmd = Conf.baseCommandAliases.isEmpty() ? "/f" : "/" + Conf.baseCommandAliases.get(0);
@@ -514,6 +522,8 @@ public class FactionsPlugin extends MPlugin {
         // Must be a LinkedList to prevent UnsupportedOperationException.
         List<String> argsList = new LinkedList<>(Arrays.asList(args));
         CommandContext context = new CommandContext(sender, argsList, alias);
+        String cmd = Conf.baseCommandAliases.isEmpty() ? "/f" : "/" + Conf.baseCommandAliases.get(0);
+//        String cmdValid = (cmd + " " + TextUtil.implode(context.args, " ")).trim();
         List<FCommand> commandsList = cmdBase.subCommands;
         FCommand commandsEx = cmdBase;
         List<String> completions = new ArrayList<>();
@@ -542,12 +552,16 @@ public class FactionsPlugin extends MPlugin {
                 }
             }
             String lastArg = args[args.length - 1].toLowerCase();
+
             completions = completions.stream()
                     .filter(m -> m.toLowerCase().startsWith(lastArg))
                     .collect(Collectors.toList());
+
             return completions;
+
         } else {
             String lastArg = args[args.length - 1].toLowerCase();
+
             for (Role value : Role.values()) completions.add(value.nicename);
             for (Relation value : Relation.values()) completions.add(value.nicename);
             // The stream and foreach from the old implementation looped 2 times, by looping all players -> filtered -> looped filter and added -> filtered AGAIN at the end.
@@ -561,6 +575,7 @@ public class FactionsPlugin extends MPlugin {
     }
 
 
+
     // -------------------------------------------- //
     // Functions for other plugins to hook into
     // -------------------------------------------- //
@@ -586,8 +601,11 @@ public class FactionsPlugin extends MPlugin {
     // Does player have Faction Chat enabled? If so, chat plugins should preferably not do channels,
     // local chat, or anything else which targets individual recipients, so Faction Chat can be done
     public boolean isPlayerFactionChatting(Player player) {
-        if (player == null) return false;
+        if (player == null) {
+            return false;
+        }
         FPlayer me = FPlayers.getInstance().getByPlayer(player);
+
         return me != null && me.getChatMode().isAtLeast(ChatMode.ALLIANCE);
     }
 
@@ -608,11 +626,15 @@ public class FactionsPlugin extends MPlugin {
     public String getPlayerFactionTagRelation(Player speaker, Player listener) {
         String tag = "~";
 
-        if (speaker == null) return tag;
+        if (speaker == null) {
-
+            return tag;
+        }
 
         FPlayer me = FPlayers.getInstance().getByPlayer(speaker);
-        if (me == null) return tag;
+        if (me == null) {
+            return tag;
+        }
+
         // if listener isn't set, or config option is disabled, give back uncolored tag
         if (listener == null || !Conf.chatTagRelationColored) {
             tag = me.getChatTag().trim();
@@ -620,28 +642,29 @@ public class FactionsPlugin extends MPlugin {
             FPlayer you = FPlayers.getInstance().getByPlayer(listener);
             if (you == null) {
                 tag = me.getChatTag().trim();
-            } else { // everything checks out, give the colored tag
+            } else  // everything checks out, give the colored tag
+            {
                 tag = me.getChatTag(you).trim();
             }
         }
-        if (tag.isEmpty()) tag = "~";
+        if (tag.isEmpty()) {
+            tag = "~";
+        }
+
         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) return "";
+        if (player == null) {
+            return "";
+        }
+
         FPlayer me = FPlayers.getInstance().getByPlayer(player);
-        if (me == null) return "";
+        if (me == null) {
+            return "";
+        }
+
         return me.getTitle().trim();
     }
 
@@ -652,7 +675,9 @@ public class FactionsPlugin extends MPlugin {
 
     //colors a string list
     public List<String> colorList(List<String> lore) {
-        for (int i = 0; i <= lore.size() - 1; i++) lore.set(i, color(lore.get(i)));
+        for (int i = 0; i <= lore.size() - 1; i++) {
+            lore.set(i, color(lore.get(i)));
+        }
         return lore;
     }
 
@@ -661,16 +686,14 @@ public class FactionsPlugin extends MPlugin {
         return Factions.getInstance().getFactionTags();
     }
 
-    public List<ReserveObject> getFactionReserves() {
-        return this.reserveObjects;
-    }
-
     // Get a list of all players in the specified faction
     public Set<String> getPlayersInFaction(String factionTag) {
         Set<String> players = new HashSet<>();
         Faction faction = Factions.getInstance().getByTag(factionTag);
         if (faction != null) {
-            for (FPlayer fplayer : faction.getFPlayers()) players.add(fplayer.getName());
+            for (FPlayer fplayer : faction.getFPlayers()) {
+                players.add(fplayer.getName());
+            }
         }
         return players;
     }
@@ -680,7 +703,9 @@ public class FactionsPlugin extends MPlugin {
         Set<String> players = new HashSet<>();
         Faction faction = Factions.getInstance().getByTag(factionTag);
         if (faction != null) {
-            for (FPlayer fplayer : faction.getFPlayersWhereOnline(true)) players.add(fplayer.getName());
+            for (FPlayer fplayer : faction.getFPlayersWhereOnline(true)) {
+                players.add(fplayer.getName());
+            }
         }
         return players;
     }
@@ -689,6 +714,14 @@ public class FactionsPlugin extends MPlugin {
         return hookedPlayervaults;
     }
 
+    public FLogManager getFlogManager() {
+        return flogManager;
+    }
+
+    public void logFactionEvent(Faction faction, FLogType type, String... arguments) {
+        this.flogManager.log(faction, type, arguments);
+    }
+
     public String getPrimaryGroup(OfflinePlayer player) {
         AtomicReference<String> primaryGroup = new AtomicReference<>();
 
@@ -700,7 +733,9 @@ public class FactionsPlugin extends MPlugin {
     }
 
     public void debug(Level level, String s) {
-        if (getConfig().getBoolean("debug", false)) getLogger().log(level, s);
+        if (getConfig().getBoolean("debug", false)) {
+            getLogger().log(level, s);
+        }
     }
 
     public FactionsPlayerListener getFactionsPlayerListener() {

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

@@ -1,149 +0,0 @@
-package com.massivecraft.factions.cmd;
-
-import com.massivecraft.factions.FactionsPlugin;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-
-public class Aliases {
-    /**
-     * @author DroppingAnvil
-     */
-    public static ArrayList<String> alts_alts = new ArrayList<>(Arrays.asList("alts", "alt"));
-    public static ArrayList<String> alts_list = new ArrayList<>(Arrays.asList("list", "l"));
-    public static ArrayList<String> alts_invite = new ArrayList<>(Collections.singletonList("invite"));
-    public static ArrayList<String> alts_kick = new ArrayList<>(Collections.singletonList("kick"));
-    public static ArrayList<String> audit = new ArrayList<>(Arrays.asList("audit", "log", "logs"));
-    public static ArrayList<String> check = new ArrayList<>(Arrays.asList("check"));
-    public static ArrayList<String> weewoo = new ArrayList<>(Collections.singletonList("weewoo"));
-    public static ArrayList<String> chest = new ArrayList<>(Arrays.asList("chest", "pv"));
-    public static ArrayList<String> claim_auto = new ArrayList<>(Collections.singletonList("autoclaim"));
-    public static ArrayList<String> claim_claim = new ArrayList<>(Collections.singletonList("claim"));
-    public static ArrayList<String> claim_at = new ArrayList<>(Collections.singletonList("claimat"));
-    public static ArrayList<String> claim_line = new ArrayList<>(Arrays.asList("claimline", "cl"));
-    public static ArrayList<String> claim_corner = new ArrayList<>(Arrays.asList("corner"));
-    public static ArrayList<String> unclaim_all_safe = new ArrayList<>(Arrays.asList("safeunclaimall", "safedeclaimall"));
-    public static ArrayList<String> unclaim_unclaim = new ArrayList<>(Arrays.asList("unclaim", "declaim"));
-    public static ArrayList<String> unclaim_all_unsafe = new ArrayList<>(Arrays.asList("unclaimall", "declaimall"));
-    public static ArrayList<String> unclaim_all_war = new ArrayList<>(Arrays.asList("warunclaimall", "wardeclaimall"));
-    public static ArrayList<String> money_money = new ArrayList<>(Arrays.asList("money", "bank"));
-    public static ArrayList<String> money_balance = new ArrayList<>(Arrays.asList("b", "balance"));
-    public static ArrayList<String> money_deposit = new ArrayList<>(Arrays.asList("d", "deposit"));
-    public static ArrayList<String> money_transfer_Ff = new ArrayList<>(Collections.singletonList("ff"));
-    public static ArrayList<String> money_transfer_Fp = new ArrayList<>(Collections.singletonList("fp"));
-    public static ArrayList<String> money_transfer_Pf = new ArrayList<>(Collections.singletonList("pf"));
-    public static ArrayList<String> money_withdraw = new ArrayList<>(Arrays.asList("w", "withdraw"));
-    public static ArrayList<String> grace = new ArrayList<>(Collections.singletonList("grace"));
-    public static ArrayList<String> logout = new ArrayList<>(Collections.singletonList("logout"));
-    public static ArrayList<String> points_points = new ArrayList<>(Collections.singletonList("points"));
-    public static ArrayList<String> points_add = new ArrayList<>(Collections.singletonList("add"));
-    public static ArrayList<String> points_remove = new ArrayList<>(Collections.singletonList("remove"));
-    public static ArrayList<String> points_set = new ArrayList<>(Collections.singletonList("set"));
-    public static ArrayList<String> relation_ally = new ArrayList<>(Collections.singletonList("ally"));
-    public static ArrayList<String> relation_enemy = new ArrayList<>(Collections.singletonList("enemy"));
-    public static ArrayList<String> relation_neutral = new ArrayList<>(Collections.singletonList("neutral"));
-    public static ArrayList<String> relation_truce = new ArrayList<>(Collections.singletonList("truce"));
-    public static ArrayList<String> reserve = new ArrayList<>(Collections.singletonList("reserve"));
-    public static ArrayList<String> roles_demote = new ArrayList<>(Collections.singletonList("demote"));
-    public static ArrayList<String> roles_promote = new ArrayList<>(Collections.singletonList("promote"));
-    public static ArrayList<String> tnt_tnt = new ArrayList<>(Collections.singletonList("tnt"));
-    public static ArrayList<String> tnt_tntfill = new ArrayList<>(Collections.singletonList("tntfill"));
-    public static ArrayList<String> wild = new ArrayList<>(Collections.singletonList("wild"));
-    public static ArrayList<String> admin = new ArrayList<>(Arrays.asList("admin", "setadmin", "leader", "setleader"));
-    public static ArrayList<String> ahome = new ArrayList<>(Collections.singletonList("ahome"));
-    public static ArrayList<String> announce = new ArrayList<>(Arrays.asList("ann", "announce"));
-    public static ArrayList<String> help = new ArrayList<>(Arrays.asList("help", "h", "?"));
-    public static ArrayList<String> ban_ban = new ArrayList<>(Collections.singletonList("ban"));
-    public static ArrayList<String> ban_banlist = new ArrayList<>(Arrays.asList("banlist", "bans", "banl"));
-    public static ArrayList<String> banner = new ArrayList<>(Collections.singletonList("banner"));
-    public static ArrayList<String> boom = new ArrayList<>(Arrays.asList("noboom", "explosions", "toggleexplosions"));
-    public static ArrayList<String> bypass = new ArrayList<>(Collections.singletonList("bypass"));
-    public static ArrayList<String> chat = new ArrayList<>(Arrays.asList("chat", "c"));
-    public static ArrayList<String> chatspy = new ArrayList<>(Collections.singletonList("chatspy"));
-    public static ArrayList<String> checkpoint = new ArrayList<>(Arrays.asList("checkp", "checkpoint", "cpoint"));
-    public static ArrayList<String> coleader = new ArrayList<>(Arrays.asList("coleader", "setcoleader", "co", "setco"));
-    public static ArrayList<String> config = new ArrayList<>(Collections.singletonList("config"));
-    public static ArrayList<String> convert = new ArrayList<>(Collections.singletonList("convert"));
-    public static ArrayList<String> coords = new ArrayList<>(Arrays.asList("coords", "coord"));
-    public static ArrayList<String> create = new ArrayList<>(Collections.singletonList("create"));
-    public static ArrayList<String> debug = new ArrayList<>(Collections.singletonList("debug"));
-    public static ArrayList<String> deinvite = new ArrayList<>(Arrays.asList("deinvite", "deinv"));
-    public static ArrayList<String> deletefwarp = new ArrayList<>(Arrays.asList("delwarp", "dw", "deletewarp"));
-    public static ArrayList<String> description = new ArrayList<>(Arrays.asList("desc", "description"));
-    public static ArrayList<String> disband = new ArrayList<>(Collections.singletonList("disband"));
-    public static ArrayList<String> discord_discord = new ArrayList<>(Collections.singletonList("discord"));
-    public static ArrayList<String> drain = new ArrayList<>(Collections.singletonList("drain"));
-    public static ArrayList<String> global = new ArrayList<>(Arrays.asList("gchat", "global", "globalchat"));
-    public static ArrayList<String> fly = new ArrayList<>(Collections.singletonList("fly"));
-    public static ArrayList<String> focus = new ArrayList<>(Collections.singletonList("focus"));
-    public static ArrayList<String> warp = new ArrayList<>(Arrays.asList("warp", "warps"));
-    public static ArrayList<String> getvault = new ArrayList<>(Collections.singletonList("getvault"));
-    public static ArrayList<String> home = new ArrayList<>(Collections.singletonList("home"));
-    public static ArrayList<String> inspect = new ArrayList<>(Arrays.asList("inspect", "ins"));
-    public static ArrayList<String> invsee = new ArrayList<>(Arrays.asList("invsee", "inventorysee"));
-    public static ArrayList<String> invite = new ArrayList<>(Arrays.asList("invite", "inv"));
-    public static ArrayList<String> join = new ArrayList<>(Collections.singletonList("join"));
-    public static ArrayList<String> kick = new ArrayList<>(Collections.singletonList("kick"));
-    public static ArrayList<String> killholograms = new ArrayList<>(Collections.singletonList("killholos"));
-    public static ArrayList<String> leave = new ArrayList<>(Collections.singletonList("leave"));
-    public static ArrayList<String> list = new ArrayList<>(Arrays.asList("list", "ls"));
-    public static ArrayList<String> lock = new ArrayList<>(Collections.singletonList("lock"));
-    public static ArrayList<String> logins = new ArrayList<>(Arrays.asList("logins", "login", "logouts"));
-    public static ArrayList<String> lookup = new ArrayList<>(Collections.singletonList("lookup"));
-    public static ArrayList<String> lowPower = new ArrayList<>(Collections.singletonList("lowpower"));
-    public static ArrayList<String> map_map = new ArrayList<>(Collections.singletonList("map"));
-    public static ArrayList<String> map_height = new ArrayList<>(Arrays.asList("mapheight", "mh"));
-    public static ArrayList<String> mod = new ArrayList<>(Arrays.asList("mod", "setmod", "officer", "setofficer"));
-    public static ArrayList<String> modifyPower = new ArrayList<>(Arrays.asList("mp", "pm", "modpower", "modifypower"));
-    public static ArrayList<String> near = new ArrayList<>(Arrays.asList("near", "nearby"));
-    public static ArrayList<String> open = new ArrayList<>(Collections.singletonList("open"));
-    public static ArrayList<String> owner_owner = new ArrayList<>(Collections.singletonList("owner"));
-    public static ArrayList<String> owner_list = new ArrayList<>(Collections.singletonList("ownerlist"));
-    public static ArrayList<String> paypal_see = new ArrayList<>(Arrays.asList("paypal", "seepaypal"));
-    public static ArrayList<String> paypal_set = new ArrayList<>(Collections.singletonList("setpaypal"));
-    public static ArrayList<String> peaceful = new ArrayList<>(Collections.singletonList("peaceful"));
-    public static ArrayList<String> perm = new ArrayList<>(Arrays.asList("perm", "perms", "permission", "permissions"));
-    public static ArrayList<String> permanent_faction = new ArrayList<>(Collections.singletonList("permanent"));
-    public static ArrayList<String> permanent_power = new ArrayList<>(Collections.singletonList("permanentpower"));
-    public static ArrayList<String> titles = new ArrayList<>(Collections.singletonList("titles"));
-    public static ArrayList<String> power_power = new ArrayList<>(Arrays.asList("pow", "power"));
-    public static ArrayList<String> power_boost = new ArrayList<>(Collections.singletonList("powerboost"));
-    public static ArrayList<String> reload = new ArrayList<>(Collections.singletonList("reload"));
-    public static ArrayList<String> rules = new ArrayList<>(Arrays.asList("r", "rule", "rules"));
-    public static ArrayList<String> saveAll = new ArrayList<>(Arrays.asList("save", "saveall"));
-    public static ArrayList<String> scoreboard = new ArrayList<>(Arrays.asList("sb", "scoreboard"));
-    public static ArrayList<String> seeChunk = new ArrayList<>(Arrays.asList("sc", "seechunk"));
-    public static ArrayList<String> discord_see = new ArrayList<>(Collections.singletonList("seediscord"));
-    public static ArrayList<String> discord_set = new ArrayList<>(Collections.singletonList("setdiscord"));
-    public static ArrayList<String> setBanner = new ArrayList<>(Collections.singletonList("setbanner"));
-    public static ArrayList<String> setDefaultRole = new ArrayList<>(Arrays.asList("defaultrole", "def", "default", "defaultrank"));
-    public static ArrayList<String> setWarp = new ArrayList<>(Arrays.asList("sw", "setwarp"));
-    public static ArrayList<String> setHome = new ArrayList<>(Collections.singletonList("sethome"));
-    public static ArrayList<String> setMaxVaults = new ArrayList<>(Arrays.asList("smv", "setmaxvaults"));
-    public static ArrayList<String> show_show = new ArrayList<>(Arrays.asList("show", "who"));
-    public static ArrayList<String> show_claims = new ArrayList<>(Arrays.asList("showclaim", "showclaims"));
-    public static ArrayList<String> show_invites = new ArrayList<>(Collections.singletonList("showinvites"));
-    public static ArrayList<String> spawnerlock = new ArrayList<>(Arrays.asList("lockspawners", "spawnerlock"));
-    public static ArrayList<String> status = new ArrayList<>(Arrays.asList("s", "status"));
-    public static ArrayList<String> stealth = new ArrayList<>(Arrays.asList("stealth", "ninja"));
-    public static ArrayList<String> strikes_strikes = new ArrayList<>(Collections.singletonList("strikes"));
-    public static ArrayList<String> strikes_give = new ArrayList<>(Collections.singletonList("give"));
-    public static ArrayList<String> strikes_info = new ArrayList<>(Collections.singletonList("info"));
-    public static ArrayList<String> strikes_set = new ArrayList<>(Collections.singletonList("set"));
-    public static ArrayList<String> strikes_take = new ArrayList<>(Collections.singletonList("take"));
-    public static ArrayList<String> stuck = new ArrayList<>(Arrays.asList("stuck", "halp!"));
-    public static ArrayList<String> tag = new ArrayList<>(Arrays.asList("tag", "rename"));
-    public static ArrayList<String> title = new ArrayList<>(Collections.singletonList("title"));
-    public static ArrayList<String> toggleAllianceChat = new ArrayList<>(Arrays.asList("tac", "ac", "togglealliancechat"));
-    public static ArrayList<String> top = new ArrayList<>(Arrays.asList("t", "top"));
-    public static ArrayList<String> tpBanner = new ArrayList<>(Collections.singletonList("tpbanner"));
-    public static ArrayList<String> unban = new ArrayList<>(Collections.singletonList("unban"));
-    public static ArrayList<String> upgrades = new ArrayList<>(Arrays.asList("upgrades", "upgrade"));
-    public static ArrayList<String> vault = new ArrayList<>(Collections.singletonList("vault"));
-    public static ArrayList<String> viewChest = new ArrayList<>(Arrays.asList("viewchest", "viewpv"));
-    private static transient Aliases i = new Aliases();
-    public static void load() {
-        FactionsPlugin.getInstance().persist.loadOrSaveDefault(i, Aliases.class, "aliases");
-    }
-}

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,13 +8,9 @@ import org.bukkit.event.player.PlayerTeleportEvent;
 
 public class CmdAHome extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdAHome() {
         super();
-        this.aliases.addAll(Aliases.ahome);
+        this.aliases.add("ahome");
 
         this.requiredArgs.add("player");
 

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

@@ -4,23 +4,22 @@ 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.faudit.FLogType;
 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.addAll(Aliases.admin);
+        this.aliases.add("admin");
+        this.aliases.add("setadmin");
+        this.aliases.add("leader");
+        this.aliases.add("setleader");
 
         this.requiredArgs.add("player");
 
@@ -29,81 +28,63 @@ public class CmdAdmin extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
+        if (context.player == null) {
-            if (context.player == null) {
+            context.msg(TL.GENERIC_PLAYERONLY);
-                context.msg(TL.GENERIC_PLAYERONLY);
+            return;
-                return;
+        }
-            }
+        // Allows admins bypass this.
-            // Allows admins bypass this.
+        if (!context.fPlayer.isAdminBypassing() && !context.fPlayer.getRole().equals(Role.LEADER)) {
-            if (!context.fPlayer.isAdminBypassing() && !context.fPlayer.getRole().equals(Role.LEADER)) {
+            context.msg(TL.COMMAND_ADMIN_NOTADMIN);
-                context.msg(TL.COMMAND_ADMIN_NOTADMIN);
+            return;
-                return;
+        }
-            }
+        FPlayer fyou = context.argAsBestFPlayerMatch(0);
-            FPlayer fyou = context.argAsBestFPlayerMatch(0);
+        if (fyou == null) {
-            if (fyou == null) {
+            return;
+        }
+
+        boolean permAny = Permission.ADMIN_ANY.has(context.sender, false);
+        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);
-            // only perform a FPlayerJoinEvent when newLeader isn't actually in the faction
+        context.msg(TL.COMMAND_ADMIN_PROMOTES, fyou.describeTo(context.fPlayer, true));
-            if (fyou.getFaction() != targetFaction) {
+        FactionsPlugin.instance.getFlogManager().log(targetFaction, FLogType.RANK_EDIT, context.fPlayer.getName(), fyou.getName(), ChatColor.RED + "Admin");
-                FPlayerJoinEvent event = new FPlayerJoinEvent(FPlayers.getInstance().getByPlayer(context.player), targetFaction, FPlayerJoinEvent.PlayerJoinReason.LEADER);
+        // Inform all players
-                Bukkit.getServer().getPluginManager().callEvent(event);
+        for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
-                if (event.isCancelled()) {
+            fplayer.msg(TL.COMMAND_ADMIN_PROMOTED, context.player == null ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(fplayer, true), fyou.describeTo(fplayer), targetFaction.describeTo(fplayer));
-                    return;
+        }
-                }
-            }
-
-            FPlayer admin = targetFaction.getFPlayerAdmin();
-
-            // if target player is currently admin, demote and replace him
-            if (fyou == admin) {
-                promoteNewLeader(targetFaction);
-                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) {
-                setRole(admin, Role.COLEADER);
-            }
-            setRole(fyou, 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));
-            }
-        });
-    }
-
-    private void setRole(FPlayer fp, Role r) {
-        FactionsPlugin.getInstance().getServer().getScheduler().runTask(FactionsPlugin.instance, () -> {
-            fp.setRole(r);
-        });
-    }
-
-    private void promoteNewLeader(Faction f) {
-        FactionsPlugin.getInstance().getServer().getScheduler().runTask(FactionsPlugin.instance, () -> {
-            f.promoteNewLeader();
-        });
     }
 
     public TL getUsageTranslation() {

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

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

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

@@ -1,15 +1,8 @@
-package com.massivecraft.factions.cmd.audit;
+package com.massivecraft.factions.cmd;
-
-/**
- * @author Saser
- */
 
 import com.massivecraft.factions.Faction;
-import com.massivecraft.factions.cmd.Aliases;
-import com.massivecraft.factions.cmd.CommandContext;
-import com.massivecraft.factions.cmd.CommandRequirements;
-import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.zcore.faudit.FAuditMenu;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.entity.Player;
 
@@ -17,7 +10,9 @@ public class CmdAudit extends FCommand {
 
     public CmdAudit() {
         super();
-        this.aliases.addAll(Aliases.audit);
+        this.aliases.add("audit");
+        this.aliases.add("logs");
+        this.aliases.add("log");
 
 
         this.requirements = new CommandRequirements.Builder(Permission.AUDIT)

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

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

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

@@ -2,12 +2,12 @@ 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.faudit.FLogType;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
+import com.massivecraft.factions.zcore.util.CC;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
 
@@ -15,13 +15,9 @@ import java.util.logging.Level;
 
 public class CmdBan extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdBan() {
         super();
-        this.aliases.addAll(Aliases.ban_ban);
+        this.aliases.add("ban");
 
         this.requiredArgs.add("target");
 

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

@@ -13,13 +13,11 @@ import java.util.List;
 
 public class CmdBanlist extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdBanlist() {
         super();
-        this.aliases.addAll(Aliases.ban_banlist);
+        this.aliases.add("banlist");
+        this.aliases.add("bans");
+        this.aliases.add("banl");
 
         this.optionalArgs.put("faction", "faction");
 

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

@@ -13,13 +13,9 @@ import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
 
 public class CmdBanner extends FCommand {
-
-    /**
-     * @author Illyria Team
-     */
-
     public CmdBanner() {
-        this.aliases.addAll(Aliases.banner);
+        this.aliases.add("banner");
+        this.aliases.add("warbanner");
         this.requirements = new CommandRequirements.Builder(Permission.BANNER).playerOnly().memberOnly().build();
     }
 
@@ -33,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")));
@@ -46,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) {
@@ -55,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,13 +6,11 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdBoom extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdBoom() {
         super();
-        this.aliases.addAll(Aliases.boom);
+        this.aliases.add("noboom");
+        this.aliases.add("explosions");
+        this.aliases.add("toggleexplosions");
 
         //this.requiredArgs.add("");
         this.optionalArgs.put("on/off", "flip");

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

@@ -6,13 +6,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdBypass extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdBypass() {
         super();
-        this.aliases.addAll(Aliases.bypass);
+        this.aliases.add("bypass");
 
         //this.requiredArgs.add("");
         this.optionalArgs.put("on/off", "flip");

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

@@ -10,13 +10,10 @@ import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 
 public class CmdChat extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdChat() {
         super();
-        this.aliases.addAll(Aliases.chat);
+        this.aliases.add("c");
+        this.aliases.add("chat");
 
         //this.requiredArgs.add("");
         this.optionalArgs.put("mode", "next");

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

@@ -6,13 +6,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdChatSpy extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdChatSpy() {
         super();
-        this.aliases.addAll(Aliases.chatspy);
+        this.aliases.add("chatspy");
 
         this.optionalArgs.put("on/off", "flip");
 

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

@@ -6,14 +6,11 @@ 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.addAll(Aliases.checkpoint);
+        this.aliases.add("checkp");
+        this.aliases.add("checkpoint");
+        this.aliases.add("cpoint");
 
         this.optionalArgs.put("set", "");
 

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

@@ -4,22 +4,20 @@ 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.faudit.FLogType;
 import com.massivecraft.factions.zcore.util.TL;
 import mkremins.fanciful.FancyMessage;
 import org.bukkit.ChatColor;
 
 public class CmdColeader extends FCommand {
-
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdColeader() {
         super();
-        this.aliases.addAll(Aliases.coleader);
+        this.aliases.add("co");
+        this.aliases.add("setcoleader");
+        this.aliases.add("coleader");
+        this.aliases.add("setco");
 
         this.optionalArgs.put("player name", "name");
 

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

@@ -20,7 +20,7 @@ public class CmdConfig extends FCommand {
 
     public CmdConfig() {
         super();
-        this.aliases.addAll(Aliases.config);
+        this.aliases.add("config");
 
         this.requiredArgs.add("setting");
         this.requiredArgs.add("value");

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

@@ -9,12 +9,8 @@ import org.bukkit.command.ConsoleCommandSender;
 
 public class CmdConvert extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdConvert() {
-        this.aliases.addAll(Aliases.convert);
+        this.aliases.add("convert");
         this.requiredArgs.add("[MYSQL|JSON]");
 
         this.requirements = new CommandRequirements.Builder(Permission.CONVERT)

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

@@ -7,13 +7,10 @@ import org.bukkit.Location;
 
 public class CmdCoords extends FCommand {
 
-    /**
-     * @author Illyria Team
-     */
-
     public CmdCoords() {
         super();
-        this.aliases.addAll(Aliases.coords);
+        this.aliases.add("coords");
+        this.aliases.add("coord");
 
         this.requirements = new CommandRequirements.Builder(Permission.COORD)
                 .playerOnly()

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,23 +8,16 @@ 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.addAll(Aliases.create);
+        this.aliases.add("create");
 
         this.requiredArgs.add("faction tag");
 
@@ -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,13 +14,10 @@ import org.bukkit.ChatColor;
 
 public class CmdDeinvite extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdDeinvite() {
         super();
-        this.aliases.addAll(Aliases.deinvite);
+        this.aliases.add("deinvite");
+        this.aliases.add("deinv");
 
         this.optionalArgs.put("player name", "name");
 
@@ -31,47 +28,54 @@ 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);
+
-                    String name = fp != null ? fp.getName() : id;
+        if (context.args.get(0) == null) {
-                    msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_DEINVITE_CLICKTODEINVITE.format(name)).command("/" + Conf.baseCommandAliases.get(0) + " deinvite " + name);
+            FancyMessage msg = new FancyMessage(TL.COMMAND_DEINVITE_CANDEINVITE.toString()).color(ChatColor.GOLD);
-                }
+            for (String id : context.faction.getInvites()) {
-                context.sendFancyMessage(msg);
+                if(context.faction.getInvites().isEmpty()) 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;
+        }
+
+        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) {
+                if(context.faction.getInvites().isEmpty()) return;
-                    context.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage invites");
+                FPlayer fp = FPlayers.getInstance().getById(id);
-                    return;
+                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 == 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,13 +7,11 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdDelFWarp extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdDelFWarp() {
         super();
-        this.aliases.addAll(Aliases.deletefwarp);
+        this.aliases.add("delwarp");
+        this.aliases.add("dw");
+        this.aliases.add("deletewarp");
         this.requiredArgs.add("warp name");
 
         this.requirements = new CommandRequirements.Builder(Permission.SETWARP)

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

@@ -4,21 +4,18 @@ 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.faudit.FLogType;
 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.addAll(Aliases.description);
+        this.aliases.add("desc");
+        this.aliases.add("description");
 
         this.requiredArgs.add("desc");
 
@@ -31,29 +28,28 @@ 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");
+        String desc = TextUtil.implode(context.args, " ").replaceAll("%", "").replaceAll("(&([a-f0-9klmnor]))", "& $2");
-            context.faction.setDescription(desc);
+        context.faction.setDescription(desc);
-            Bukkit.getScheduler().scheduleSyncDelayedTask(FactionsPlugin.instance, () -> FactionsPlugin.instance.logFactionEvent(context.faction, FLogType.FDESC_EDIT, context.fPlayer.getName(), 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,21 +16,19 @@ import java.util.HashMap;
 
 public class CmdDisband extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
-    //TODO: Add Disband Confirmation GUI
 
     private static HashMap<String, String> disbandMap = new HashMap<>();
 
 
     public CmdDisband() {
         super();
-        this.aliases.addAll(Aliases.disband);
+        this.aliases.add("disband");
+
         this.optionalArgs.put("faction tag", "yours");
+
         this.requirements = new CommandRequirements.Builder(Permission.DISBAND)
                 .build();
+
     }
 
     @Override
@@ -82,19 +80,19 @@ public class CmdDisband extends FCommand {
                     String amountString = context.sender instanceof ConsoleCommandSender ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(follower);
                     if (follower.getFaction() == faction) {
                         follower.msg(TL.COMMAND_DISBAND_BROADCAST_YOURS, amountString);
-                        if (!follower.canFlyAtLocation() && FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) {
+                        if (!follower.canFlyAtLocation()) {
                             follower.setFFlying(false, false);
                         }
                     } else {
                         follower.msg(TL.COMMAND_DISBAND_BROADCAST_NOTYOURS, amountString, faction.getTag(follower));
                     }
                 }
-                if(FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) context.fPlayer.setFFlying(false, false);
+                context.fPlayer.setFFlying(false, false);
             } else {
                 context.player.sendMessage(String.valueOf(TL.COMMAND_DISBAND_PLAYER));
             }
             faction.disband(context.player, PlayerDisbandReason.COMMAND);
-            if (!context.fPlayer.canFlyAtLocation() && FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) {
+            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.addAll(Aliases.discord_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.addAll(Aliases.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,15 +9,13 @@ import java.util.UUID;
 
 public class CmdFGlobal extends FCommand {
 
-    /**
-     * @author Trent
-     */
-
     public static List<UUID> toggled = new ArrayList<>();
 
     public CmdFGlobal() {
         super();
-        this.aliases.addAll(Aliases.global);
+        this.aliases.add("gchat");
+        this.aliases.add("global");
+        this.aliases.add("globalchat");
 
         this.requirements = new CommandRequirements.Builder(Permission.GLOBALCHAT)
                 .playerOnly()

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

@@ -14,13 +14,10 @@ import java.util.UUID;
 
 public class CmdFWarp extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdFWarp() {
         super();
-        this.aliases.addAll(Aliases.warp);
+        this.aliases.add("warp");
+        this.aliases.add("warps");
         this.optionalArgs.put("warpname", "warpname");
         this.optionalArgs.put("password", "password");
 

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

@@ -9,7 +9,6 @@ import com.massivecraft.factions.zcore.fperms.Access;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
 import org.bukkit.GameMode;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
@@ -20,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;
@@ -32,10 +27,10 @@ public class CmdFly extends FCommand {
 
     public CmdFly() {
         super();
-        this.aliases.addAll(Aliases.fly);
+        this.aliases.add("fly");
         this.optionalArgs.put("on/off", "flip");
 
-        this.requirements = new CommandRequirements.Builder(Permission.FLY_FLY)
+        this.requirements = new CommandRequirements.Builder(Permission.FLY)
                 .playerOnly()
                 .memberOnly()
                 .build();
@@ -79,15 +74,19 @@ public class CmdFly extends FCommand {
                     }
                     FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
                     Faction myFaction = fPlayer.getFaction();
-                    if (!player.hasPermission("factions.fly.bypassnearbyenemycheck") && !fPlayer.isAdminBypassing()) {
+                    if (myFaction.isWilderness()) {
-                        if (fPlayer.hasEnemiesNearby()) disableFlightSync(fPlayer);
+                        fPlayer.setFlying(false);
-                        checkEnemiesSync(fPlayer);
+                        flyMap.remove(name);
+                        continue;
+                    }
+                    if (player.hasPermission("factions.fly.bypassnearbyenemycheck") || fPlayer.checkIfNearbyEnemies()) {
                         continue;
                     }
                     FLocation myFloc = new FLocation(player.getLocation());
                     if (Board.getInstance().getFactionAt(myFloc) != myFaction) {
-                        if (!checkFly(fPlayer, player, Board.getInstance().getFactionAt(myFloc))) {
+                        if (!checkBypassPerms(fPlayer, player, Board.getInstance().getFactionAt(myFloc))) {
-                            disableFlightSync(fPlayer);
+                            Bukkit.getScheduler().runTask(FactionsPlugin.instance, () -> fPlayer.setFFlying(false, false));
+                            flyMap.remove(name);
                         }
                     }
 
@@ -97,15 +96,36 @@ public class CmdFly extends FCommand {
         }, 20L, 20L);
     }
 
-    public static boolean checkFly(FPlayer fme, Player me, Faction toFac) {
+    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.getAccess(fme, PermissableAction.FLY) == Access.ALLOW) return true;
+
-        if (fme.getFaction().isWilderness()) return false;
+        if (toFac != fme.getFaction()) {
-        if (toFac.isSystemFaction()) return me.hasPermission(Permission.valueOf("FLY_" + ChatColor.stripColor(toFac.getTag()).toUpperCase()).node);
+            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()) {
-        Relation relationTo = toFac.getRelationTo(fme.getFaction());
+                fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
-        if (!relationTo.isEnemy() && !relationTo.isMember()) return me.hasPermission(Permission.valueOf("FLY_" + relationTo.name()).node);
+                return false;
-        return false;
+            }
+            Access access = toFac.getAccess(fme, PermissableAction.FLY);
+            if ((!(me.hasPermission(Permission.FLY_ENEMY.node) || access == Access.ALLOW)) && toFac.getRelationTo(fme.getFaction()) == Relation.ENEMY) {
+                fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
+                return false;
+            }
+            if (!(me.hasPermission(Permission.FLY_ALLY.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.ALLY) {
+                fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
+                return false;
+            }
+            if (!(me.hasPermission(Permission.FLY_TRUCE.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.TRUCE) {
+                fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
+                return false;
+            }
+
+            if (!(me.hasPermission(Permission.FLY_NEUTRAL.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.NEUTRAL && !toFac.isSystemFaction()) {
+                fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
+                return false;
+            }
+            return me.hasPermission(Permission.FLY.node) && (access != Access.DENY || toFac.isSystemFaction());
+        }
+        return true;
     }
 
 
@@ -121,44 +141,35 @@ public class CmdFly extends FCommand {
         flyMap.remove(fme.getPlayer().getName());
     }
 
-    private static void disableFlightSync(FPlayer fme) {
-        Bukkit.getScheduler().runTask(FactionsPlugin.instance, () -> fme.setFFlying(false, false));
-        flyMap.remove(fme.getName());
-    }
-
     public boolean isInFlightChecker(Player player) {
         return flyMap.containsKey(player.getName());
     }
 
-    private static void checkEnemiesSync(FPlayer fp) {
-        Bukkit.getScheduler().runTask(FactionsPlugin.instance, fp::checkIfNearbyEnemies);
-    }
-
     @Override
     public void perform(CommandContext context) {
-        if (!context.fPlayer.isAdminBypassing()) {
+        // Disabled by default.
-            List<Entity> entities = context.player.getNearbyEntities(16.0D, 256.0D, 16.0D);
+        if (!FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight", false)) {
+            context.fPlayer.msg(TL.COMMAND_FLY_DISABLED);
+            return;
+        }
 
-            for (int i = 0; i <= entities.size() - 1; ++i) {
+        FLocation myfloc = new FLocation(context.player.getLocation());
-                if (entities.get(i) instanceof Player) {
+        Faction toFac = Board.getInstance().getFactionAt(myfloc);
-                    Player eplayer = (Player) entities.get(i);
+        if (!checkBypassPerms(context.fPlayer, context.player, toFac)) return;
-                    FPlayer efplayer = FPlayers.getInstance().getByPlayer(eplayer);
+        List<Entity> entities = context.player.getNearbyEntities(16.0D, 256.0D, 16.0D);
-                    if (efplayer.getRelationTo(context.fPlayer) == Relation.ENEMY && !efplayer.isStealthEnabled()) {
+
-                        context.msg(TL.COMMAND_FLY_CHECK_ENEMY);
+        for (int i = 0; i <= entities.size() - 1; ++i) {
-                        return;
+            if (entities.get(i) instanceof Player) {
-                    }
+                Player eplayer = (Player) entities.get(i);
-                    context.fPlayer.setEnemiesNearby(false);
+                FPlayer efplayer = FPlayers.getInstance().getByPlayer(eplayer);
+                if (efplayer.getRelationTo(context.fPlayer) == Relation.ENEMY && !efplayer.isStealthEnabled()) {
+                    context.msg(TL.COMMAND_FLY_CHECK_ENEMY);
+                    return;
                 }
             }
-
-            FLocation myfloc = new FLocation(context.player.getLocation());
-            Faction toFac = Board.getInstance().getFactionAt(myfloc);
-            if (!checkFly(context.fPlayer, context.player, toFac)) {
-                context.fPlayer.sendMessage(TL.COMMAND_FLY_NO_ACCESS.format(toFac.getTag()));
-                return;
-            }
         }
 
+
         if (context.args.size() == 0) {
             toggleFlight(context.fPlayer.isFlying(), context.fPlayer, context);
         } else if (context.args.size() == 1) {
@@ -173,6 +184,8 @@ public class CmdFly extends FCommand {
             return;
         }
 
+
+        if (fme.canFlyAtLocation()) {
             context.doWarmUp(WarmUpUtil.Warmup.FLIGHT, TL.WARMUPS_NOTIFY_FLIGHT, "Fly", () -> {
                 fme.setFlying(true);
                 flyMap.put(fme.getPlayer().getName(), true);
@@ -184,6 +197,9 @@ 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,13 +7,8 @@ import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdFocus extends FCommand {
-
-    /**
-     * @author Driftay
-     */
-
     public CmdFocus() {
-        aliases.addAll(Aliases.focus);
+        aliases.add("focus");
 
         requiredArgs.add("player");
 
@@ -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,14 +9,9 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
 public class CmdGetVault extends FCommand {
-
-    /**
-     * @author Illyria Team
-     */
-
     public CmdGetVault() {
         super();
-        this.aliases.addAll(Aliases.getvault);
+        this.aliases.add("getvault");
 
         this.requirements = new CommandRequirements.Builder(Permission.GETVAULT)
                 .playerOnly()
@@ -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,15 +13,13 @@ import java.util.List;
 
 public class CmdHelp extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public ArrayList<ArrayList<String>> helpPages;
-    //TODO: Add Help GUI
+
     public CmdHelp() {
         super();
-        this.aliases.addAll(Aliases.help);
+        this.aliases.add("help");
+        this.aliases.add("h");
+        this.aliases.add("?");
 
         //this.requiredArgs.add("");
         this.optionalArgs.put("page", "1");

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

@@ -20,13 +20,9 @@ import java.util.List;
 
 public class CmdHome extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdHome() {
         super();
-        this.aliases.addAll(Aliases.home);
+        this.aliases.add("home");
         this.optionalArgs.put("faction", "yours");
 
         this.requirements = new CommandRequirements.Builder(Permission.HOME)

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

@@ -4,14 +4,11 @@ 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.addAll(Aliases.inspect);
+        this.aliases.add("inspect");
+        this.aliases.add("ins");
+
         this.requirements = new CommandRequirements.Builder(Permission.INSPECT)
                 .playerOnly()
                 .memberOnly()

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

@@ -16,14 +16,11 @@ import java.util.Objects;
 
 public class CmdInventorySee extends FCommand {
 
-    /**
-     * @author Driftay
-     */
-
     public CmdInventorySee() {
         super();
 
-        this.aliases.addAll(Aliases.invsee);
+        this.aliases.add("invsee");
+        this.aliases.add("inventorysee");
 
         this.requiredArgs.add("member name");
 
@@ -35,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,23 +3,20 @@ 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.faudit.FLogType;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
+import com.massivecraft.factions.zcore.util.CC;
 import com.massivecraft.factions.zcore.util.TL;
 import mkremins.fanciful.FancyMessage;
 import org.bukkit.ChatColor;
 
 public class CmdInvite extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdInvite() {
         super();
-        this.aliases.addAll(Aliases.invite);
+        this.aliases.add("invite");
+        this.aliases.add("inv");
 
         this.requiredArgs.add("player name");
 
@@ -69,8 +66,10 @@ 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());
     }

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

@@ -1,28 +1,19 @@
 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.faudit.FLogType;
 import com.massivecraft.factions.zcore.fupgrades.UpgradeType;
+import com.massivecraft.factions.zcore.util.CC;
 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.addAll(Aliases.join);
+        this.aliases.add("join");
         this.requiredArgs.add("faction name");
         this.optionalArgs.put("player", "you");
 
@@ -127,19 +118,8 @@ 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");
-            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,12 +4,12 @@ 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.faudit.FLogType;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
+import com.massivecraft.factions.zcore.util.CC;
 import com.massivecraft.factions.zcore.util.TL;
 import mkremins.fanciful.FancyMessage;
 import org.bukkit.Bukkit;
@@ -18,13 +18,9 @@ import org.bukkit.command.ConsoleCommandSender;
 
 public class CmdKick extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdKick() {
         super();
-        this.aliases.addAll(Aliases.kick);
+        this.aliases.add("kick");
         this.optionalArgs.put("player name", "player name");
 
         this.requirements = new CommandRequirements.Builder(Permission.KICK)
@@ -124,6 +120,7 @@ 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,14 +4,9 @@ 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.addAll(Aliases.killholograms);
+        this.aliases.add("killholos");
         this.requiredArgs.add("radius");
 
         this.requirements = new CommandRequirements.Builder(Permission.KILLHOLOS)

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

@@ -1,19 +1,13 @@
 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.addAll(Aliases.leave);
+        this.aliases.add("leave");
 
         this.requirements = new CommandRequirements.Builder(Permission.LEAVE)
                 .playerOnly()

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

@@ -14,15 +14,12 @@ import java.util.List;
 
 public class CmdList extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     private String[] defaults = new String[3];
 
     public CmdList() {
         super();
-        this.aliases.addAll(Aliases.list);
+        this.aliases.add("list");
+        this.aliases.add("ls");
 
         // default values in case user has old config
         defaults[0] = "&e&m----------&r&e[ &2Faction List &9{pagenumber}&e/&9{pagecount} &e]&m----------";
@@ -42,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:
@@ -19,7 +15,7 @@ public class CmdLock extends FCommand {
 
     public CmdLock() {
         super();
-        this.aliases.addAll(Aliases.lock);
+        this.aliases.add("lock");
         this.optionalArgs.put("on/off", "flip");
 
         this.requirements = new CommandRequirements.Builder(Permission.LOCK)

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

@@ -5,13 +5,12 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdLogins extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdLogins() {
         super();
-        this.aliases.addAll(Aliases.logins);
+        this.aliases.add("login");
+        this.aliases.add("logins");
+        this.aliases.add("logout");
+        this.aliases.add("logouts");
 
         this.requirements = new CommandRequirements.Builder(Permission.MONITOR_LOGINS)
                 .playerOnly()

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.addAll(Aliases.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,13 +7,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdLowPower extends FCommand {
 
-    /**
-     * @author Illyria Team
-     */
-
     public CmdLowPower() {
         super();
-        this.aliases.addAll(Aliases.lowPower);
+        this.aliases.add("lowpower");
 
         this.requirements = new CommandRequirements.Builder(Permission.POWER_ANY)
                 .playerOnly()

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

@@ -9,13 +9,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdMap extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdMap() {
         super();
-        this.aliases.addAll(Aliases.map_map);
+        this.aliases.add("map");
         this.optionalArgs.put("on/off", "once");
 
         this.requirements = new CommandRequirements.Builder(Permission.MAP)

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

@@ -5,14 +5,11 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdMapHeight extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdMapHeight() {
         super();
 
-        this.aliases.addAll(Aliases.map_height);
+        this.aliases.add("mapheight");
+        this.aliases.add("mh");
         this.optionalArgs.put("height", "height");
 
         this.requirements = new CommandRequirements.Builder(Permission.MAPHEIGHT)

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

@@ -4,22 +4,21 @@ 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.faudit.FLogType;
 import com.massivecraft.factions.zcore.util.TL;
 import mkremins.fanciful.FancyMessage;
 import org.bukkit.ChatColor;
 
 public class CmdMod extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdMod() {
         super();
-        this.aliases.addAll(Aliases.mod);
+        this.aliases.add("mod");
+        this.aliases.add("setmod");
+        this.aliases.add("officer");
+        this.aliases.add("setofficer");
 
         this.optionalArgs.put("player name", "name");
 
@@ -31,53 +30,52 @@ 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));
+            FactionsPlugin.instance.getFlogManager().log(targetFaction, FLogType.RANK_EDIT, context.fPlayer.getName(), you.getName(), ChatColor.LIGHT_PURPLE + "Mod");
+        }
     }
 
     @Override

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

@@ -6,14 +6,13 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdModifyPower extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdModifyPower() {
         super();
 
-        this.aliases.addAll(Aliases.modifyPower);
+        this.aliases.add("pm");
+        this.aliases.add("mp");
+        this.aliases.add("modifypower");
+        this.aliases.add("modpower");
 
         this.requiredArgs.add("name");
         this.requiredArgs.add("power");

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

@@ -9,14 +9,10 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
 public class CmdNear extends FCommand {
-
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdNear() {
         super();
-        this.aliases.addAll(Aliases.near);
+        this.aliases.add("near");
+        this.aliases.add("nearby");
 
         this.requirements = new CommandRequirements.Builder(Permission.NEAR)
                 .playerOnly()

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

@@ -3,20 +3,15 @@ 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.addAll(Aliases.open);
+        this.aliases.add("open");
         this.optionalArgs.put("yes/no", "flip");
 
         this.requirements = new CommandRequirements.Builder(Permission.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,13 +8,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdOwner extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdOwner() {
         super();
-        this.aliases.addAll(Aliases.owner_owner);
+        this.aliases.add("owner");
         this.optionalArgs.put("player name", "you");
 
         this.requirements = new CommandRequirements.Builder(Permission.OWNER)

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

@@ -9,13 +9,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdOwnerList extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdOwnerList() {
         super();
-        this.aliases.addAll(Aliases.owner_list);
+        this.aliases.add("ownerlist");
 
         this.requirements = new CommandRequirements.Builder(Permission.OWNERLIST)
                 .playerOnly()

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

@@ -6,13 +6,9 @@ import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdPaypalSee extends FCommand {
-
-    /**
-     * @author Driftay
-     */
-
     public CmdPaypalSee() {
-        this.aliases.addAll(Aliases.paypal_see);
+        this.aliases.add("seepaypal");
+        this.aliases.add("paypal");
 
         this.optionalArgs.put("faction", "yours");
 
@@ -24,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,12 +8,8 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdPaypalSet extends FCommand {
 
-    /**
-     * @author Driftay
-     */
-
     public CmdPaypalSet() {
-        this.aliases.addAll(Aliases.paypal_set);
+        this.aliases.add("setpaypal");
 
         this.optionalArgs.put("faction", "yours");
 
@@ -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,13 +8,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdPeaceful extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdPeaceful() {
         super();
-        this.aliases.addAll(Aliases.peaceful);
+        this.aliases.add("peaceful");
         this.requiredArgs.add("faction tag");
 
         this.requirements = new CommandRequirements.Builder(Permission.SET_PEACEFUL)

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

@@ -17,13 +17,12 @@ import java.util.Set;
 
 public class CmdPerm extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdPerm() {
         super();
-        this.aliases.addAll(Aliases.perm);
+        this.aliases.add("perm");
+        this.aliases.add("perms");
+        this.aliases.add("permission");
+        this.aliases.add("permissions");
 
         this.optionalArgs.put("relation", "relation");
         this.optionalArgs.put("action", "action");

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

@@ -10,13 +10,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdPermanent extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdPermanent() {
         super();
-        this.aliases.addAll(Aliases.permanent_faction);
+        this.aliases.add("permanent");
         this.requiredArgs.add("faction tag");
 
         this.requirements = new CommandRequirements.Builder(Permission.SET_PERMANENT)

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

@@ -6,14 +6,9 @@ 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.addAll(Aliases.permanent_power);
+        this.aliases.add("permanentpower");
         this.requiredArgs.add("faction");
         this.requiredArgs.add("power");
 

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

@@ -7,7 +7,7 @@ import com.massivecraft.factions.zcore.util.TL;
 public class CmdPlayerTitleToggle extends FCommand {
     public CmdPlayerTitleToggle() {
         super();
-        this.aliases.addAll(Aliases.titles);
+        this.aliases.add("titles");
         this.requirements = new CommandRequirements.Builder(Permission.TOGGLE_TITLES)
                 .build();
     }

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

@@ -7,13 +7,10 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdPower extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdPower() {
         super();
-        this.aliases.addAll(Aliases.power_power);
+        this.aliases.add("power");
+        this.aliases.add("pow");
         this.optionalArgs.put("player name", "you");
 
         this.requirements = new CommandRequirements.Builder(Permission.POWER)

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

@@ -9,13 +9,9 @@ import org.bukkit.command.ConsoleCommandSender;
 
 public class CmdPowerBoost extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdPowerBoost() {
         super();
-        this.aliases.addAll(Aliases.power_boost);
+        this.aliases.add("powerboost");
         this.requiredArgs.add("plugin|f|player|faction");
         this.requiredArgs.add("name");
         this.requiredArgs.add("# or reset");

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,13 +9,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdReload extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdReload() {
         super();
-        this.aliases.addAll(Aliases.reload);
+        this.aliases.add("reload");
 
         this.requirements = new CommandRequirements.Builder(Permission.RELOAD).build();
     }
@@ -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,14 +8,11 @@ import java.util.HashMap;
 import java.util.List;
 
 public class CmdRules extends FCommand {
-
-    /**
-     * @author Illyria Team
-     */
-
     public CmdRules() {
         super();
-        aliases.addAll(Aliases.rules);
+        aliases.add("r");
+        aliases.add("rule");
+        aliases.add("rules");
 
         this.optionalArgs.put("add/remove/set/clear", "");
 

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

@@ -6,12 +6,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSB extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdSB() {
-        this.aliases.addAll(Aliases.scoreboard);
+        this.aliases.add("sb");
+        this.aliases.add("scoreboard");
 
         this.requirements = new CommandRequirements.Builder(Permission.SCOREBOARD)
                 .playerOnly()

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

@@ -7,13 +7,10 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSaveAll extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdSaveAll() {
         super();
-        this.aliases.addAll(Aliases.saveAll);
+        this.aliases.add("saveall");
+        this.aliases.add("save");
 
         this.requirements = new CommandRequirements.Builder(Permission.SAVE)
                 .build();

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;
@@ -32,7 +28,8 @@ public class CmdSeeChunk extends FCommand {
 
     public CmdSeeChunk() {
         super();
-        aliases.addAll(Aliases.seeChunk);
+        aliases.add("seechunk");
+        aliases.add("sc");
 
         this.useParticles = FactionsPlugin.getInstance().getConfig().getBoolean("see-chunk.particles", true);
         interval = FactionsPlugin.getInstance().getConfig().getLong("see-chunk.interval", 10L);

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

@@ -7,12 +7,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSeeDiscord extends FCommand{
 
-    /**
-     * @author Driftay
-     */
-
     public CmdSeeDiscord() {
-        this.aliases.addAll(Aliases.discord_see);
+        this.aliases.add("seediscord");
+        this.aliases.add("discord");
 
         this.optionalArgs.put("faction", "yours");
 
@@ -24,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,13 +5,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSetBanner extends FCommand {
 
-    /**
-     * @author Illyria Team
-     */
-
     public CmdSetBanner() {
         super();
-        aliases.addAll(Aliases.setBanner);
+        aliases.add("setbanner");
 
         this.requirements = new CommandRequirements.Builder(Permission.BANNER)
                 .playerOnly()

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

@@ -6,14 +6,13 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSetDefaultRole extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdSetDefaultRole() {
         super();
 
-        this.aliases.addAll(Aliases.setDefaultRole);
+        this.aliases.add("defaultrole");
+        this.aliases.add("defaultrank");
+        this.aliases.add("default");
+        this.aliases.add("def");
         this.requiredArgs.add("role");
 
         this.requirements = new CommandRequirements.Builder(Permission.DEFAULTRANK)

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

@@ -8,13 +8,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSetDiscord extends FCommand {
 
-    /**
-     * @author Driftay
-     */
-
     public CmdSetDiscord(){
         super();
-        this.aliases.addAll(Aliases.discord_set);
+        this.aliases.add("setdiscord");
 
         this.optionalArgs.put("faction", "yours");
 

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

@@ -9,13 +9,9 @@ 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.addAll(Aliases.setWarp);
+        this.aliases.add("setwarp");
+        this.aliases.add("sw");
         this.requiredArgs.add("warp name");
         this.optionalArgs.put("password", "password");
         this.requirements = new CommandRequirements.Builder(Permission.SETWARP).playerOnly().memberOnly().withAction(PermissableAction.SETWARP).build();

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

@@ -7,12 +7,9 @@ import org.bukkit.ChatColor;
 
 public class CmdSetMaxVaults extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdSetMaxVaults() {
-        this.aliases.addAll(Aliases.setMaxVaults);
+        this.aliases.add("setmaxvaults");
+        this.aliases.add("smv");
         this.requiredArgs.add("faction");
         this.requiredArgs.add("number");
 

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

@@ -7,12 +7,8 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSethome extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdSethome() {
-        this.aliases.addAll(Aliases.setHome);
+        this.aliases.add("sethome");
         this.optionalArgs.put("faction tag", "mine");
 
         this.requirements = new CommandRequirements.Builder(Permission.SETHOME)
@@ -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,14 +14,11 @@ import java.util.List;
 
 public class CmdShow extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     List<String> defaults = new ArrayList<>();
 
     public CmdShow() {
-        this.aliases.addAll(Aliases.show_show);
+        this.aliases.add("show");
+        this.aliases.add("who");
 
         // add defaults to /f show in case config doesnt have it
         defaults.add("{header}");

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

@@ -8,12 +8,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdShowClaims extends FCommand {
 
-    /**
-     * @author Illyria Team
-     */
-
     public CmdShowClaims() {
-        this.aliases.addAll(Aliases.show_claims);
+        this.aliases.add("showclaims");
+        this.aliases.add("showclaim");
 
         this.requirements = new CommandRequirements.Builder(Permission.SHOWCLAIMS)
                 .playerOnly()

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,13 +10,9 @@ import org.bukkit.ChatColor;
 
 public class CmdShowInvites extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdShowInvites() {
         super();
-        aliases.addAll(Aliases.show_invites);
+        aliases.add("showinvites");
 
         this.requirements = new CommandRequirements.Builder(Permission.SHOW_INVITES)
                 .playerOnly()
@@ -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,13 +7,10 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSpawnerLock extends FCommand {
 
-    /**
-     * @author Illyria Team
-     */
-
     public CmdSpawnerLock(){
         super();
-        this.aliases.addAll(Aliases.spawnerlock);
+        this.aliases.add("lockspawners");
+        this.aliases.add("spawnerlock");
 
         this.requirements = new CommandRequirements.Builder(Permission.LOCKSPAWNERS)
                 .build();

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

@@ -10,13 +10,10 @@ import java.util.ArrayList;
 
 public class CmdStatus extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdStatus() {
         super();
-        this.aliases.addAll(Aliases.status);
+        this.aliases.add("status");
+        this.aliases.add("s");
 
         this.requirements = new CommandRequirements.Builder(Permission.STATUS)
                 .playerOnly()

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

@@ -4,13 +4,9 @@ import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdStealth extends FCommand {
-
-    /**
-     * @author Driftay
-     */
-
     public CmdStealth() {
-        this.aliases.addAll(Aliases.stealth);
+        this.aliases.add("ninja");
+        this.aliases.add("stealth");
 
         this.requirements = new CommandRequirements.Builder(Permission.STEALTH)
                 .playerOnly()

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();
@@ -18,7 +15,7 @@ public class CmdStrikes extends FCommand {
     public CmdStrikes() {
         super();
 
-        this.aliases.addAll(Aliases.strikes_strikes);
+        this.aliases.add("strikes");
 
         this.addSubCommand(cmdStrikesGive);
         this.addSubCommand(cmdStrikesInfo);

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

@@ -6,13 +6,10 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdStrikesGive extends FCommand {
 
-    /**
-     * @author Driftay
-     */
 
     public CmdStrikesGive() {
         super();
-        this.aliases.addAll(Aliases.strikes_give);
+        this.aliases.add("give");
         this.requiredArgs.add(0, "faction");
 
         this.requirements = new CommandRequirements.Builder(Permission.SETSTRIKES)

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

@@ -6,13 +6,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdStrikesInfo extends FCommand {
 
-    /**
-     * @author Driftay
-     */
-
     public CmdStrikesInfo() {
         super();
-        this.aliases.addAll(Aliases.strikes_info);
+        this.aliases.add("info");
         this.optionalArgs.put("target", "faction");
 
         this.requirements = new CommandRequirements.Builder(Permission.SETSTRIKES)

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

@@ -6,13 +6,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdStrikesSet extends FCommand {
 
-    /**
-     * @author Driftay
-     */
-
     public CmdStrikesSet() {
         super();
-        this.aliases.addAll(Aliases.strikes_set);
+        this.aliases.add("set");
         this.requiredArgs.add(0, "faction");
         this.requiredArgs.add(1, "amount");
 

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

@@ -6,13 +6,10 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdStrikesTake extends FCommand {
 
-    /**
-     * @author Driftay
-     */
 
     public CmdStrikesTake() {
         super();
-        this.aliases.addAll(Aliases.strikes_take);
+        this.aliases.add("take");
         this.requiredArgs.add(0, "faction");
         this.requiredArgs.add(1, "number of strikes");
 

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

@@ -13,13 +13,10 @@ import org.bukkit.entity.Player;
 
 public class CmdStuck extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdStuck() {
         super();
-        this.aliases.addAll(Aliases.stuck);
+        this.aliases.add("stuck");
+        this.aliases.add("halp!"); // halp!c:
 
 
         this.requirements = new CommandRequirements.Builder(Permission.STUCK)

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

@@ -1,13 +1,12 @@
 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;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.util.MiscUtil;
+import com.massivecraft.factions.zcore.faudit.FLogType;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
 
@@ -15,12 +14,9 @@ import java.util.ArrayList;
 
 public class CmdTag extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdTag() {
-        this.aliases.addAll(Aliases.tag);
+        this.aliases.add("tag");
+        this.aliases.add("rename");
 
         this.requiredArgs.add("faction tag");
 
@@ -33,57 +29,56 @@ public class CmdTag extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
+        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);
+        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;
             }
 
-            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,19 +2,14 @@ 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.addAll(Aliases.title);
+        this.aliases.add("title");
         this.requiredArgs.add("player name");
         this.optionalArgs.put("title", "");
 
@@ -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,13 +6,11 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdToggleAllianceChat extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdToggleAllianceChat() {
         super();
-        this.aliases.addAll(Aliases.toggleAllianceChat);
+        this.aliases.add("tac");
+        this.aliases.add("togglealliancechat");
+        this.aliases.add("ac");
 
         this.requirements = new CommandRequirements.Builder(Permission.TOGGLE_ALLIANCE_CHAT)
                 .playerOnly()

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

@@ -12,13 +12,10 @@ import java.util.ArrayList;
 
 public class CmdTop extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdTop() {
         super();
-        this.aliases.addAll(Aliases.top);
+        this.aliases.add("top");
+        this.aliases.add("t");
         this.requiredArgs.add("criteria");
         this.optionalArgs.put("page", "1");
 

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

@@ -9,13 +9,9 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdTpBanner extends FCommand {
 
-    /**
-     * @author Illyria Team
-     */
-
     public CmdTpBanner() {
         super();
-        this.aliases.addAll(Aliases.tpBanner);
+        this.aliases.add("tpbanner");
 
         this.requirements = new CommandRequirements.Builder(Permission.TPBANNER)
                 .playerOnly()
@@ -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", () -> {