Version Change

[+] Greatly optmized ALOT of Commands!
[+] Removed Portal Travel Agent (Recoding)
[+] Added Administrator Command F Lookup

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.massivecraft</groupId>
     <artifactId>Factions</artifactId>
-    <version>1.6.9.5-U0.2.1-2.1.0-BETA</version>
+    <version>1.6.9.5-U0.2.1-2.2.2-BETA</version>
     <packaging>jar</packaging>
 
     <name>SaberFactions</name>
@@ -41,6 +41,10 @@
                 <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>
@@ -101,7 +105,7 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.13-R0.1-SNAPSHOT</version>
+            <version>1.15.1-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
             <exclusions>
                 <exclusion>

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

@@ -1,6 +1,7 @@
 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;
@@ -98,12 +99,30 @@ 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;
+
     //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;
@@ -235,7 +254,6 @@ 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
@@ -536,7 +554,6 @@ 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

@@ -70,8 +70,8 @@ public class FLocation implements Serializable {
         String worldName = string.substring(start, index);
         start = index + 1;
         index = string.indexOf(",", start);
-        int x = Integer.valueOf(string.substring(start, index));
+        int x = Integer.parseInt(string.substring(start, index));
-        int y = Integer.valueOf(string.substring(index + 1, string.length() - 1));
+        int y = Integer.parseInt(string.substring(index + 1, string.length() - 1));
         return new FLocation(worldName, x, y);
     }
 

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

@@ -7,6 +7,7 @@ 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;
@@ -30,6 +31,36 @@ public interface FPlayer extends EconomyParticipator {
 
     boolean hasNotificationsEnabled();
 
+    /**
+     * Get if a player has setup their Discord before
+     * @return if the player setup Discord as a boolean
+     */
+    boolean discordSetup();
+
+    /**
+     * Get the players Discord user ID
+     * @return players Discord user ID as a String
+     */
+    String discordUserID();
+
+    /**
+     * Set the players Boolean defining if the player has setup their Discord
+     * @param b Boolean for discordSetup to be defined to
+     */
+    void setDiscordSetup(Boolean b);
+
+    /**
+     * Set the players Discord user ID
+     * @param s String for their user ID to be set to
+     */
+    void setDiscordUserID(String s);
+
+    /**
+     * Get the players Discord user (If the player has not setup Discord it will return null!)
+     * @return User from players set Discord User ID
+     */
+    User discordUser();
+
     /**
      * Used to check if this player should be served titles
      * @return if this FPlayer has titles enabled as a boolean
@@ -230,7 +261,7 @@ public interface FPlayer extends EconomyParticipator {
 
     int getDeaths();
 
-    void takeMoney(int amt);
+    boolean takeMoney(int amt);
 
     boolean hasMoney(int amt);
 

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

@@ -11,8 +11,8 @@ 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.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;
@@ -267,11 +267,8 @@ public class FactionsPlugin extends MPlugin {
             this.getServer().getScheduler().runTaskTimer(this, CheckTask::cleanupTask, 0L, 1200L);
             this.getServer().getScheduler().runTaskTimerAsynchronously(this, new WeeWooTask(this), 600L, 600L);
         }
-        if(Conf.useDiscordSystem && !Conf.discordBotToken.equals("<token here>")) {
+        //Setup Discord Bot
-            new FactionChatHandler(this);
+        new Discord(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();
 
@@ -415,7 +412,7 @@ public class FactionsPlugin extends MPlugin {
                 .registerTypeAdapterFactory(EnumTypeAdapter.ENUM_FACTORY);
     }
 
-    private void divider() {
+    public void divider() {
         System.out.println("  .-.-.   .-.-.   .-.-.   .-.-.   .-.-.   .-.-.   .-.-.   .-.-");
         System.out.println(" / / \\ \\ / / \\ \\ / / \\ \\ / / \\ \\ / / \\ \\ / / \\ \\ / / \\ \\ / / \\");
         System.out.println("`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'");

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -13,6 +13,11 @@ import org.bukkit.inventory.PlayerInventory;
 import org.bukkit.inventory.meta.ItemMeta;
 
 public class CmdBanner extends FCommand {
+
+    /**
+     * @author Illyria Team
+     */
+
     public CmdBanner() {
         this.aliases.add("banner");
         this.aliases.add("warbanner");
@@ -29,12 +34,10 @@ public class CmdBanner extends FCommand {
             context.msg(TL.COMMAND_BANNER_NOBANNER);
             return;
         }
-        if (!context.fPlayer.hasMoney(FactionsPlugin.getInstance().getConfig().getInt("fbanners.Banner-Cost", 5000))) {
+        if (!context.fPlayer.takeMoney(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")));
@@ -44,7 +47,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) {
@@ -53,11 +56,10 @@ 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,6 +6,10 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdBoom extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     public CmdBoom() {
         super();
         this.aliases.add("noboom");

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

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

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

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

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

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

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

@@ -6,6 +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.add("checkp");

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

@@ -10,6 +10,11 @@ import mkremins.fanciful.FancyMessage;
 import org.bukkit.ChatColor;
 
 public class CmdColeader extends FCommand {
+
+    /**
+     * @author FactionsUUID Team
+     */
+
     public CmdColeader() {
         super();
         this.aliases.add("co");

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

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

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

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

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

@@ -1,6 +1,7 @@
 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;
@@ -8,13 +9,20 @@ import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.util.MiscUtil;
 import com.massivecraft.factions.zcore.util.TL;
+import net.dv8tion.jda.core.entities.Member;
+import net.dv8tion.jda.core.exceptions.HierarchyException;
 import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
 
 import java.util.ArrayList;
 
 
 public class CmdCreate extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     public CmdCreate() {
         super();
         this.aliases.add("create");
@@ -28,6 +36,10 @@ 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()) {
@@ -78,7 +90,6 @@ 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.
@@ -90,6 +101,22 @@ 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

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

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

@@ -3,12 +3,17 @@ 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 com.massivecraft.factions.zcore.util.TextUtil;
 
 public class CmdDescription extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     public CmdDescription() {
         super();
         this.aliases.add("desc");
@@ -25,26 +30,28 @@ public class CmdDescription extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
+        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
-        if (!context.payForCommand(Conf.econCostDesc, TL.COMMAND_DESCRIPTION_TOCHANGE, TL.COMMAND_DESCRIPTION_FORCHANGE)) {
+            // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
-            return;
+            if (!context.payForCommand(Conf.econCostDesc, TL.COMMAND_DESCRIPTION_TOCHANGE, TL.COMMAND_DESCRIPTION_FORCHANGE)) {
-        }
+                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.
-        context.faction.setDescription(TextUtil.implode(context.args, " ").replaceAll("%", "").replaceAll("(&([a-f0-9klmnor]))", "& $2"));
+            context.faction.setDescription(TextUtil.implode(context.args, " ").replaceAll("%", "").replaceAll("(&([a-f0-9klmnor]))", "& $2"));
 
-        if (!Conf.broadcastDescriptionChanges) {
+            if (!Conf.broadcastDescriptionChanges) {
-            context.msg(TL.COMMAND_DESCRIPTION_CHANGED, context.faction.describeTo(context.fPlayer));
+                context.msg(TL.COMMAND_DESCRIPTION_CHANGED, context.faction.describeTo(context.fPlayer));
-            context.sendMessage(context.faction.getDescription());
+                context.sendMessage(context.faction.getDescription());
-            return;
+                return;
-        }
+            }
 
-        // Broadcast the description to everyone
+            // Broadcast the description to everyone
-        for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
+            for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
-            fplayer.msg(TL.COMMAND_DESCRIPTION_CHANGES, context.faction.describeTo(fplayer));
+                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
+                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,6 +16,10 @@ import java.util.HashMap;
 
 public class CmdDisband extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
 
     private static HashMap<String, String> disbandMap = new HashMap<>();
 

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

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

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

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

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

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

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

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

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

@@ -19,6 +19,10 @@ 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;

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

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

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

@@ -9,6 +9,11 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 
 public class CmdGetVault extends FCommand {
+
+    /**
+     * @author Illyria Team
+     */
+
     public CmdGetVault() {
         super();
         this.aliases.add("getvault");
@@ -22,7 +27,7 @@ public class CmdGetVault extends FCommand {
     @Override
     public void perform(CommandContext context) {
         if (!FactionsPlugin.getInstance().getConfig().getBoolean("fvault.Enabled")) {
-            context.fPlayer.sendMessage("This command is disabled!");
+            context.fPlayer.msg(TL.GENERIC_DISABLED, "Faction Vaults");
             return;
         }
         Location vaultLocation = context.faction.getVault();
@@ -42,9 +47,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,6 +13,10 @@ import java.util.List;
 
 public class CmdHelp extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     public ArrayList<ArrayList<String>> helpPages;
 
     public CmdHelp() {

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

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

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

@@ -4,6 +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.add("inspect");

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

@@ -16,6 +16,10 @@ import java.util.Objects;
 
 public class CmdInventorySee extends FCommand {
 
+    /**
+     * @author Driftay
+     */
+
     public CmdInventorySee() {
         super();
 
@@ -32,7 +36,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);
+            context.msg(TL.GENERIC_DISABLED, "Inventory See");
             return;
         }
 

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

@@ -11,6 +11,10 @@ import org.bukkit.ChatColor;
 
 public class CmdInvite extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     public CmdInvite() {
         super();
         this.aliases.add("invite");

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

@@ -1,14 +1,21 @@
 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.struct.Permission;
 import com.massivecraft.factions.zcore.fupgrades.UpgradeType;
 import com.massivecraft.factions.zcore.util.TL;
+import net.dv8tion.jda.core.entities.Member;
+import net.dv8tion.jda.core.exceptions.HierarchyException;
 import org.bukkit.Bukkit;
 
 public class CmdJoin extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     public CmdJoin() {
         super();
         this.aliases.add("join");
@@ -116,7 +123,18 @@ public class CmdJoin extends FCommand {
         }
 
         faction.deinvite(fplayer);
-        context.fPlayer.setRole(faction.getDefaultRole());
+        try {
+            context.fPlayer.setRole(faction.getDefaultRole());
+            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.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

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

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

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

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

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

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

@@ -14,6 +14,10 @@ import java.util.List;
 
 public class CmdList extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     private String[] defaults = new String[3];
 
     public CmdList() {
@@ -39,74 +43,76 @@ 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,6 +6,10 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdLock extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     // TODO: This solution needs refactoring.
     /*
        factions.lock:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -3,12 +3,17 @@ package com.massivecraft.factions.cmd;
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayers;
+import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdOpen extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     public CmdOpen() {
         super();
         this.aliases.add("open");
@@ -23,23 +28,25 @@ public class CmdOpen extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
+        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
-        if (!context.payForCommand(Conf.econCostOpen, TL.COMMAND_OPEN_TOOPEN, TL.COMMAND_OPEN_FOROPEN)) {
+            // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
-            return;
+            if (!context.payForCommand(Conf.econCostOpen, TL.COMMAND_OPEN_TOOPEN, TL.COMMAND_OPEN_FOROPEN)) {
-        }
+                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,6 +8,10 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdOwner extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     public CmdOwner() {
         super();
         this.aliases.add("owner");

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

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

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

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

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

@@ -8,6 +8,10 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdPaypalSet extends FCommand {
 
+    /**
+     * @author Driftay
+     */
+
     public CmdPaypalSet() {
         this.aliases.add("setpaypal");
 
@@ -25,7 +29,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);
+            context.fPlayer.msg(TL.GENERIC_DISABLED, "Faction Paypals");
             return;
         }
         if (context.fPlayer.getRole() != Role.LEADER && !context.fPlayer.isAdminBypassing()) {

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -2,6 +2,7 @@ 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;
@@ -9,6 +10,10 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdReload extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     public CmdReload() {
         super();
         this.aliases.add("reload");
@@ -26,7 +31,7 @@ public class CmdReload extends FCommand {
         FactionsPlugin.getInstance().loadLang();
 
 
-        if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) {
+        if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight", false)) {
             FactionsPlugin.getInstance().factionsFlight = true;
         }
 
@@ -34,6 +39,10 @@ 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,6 +8,11 @@ import java.util.HashMap;
 import java.util.List;
 
 public class CmdRules extends FCommand {
+
+    /**
+     * @author Illyria Team
+     */
+
     public CmdRules() {
         super();
         aliases.add("r");

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -7,6 +7,10 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSethome extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     public CmdSethome() {
         this.aliases.add("sethome");
         this.optionalArgs.put("faction tag", "mine");
@@ -20,36 +24,38 @@ public class CmdSethome extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        if (!Conf.homesEnabled) {
+        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
-            context.msg(TL.COMMAND_SETHOME_DISABLED);
+            if (!Conf.homesEnabled) {
-            return;
+                context.msg(TL.COMMAND_SETHOME_DISABLED);
-        }
+                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,6 +14,10 @@ import java.util.List;
 
 public class CmdShow extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     List<String> defaults = new ArrayList<>();
 
     public CmdShow() {

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

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

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

@@ -3,6 +3,7 @@ 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;
@@ -10,6 +11,10 @@ import org.bukkit.ChatColor;
 
 public class CmdShowInvites extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     public CmdShowInvites() {
         super();
         aliases.add("showinvites");
@@ -23,14 +28,12 @@ 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,6 +7,10 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdSpawnerLock extends FCommand {
 
+    /**
+     * @author Illyria Team
+     */
+
     public CmdSpawnerLock(){
         super();
         this.aliases.add("lockspawners");

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,6 +1,7 @@
 package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.*;
+import com.massivecraft.factions.discord.Discord;
 import com.massivecraft.factions.event.FactionRenameEvent;
 import com.massivecraft.factions.scoreboards.FTeamWrapper;
 import com.massivecraft.factions.struct.Permission;
@@ -13,6 +14,10 @@ import java.util.ArrayList;
 
 public class CmdTag extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     public CmdTag() {
         this.aliases.add("tag");
         this.aliases.add("rename");
@@ -28,55 +33,59 @@ public class CmdTag extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        String tag = context.argAsString(0);
+        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
 
-        // TODO does not first test cover selfcase?
+            String tag = context.argAsString(0);
-        if (Factions.getInstance().isTagTaken(tag) && !MiscUtil.getComparisonString(tag).equals(context.faction.getComparisonTag())) {
-            context.msg(TL.COMMAND_TAG_TAKEN);
-            return;
-        }
 
-        ArrayList<String> errors = MiscUtil.validateTag(tag);
+            // TODO does not first test cover selfcase?
-        if (errors.size() > 0) {
+            if (Factions.getInstance().isTagTaken(tag) && !MiscUtil.getComparisonString(tag).equals(context.faction.getComparisonTag())) {
-            context.sendMessage(errors);
+                context.msg(TL.COMMAND_TAG_TAKEN);
-            return;
+                return;
-        }
-
-        // if economy is enabled, they're not on the bypass list, and this command has a cost set, make sure they can pay
-        if (!context.canAffordCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE.toString())) {
-            return;
-        }
-
-        // trigger the faction rename event (cancellable)
-        FactionRenameEvent renameEvent = new FactionRenameEvent(context.fPlayer, tag);
-        Bukkit.getServer().getPluginManager().callEvent(renameEvent);
-        if (renameEvent.isCancelled()) {
-            return;
-        }
-
-        // then make 'em pay (if applicable)
-        if (!context.payForCommand(Conf.econCostTag, TL.COMMAND_TAG_TOCHANGE, TL.COMMAND_TAG_FORCHANGE)) {
-            return;
-        }
-
-        String oldtag = context.faction.getTag();
-        context.faction.setTag(tag);
-
-        // Inform
-        for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
-            if (fplayer.getFactionId().equals(context.faction.getId())) {
-                fplayer.msg(TL.COMMAND_TAG_FACTION, context.fPlayer.describeTo(context.faction, true), context.faction.getTag(context.faction));
-                continue;
             }
 
-            // Broadcast the tag change (if applicable)
+            ArrayList<String> errors = MiscUtil.validateTag(tag);
-            if (Conf.broadcastTagChanges) {
+            if (errors.size() > 0) {
-                Faction faction = fplayer.getFaction();
+                context.sendMessage(errors);
-                fplayer.msg(TL.COMMAND_TAG_CHANGED, context.fPlayer.getColorTo(faction) + oldtag, context.faction.getTag(faction));
+                return;
             }
-        }
 
-        FTeamWrapper.updatePrefixes(context.faction);
+            // 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);
+            Discord.changeFactionTag(context.faction, oldtag);
+
+            // 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,12 +2,17 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 import com.massivecraft.factions.zcore.util.TextUtil;
 
 public class CmdTitle extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     public CmdTitle() {
         this.aliases.add("title");
         this.requiredArgs.add("player name");
@@ -20,16 +25,19 @@ public class CmdTitle extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-        FPlayer you = context.argAsBestFPlayerMatch(0);
+        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
-        if (you == null) return;
+            FPlayer you = context.argAsBestFPlayerMatch(0);
-        context.args.remove(0);
+            if (you == null) return;
-        String title = TextUtil.implode(context.args, " ");
+            context.args.remove(0);
-        if (!context.canIAdministerYou(context.fPlayer, you)) return;
+            String title = TextUtil.implode(context.args, " ");
-        // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
+            if (!context.canIAdministerYou(context.fPlayer, you)) return;
-        if (!context.payForCommand(Conf.econCostTitle, TL.COMMAND_TITLE_TOCHANGE, TL.COMMAND_TITLE_FORCHANGE)) return;
+            // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
-        you.setTitle(context.sender, title);
+            if (!context.payForCommand(Conf.econCostTitle, TL.COMMAND_TITLE_TOCHANGE, TL.COMMAND_TITLE_FORCHANGE))
-        // Inform
+                return;
-        context.faction.msg(TL.COMMAND_TITLE_CHANGED, context.fPlayer.describeTo(context.faction, true), you.describeTo(context.faction, true));
+            you.setTitle(context.sender, title);
+            // 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,6 +6,10 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdToggleAllianceChat extends FCommand {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     public CmdToggleAllianceChat() {
         super();
         this.aliases.add("tac");

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -7,6 +7,10 @@ import com.massivecraft.factions.zcore.util.TL;
 
 public class CmdViewChest extends FCommand {
 
+    /**
+     * @author Driftay
+     */
+
     public CmdViewChest() {
         super();
         this.aliases.add("viewchest");
@@ -22,7 +26,7 @@ public class CmdViewChest extends FCommand {
     @Override
     public void perform(CommandContext context) {
         if (!FactionsPlugin.getInstance().getConfig().getBoolean("fchest.Enabled")) {
-            context.msg(TL.GENERIC_DISABLED);
+            context.msg(TL.GENERIC_DISABLED, "Faction Chests");
             return;
         }
 

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

@@ -19,6 +19,10 @@ import java.util.List;
  */
 public class CommandContext {
 
+    /**
+     * @author FactionsUUID Team
+     */
+
     public CommandSender sender;
 
     public Player player;