Version Change

Fixed OCD
[+] 1.15 Support Added!
2019-12-24 09:32:23 -05:00 · 2019-12-24 09:27:36 -05:00 · 2019-12-24 09:19:43 -05:00 · 2019-12-22 18:24:50 -05:00 · 2019-12-22 18:21:17 -05:00 · 2019-12-22 01:03:47 -05:00
245 changed files with 4190 additions and 1312 deletions
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@

    <groupId>com.massivecraft</groupId>
    <artifactId>Factions</artifactId>
-    <version>1.6.9.5-U0.2.1-2.0.5-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>
@@ -126,6 +130,11 @@
                </exclusion>
            </exclusions>
        </dependency>
+        <dependency>
+            <groupId>org.ocpsoft.prettytime</groupId>
+            <artifactId>prettytime</artifactId>
+            <version>4.0.0.Final</version>
+        </dependency>
        <dependency>
            <groupId>net.milkbowl.vault</groupId>
            <artifactId>VaultAPI</artifactId>
@@ -377,9 +386,10 @@
            </exclusions>
        </dependency>
        <dependency>
-            <groupId>org.codemc.worldguardwrapper</groupId>
-            <artifactId>worldguardwrapper</artifactId>
-            <version>1.1.6-SNAPSHOT</version>
+            <groupId>me.rayzr522</groupId>
+            <artifactId>jsonmessage</artifactId>
+            <version>1.0.0</version>
+            <scope>compile</scope>
        </dependency>
        <dependency>
            <groupId>com.jagrosh</groupId>
@@ -411,6 +421,14 @@
            <id>spigot-repo</id>
            <url>https://hub.spigotmc.org/nexus/content/groups/public/</url>
        </repository>
+        <repository>
+            <id>org.ocpsoft.prettytime</id>
+            <url>https://mvnrepository.com/artifact/org.ocpsoft.prettytime/prettytime</url>
+        </repository>
+        <repository>
+            <id>rayzr-repo</id>
+            <url>https://cdn.rawgit.com/Rayzr522/maven-repo/master/</url>
+        </repository>
        <repository>
            <id>maven.sk89q.com</id>
            <url>http://maven.sk89q.com/repo/</url>
--- a/src/main/java/com/massivecraft/factions/Conf.java
+++ b/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;
@@ -70,6 +71,7 @@ public class Conf {
    public static boolean chatTagEnabled = true;
    public static transient boolean chatTagHandledByAnotherPlugin = false;
    public static boolean chatTagRelationColored = true;
+    public static List<String> blacklistedFactionNames = new ArrayList<>();
    public static String chatTagReplaceString = "[FACTION]";
    public static String chatTagInsertAfterString = "";
    public static String chatTagInsertBeforeString = "";
@@ -97,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;
@@ -114,6 +134,7 @@ public class Conf {
    public static boolean logMoneyTransactions = true;
    public static boolean logPlayerCommands = true;
    // prevent some potential exploits
+    public static boolean denyFlightIfInNoClaimingWorld = false;
    public static boolean preventCreeperGlitch = true;
    public static boolean handleExploitObsidianGenerators = true;
    public static boolean handleExploitEnderPearlClipping = true;
@@ -230,6 +251,11 @@ public class Conf {
    public static Set<Material> territoryBypassProtectedMaterials = EnumSet.noneOf(Material.class);
    // Dependency check
    public static boolean dependencyCheck = true;
+
+    public static Set<Material> territoryCancelAndAllowItemUseMaterial = new HashSet<>();
+    public static Set<Material> territoryDenySwitchMaterials = new HashSet<>();
+    public static boolean allowCreeperEggingChests = true;
+
    // Economy settings
    public static boolean econEnabled = false;
    public static String econUniverseAccount = "";
@@ -342,6 +368,7 @@ public class Conf {
    // faction-<factionId>
    public static int defaultMaxVaults = 0;
    public static boolean disableFlightOnFactionClaimChange = true;
+    public static boolean sendFactionChangeMessage = true;

    public static Backend backEnd = Backend.JSON;

@@ -378,6 +405,8 @@ public class Conf {
    static {
        baseCommandAliases.add("f");

+        blacklistedFactionNames.add("somenamehere");
+
        territoryEnemyDenyCommands.add("home");
        territoryEnemyDenyCommands.add("sethome");
        territoryEnemyDenyCommands.add("spawn");
@@ -385,11 +414,108 @@ public class Conf {
        territoryEnemyDenyCommands.add("tpaccept");
        territoryEnemyDenyCommands.add("tpa");

+        territoryDenySwitchMaterials.add(XMaterial.ACACIA_FENCE_GATE.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.BIRCH_FENCE_GATE.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_FENCE_GATE.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.JUNGLE_FENCE_GATE.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.OAK_FENCE_GATE.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.SPRUCE_FENCE_GATE.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.ACACIA_DOOR.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.BIRCH_DOOR.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_DOOR.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.JUNGLE_DOOR.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.OAK_DOOR.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.SPRUCE_DOOR.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.DISPENSER.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.CHEST.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.TRAPPED_CHEST.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.ACACIA_BUTTON.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.BIRCH_BUTTON.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_BUTTON.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.JUNGLE_BUTTON.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.OAK_BUTTON.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.SPRUCE_BUTTON.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.DROPPER.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.HOPPER.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.ITEM_FRAME.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.ACACIA_TRAPDOOR.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.BIRCH_TRAPDOOR.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_TRAPDOOR.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.JUNGLE_TRAPDOOR.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.OAK_TRAPDOOR.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.SPRUCE_TRAPDOOR.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.LEVER.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.COMPARATOR.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.REPEATER.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.ACACIA_BUTTON.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.BIRCH_BUTTON.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.DARK_OAK_BUTTON.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.JUNGLE_BUTTON.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.OAK_BUTTON.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.SPRUCE_BUTTON.parseMaterial());
+
+        territoryDenySwitchMaterials.add(XMaterial.PURPLE_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.WHITE_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.MAGENTA_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.LIGHT_BLUE_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.CYAN_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.BLUE_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.BROWN_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.ORANGE_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.GREEN_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.RED_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.BLACK_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.GRAY_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.LIME_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.LIGHT_GRAY_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.PINK_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.YELLOW_SHULKER_BOX.parseMaterial());
+        territoryDenySwitchMaterials.add(XMaterial.SHULKER_BOX.parseMaterial());
+
+        // 1.14 Barrel is a container.
+        territoryDenySwitchMaterials.add(XMaterial.BARREL.parseMaterial());
+
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.GOLDEN_APPLE.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.APPLE.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.ENCHANTED_GOLDEN_APPLE.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_BEEF.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_MUTTON.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_CHICKEN.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_COD.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_PORKCHOP.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_RABBIT.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.COOKED_SALMON.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.ENDER_PEARL.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.POTION.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.SPLASH_POTION.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.CREEPER_SPAWN_EGG.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.BOW.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_HELMET.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_CHESTPLATE.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_LEGGINGS.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.DIAMOND_BOOTS.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_HELMET.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_CHESTPLATE.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_LEGGINGS.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.IRON_BOOTS.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_HELMET.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_CHESTPLATE.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_LEGGINGS.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.LEATHER_BOOTS.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_HELMET.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_CHESTPLATE.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_LEGGINGS.parseMaterial());
+        territoryCancelAndAllowItemUseMaterial.add(XMaterial.CHAINMAIL_BOOTS.parseMaterial());
+
+
        /// TODO: Consider removing this in a future release, as permissions works just fine now
        territoryProtectedMaterials.add(Material.BEACON);

        // Config is not loading if value is empty ???
        territoryBypassProtectedMaterials.add(Material.COOKIE);
+        territoryBypassProtectedMaterials.add(Material.CHEST);
+        territoryBypassProtectedMaterials.add(Material.TRAPPED_CHEST);
+

        territoryDenyUsageMaterials.add(XMaterial.FIRE_CHARGE.parseMaterial());
        territoryDenyUsageMaterials.add(Material.FLINT_AND_STEEL);
@@ -428,11 +554,14 @@ public class Conf {
        safeZoneNerfedCreatureTypes.add(EntityType.ZOMBIE);

        // Is this called lazy load?
-        defaultFactionPermissions.put("LEADER", new DefaultPermissions(true));
        defaultFactionPermissions.put("COLEADER", new DefaultPermissions(true));
        defaultFactionPermissions.put("MODERATOR", new DefaultPermissions(true));
        defaultFactionPermissions.put("NORMAL MEMBER", new DefaultPermissions(false));
        defaultFactionPermissions.put("RECRUIT", new DefaultPermissions(false));
+        defaultFactionPermissions.put("ALLY", new DefaultPermissions(false));
+        defaultFactionPermissions.put("ENEMY", new DefaultPermissions(false));
+        defaultFactionPermissions.put("TRUCE", new DefaultPermissions(false));
+        defaultFactionPermissions.put("NEUTRAL", new DefaultPermissions(false));
    }

    public static void load() {
@@ -443,6 +572,8 @@ public class Conf {
        FactionsPlugin.getInstance().persist.save(i);
    }

+    public static void saveSync() { FactionsPlugin.instance.persist.saveSync(i); }
+
    public enum Backend {
        JSON,
        //MYSQL,  TODO add MySQL storage
--- a/src/main/java/com/massivecraft/factions/FLocation.java
+++ b/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 y = Integer.valueOf(string.substring(index + 1, string.length() - 1));
+        int x = Integer.parseInt(string.substring(start, index));
+        int y = Integer.parseInt(string.substring(index + 1, string.length() - 1));
        return new FLocation(worldName, x, y);
    }

--- a/src/main/java/com/massivecraft/factions/FPlayer.java
+++ b/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,59 @@ public interface FPlayer extends EconomyParticipator {

    boolean hasNotificationsEnabled();

+    /**
+     * Get if a player has setup their Discord before
+     * @return if the player setup Discord as a boolean
+     */
+    boolean discordSetup();
+
+    /**
+     * Get the players Discord user ID
+     * @return players Discord user ID as a String
+     */
+    String discordUserID();
+
+    /**
+     * Set the players Boolean defining if the player has setup their Discord
+     * @param b Boolean for discordSetup to be defined to
+     */
+    void setDiscordSetup(Boolean b);
+
+    /**
+     * Set the players Discord user ID
+     * @param s String for their user ID to be set to
+     */
+    void setDiscordUserID(String s);
+
+    /**
+     * Get the players Discord user (If the player has not setup Discord it will return null!)
+     * @return User from players set Discord User ID
+     */
+    User discordUser();
+
+    /**
+     * Used to check if this player should be served titles
+     * @return if this FPlayer has titles enabled as a boolean
+     */
+    boolean hasTitlesEnabled();
+
+    /**
+     * Used to set if player should be served titles
+     * @param b Boolean to titlesEnabled to
+     */
+    void setTitlesEnabled(Boolean b);
+
+    /**
+     * Used to determine if a player is in their faction's chest
+     * @return if player is in their faction's as a boolean
+     */
+    boolean isInFactionsChest();
+
+    /**
+     * Set if the player is inside of their faction's chest
+     */
+    void setInFactionsChest(boolean b);
+
    boolean isAlt();

    void setAlt(boolean alt);
@@ -207,7 +261,7 @@ public interface FPlayer extends EconomyParticipator {

    int getDeaths();

-    void takeMoney(int amt);
+    boolean takeMoney(int amt);

    boolean hasMoney(int amt);

--- a/src/main/java/com/massivecraft/factions/FactionsPlugin.java
+++ b/src/main/java/com/massivecraft/factions/FactionsPlugin.java
@@ -11,9 +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.cmd.chest.ChestLogsHandler;
+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;
@@ -90,6 +89,7 @@ public class FactionsPlugin extends MPlugin {
    private boolean mvdwPlaceholderAPIManager = false;
    private Listener[] eventsListener;
    public List<String> itemList = getConfig().getStringList("fchest.Items-Not-Allowed");
+    private Worldguard wg;


    public FactionsPlugin() {
@@ -185,17 +185,19 @@ public class FactionsPlugin extends MPlugin {
        // Load Conf from disk
        Conf.load();
        //Dependency checks
-        if (Conf.dependencyCheck && (Bukkit.getPluginManager().isPluginEnabled("Vault") && Bukkit.getPluginManager().isPluginEnabled("Essentials"))) {
-            RegisteredServiceProvider<Economy> rsp = FactionsPlugin.this.getServer().getServicesManager().getRegistration(Economy.class);
-            FactionsPlugin.econ = rsp.getProvider();
-        } else if (Conf.dependencyCheck) {
+        if (Conf.dependencyCheck && (!Bukkit.getPluginManager().isPluginEnabled("Vault") && !Bukkit.getPluginManager().isPluginEnabled("Essentials"))) {
            divider();
            System.out.println("You are missing dependencies!");
            System.out.println("Please verify EssentialsX and Vault are installed!");
+            Conf.save();
            Bukkit.getPluginManager().disablePlugin(instance);
            divider();
            return;
        }
+        //Update their config if needed
+       // Updater.updateIfNeeded(getConfig());
+        RegisteredServiceProvider<Economy> rsp = FactionsPlugin.this.getServer().getServicesManager().getRegistration(Economy.class);
+        FactionsPlugin.econ = rsp.getProvider();
        com.massivecraft.factions.integration.Essentials.setup();
        hookedPlayervaults = setupPlayervaults();
        FPlayers.getInstance().load();
@@ -229,9 +231,7 @@ public class FactionsPlugin extends MPlugin {
        Econ.setup();
        setupPermissions();

-        if (Conf.worldGuardChecking || Conf.worldGuardBuildPriority) {
-            Worldguard.init(this);
-        }
+        if (Conf.worldGuardChecking || Conf.worldGuardBuildPriority) wg = new Worldguard();

        EngineDynmap.getInstance().init();

@@ -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>")) {
-            new FactionChatHandler(this);
-        } else {
-            System.out.println("\n\n\n SABER-FACTIONS-DISCORD-INTEGRATION - You are not using Discord integration features, set conf.json option useDiscordSystem to true and put a valid token in before using!\n\n\n");
-        }
+        //Setup Discord Bot
+        new Discord(this);

        ShopConfig.setup();

@@ -286,8 +283,7 @@ public class FactionsPlugin extends MPlugin {
                new FUpgradesGUI(),
                new UpgradesListener(),
                new MissionHandler(this),
-                new AntiChestListener(),
-                new ChestLogsHandler()
+                new AntiChestListener()
        };

        for (Listener eventListener : eventsListener)
@@ -416,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("`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'   `-`-'");
@@ -426,9 +422,7 @@ public class FactionsPlugin extends MPlugin {
    public void onDisable() {
        // only save data if plugin actually completely loaded successfully
        if (this.loadSuccessful) {
-            // Dont save, as this is kind of pointless, as the /f config command manually saves.
-            // So any edits done are saved, this way manual edits to json can go through.
-            // Conf.save();
+            Conf.saveSync();
        }

        if (AutoLeaveTask != null) {
@@ -740,4 +734,8 @@ public class FactionsPlugin extends MPlugin {
    public void debug(String s) {
        debug(Level.INFO, s);
    }
+
+    public Worldguard getWg() {
+        return wg;
+    }
 }
--- a/src/main/java/com/massivecraft/factions/cmd/BrigadierManager.java
+++ b/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");

--- a/src/main/java/com/massivecraft/factions/cmd/BrigadierProvider.java
+++ b/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);

 }
--- a/src/main/java/com/massivecraft/factions/cmd/CmdAHome.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdAdmin.java
+++ b/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,6 +30,11 @@ public class CmdAdmin extends FCommand {

    @Override
    public void perform(CommandContext context) {
+        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
+            if (context.player == null) {
+                context.msg(TL.GENERIC_PLAYERONLY);
+                return;
+            }
            // Allows admins bypass this.
            if (!context.fPlayer.isAdminBypassing() && !context.fPlayer.getRole().equals(Role.LEADER)) {
                context.msg(TL.COMMAND_ADMIN_NOTADMIN);
@@ -76,8 +86,11 @@ public class CmdAdmin extends FCommand {

            // 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));
+                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() {
--- a/src/main/java/com/massivecraft/factions/cmd/CmdAnnounce.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdAutoHelp.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdBan.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdBanlist.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdBanner.java
+++ b/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 + ""));
        }
    }
--- a/src/main/java/com/massivecraft/factions/cmd/CmdBoom.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdBypass.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdChat.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdChatSpy.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdCheckpoint.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdColeader.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdConvert.java
+++ b/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]");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdCoords.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdCreate.java
+++ b/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)
--- a/src/main/java/com/massivecraft/factions/cmd/CmdDebug.java
+++ b/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;
+    }
+}
--- a/src/main/java/com/massivecraft/factions/cmd/CmdDeinvite.java
+++ b/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,10 +32,7 @@ public class CmdDeinvite extends FCommand {

    @Override
    public void perform(CommandContext context) {
-
-        // Check if arg 0 == null do you don't have
-        // `No player "null" could be found.` message.
-        if (context.args.get(0) == null) {
+            if (context.args.size() == 0) {
                FancyMessage msg = new FancyMessage(TL.COMMAND_DEINVITE_CANDEINVITE.toString()).color(ChatColor.GOLD);
                for (String id : context.faction.getInvites()) {
                    FPlayer fp = FPlayers.getInstance().getById(id);
@@ -54,6 +55,7 @@ public class CmdDeinvite extends FCommand {
            if (you == null) {
                FancyMessage msg = new FancyMessage(TL.COMMAND_DEINVITE_CANDEINVITE.toString()).color(ChatColor.GOLD);
                for (String id : context.faction.getInvites()) {
+                    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);
@@ -69,9 +71,7 @@ public class CmdDeinvite extends FCommand {
            }

            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));
    }

--- a/src/main/java/com/massivecraft/factions/cmd/CmdDelFWarp.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdDescription.java
+++ b/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,6 +30,7 @@ public class CmdDescription extends FCommand {

    @Override
    public void perform(CommandContext context) {
+        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
            // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
            if (!context.payForCommand(Conf.econCostDesc, TL.COMMAND_DESCRIPTION_TOCHANGE, TL.COMMAND_DESCRIPTION_FORCHANGE)) {
                return;
@@ -45,6 +51,7 @@ public class CmdDescription extends FCommand {
                fplayer.msg(TL.COMMAND_DESCRIPTION_CHANGES, context.faction.describeTo(fplayer));
                fplayer.sendMessage(context.faction.getDescription());  // players can inject "&" or "`" or "<i>" or whatever in their description; &k is particularly interesting looking
            }
+        });
    }

    @Override
--- a/src/main/java/com/massivecraft/factions/cmd/CmdDisband.java
+++ b/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<>();

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

--- a/src/main/java/com/massivecraft/factions/cmd/CmdDiscord.java
+++ b/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;
+    }
+}
--- a/src/main/java/com/massivecraft/factions/cmd/CmdDrain.java
+++ b/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;
+    }
+}
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFGlobal.java
+++ b/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() {
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFWarp.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFly.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdFly.java
@@ -19,9 +19,13 @@ import java.util.concurrent.ConcurrentHashMap;

 public class CmdFly extends FCommand {

+    /**
+     * @author FactionsUUID Team
+     */

-    public static ConcurrentHashMap<String, Boolean> flyMap = new ConcurrentHashMap<String, Boolean>();
-    public static int id = -1;
+
+    public static ConcurrentHashMap<String, Boolean> flyMap = new ConcurrentHashMap<>();
+    public static BukkitTask particleTask = null;
    public static BukkitTask flyTask = null;


@@ -38,7 +42,7 @@ public class CmdFly extends FCommand {

    public static void startParticles() {

-        id = Bukkit.getScheduler().scheduleSyncRepeatingTask(FactionsPlugin.getInstance(), () -> {
+        particleTask = Bukkit.getScheduler().runTaskTimerAsynchronously(FactionsPlugin.instance, () -> {
            for (String name : flyMap.keySet()) {
                Player player = Bukkit.getPlayer(name);
                if (player == null) continue;
@@ -49,11 +53,10 @@ public class CmdFly extends FCommand {

                FPlayer fplayer = FPlayers.getInstance().getByPlayer(player);
                fplayer.isVanished();
-
            }
-            if (flyMap.keySet().size() == 0) {
-                Bukkit.getScheduler().cancelTask(id);
-                id = -1;
+            if (flyMap.isEmpty()) {
+                particleTask.cancel();
+                particleTask = null;
            }
        }, 10L, 3L);
    }
@@ -98,6 +101,9 @@ public class CmdFly extends FCommand {
    }

    public static boolean checkBypassPerms(FPlayer fme, Player me, Faction toFac) {
+        if (Conf.denyFlightIfInNoClaimingWorld && !Conf.worldsNoClaiming.isEmpty() && Conf.worldsNoClaiming.stream().anyMatch(me.getWorld().getName()::equalsIgnoreCase))
+            return false;
+
        if (toFac != fme.getFaction()) {
            if (!me.hasPermission(Permission.FLY_WILD.node) && toFac.isWilderness() || !me.hasPermission(Permission.FLY_SAFEZONE.node) && toFac.isSafeZone() || !me.hasPermission(Permission.FLY_WARZONE.node) && toFac.isWarZone()) {
                fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
@@ -117,7 +123,7 @@ public class CmdFly extends FCommand {
                return false;
            }

-            if (!(me.hasPermission(Permission.FLY_NEUTRAL.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.NEUTRAL && !isSystemFaction(toFac)) {
+            if (!(me.hasPermission(Permission.FLY_NEUTRAL.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.NEUTRAL && !toFac.isSystemFaction()) {
                fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
                return false;
            }
@@ -126,11 +132,6 @@ public class CmdFly extends FCommand {
        return true;
    }

-    public static Boolean isSystemFaction(Faction faction) {
-        return faction.isSafeZone() ||
-                faction.isWarZone() ||
-                faction.isWilderness();
-    }

    public static void checkTaskState() {
        if (flyMap.isEmpty()) {
@@ -188,14 +189,21 @@ public class CmdFly extends FCommand {
        }


-        if (fme.canFlyAtLocation())
+        if (fme.canFlyAtLocation()) {
            context.doWarmUp(WarmUpUtil.Warmup.FLIGHT, TL.WARMUPS_NOTIFY_FLIGHT, "Fly", () -> {
                fme.setFlying(true);
                flyMap.put(fme.getPlayer().getName(), true);
+                if (particleTask == null) {
+                    startParticles();
+                }
+
                if (flyTask == null) {
                    startFlyCheck();
                }
            }, FactionsPlugin.getInstance().getConfig().getLong("warmups.f-fly", 0));
+        } else {
+            fme.msg(TL.COMMAND_FLY_NO_ACCESS, Board.getInstance().getFactionAt(fme.getLastStoodAt()).getTag());
+        }
    }

    @Override
--- a/src/main/java/com/massivecraft/factions/cmd/CmdFocus.java
+++ b/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);
--- a/src/main/java/com/massivecraft/factions/cmd/CmdGetVault.java
+++ b/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);

--- a/src/main/java/com/massivecraft/factions/cmd/CmdHelp.java
+++ b/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() {
--- a/src/main/java/com/massivecraft/factions/cmd/CmdHome.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdHome.java
@@ -20,10 +20,14 @@ import java.util.List;

 public class CmdHome extends FCommand {

+    /**
+     * @author FactionsUUID Team
+     */
+
    public CmdHome() {
        super();
        this.aliases.add("home");
-        this.optionalArgs.put("home", "faction-name");
+        this.optionalArgs.put("faction", "yours");

        this.requirements = new CommandRequirements.Builder(Permission.HOME)
                .playerOnly()
@@ -45,10 +49,14 @@ public class CmdHome extends FCommand {
            return;
        }

-        if (context.args.size() == 1) {
-            Faction faction = context.argAsFaction(0);
-            if (faction == null) return;
-            context.faction = faction;
+        if (context.args.size() >= 1) {
+            Faction target = context.argAsFaction(0);
+            if (target == null) return;
+            context.faction = target;
+            if (target.getAccess(context.fPlayer, PermissableAction.HOME) != Access.ALLOW) {
+                context.fPlayer.msg(TL.GENERIC_FPERM_NOPERMISSION, "teleport home");
+                return;
+            }
        }

        if (!context.faction.hasHome()) {
@@ -83,9 +91,9 @@ public class CmdHome extends FCommand {
        if (Conf.homesTeleportAllowedEnemyDistance > 0
                && !faction.isSafeZone()
                && (!context.fPlayer.isInOwnTerritory()
-                || !Conf.homesTeleportIgnoreEnemiesIfInOwnTerritory)
-                && (!Conf.homesTeleportIgnoreEnemiesIfInNoClaimingWorld
-                || !Conf.worldsNoClaiming.contains(context.fPlayer.getPlayer().getWorld().getName()))) {
+                || (context.fPlayer.isInOwnTerritory()
+                && !Conf.homesTeleportIgnoreEnemiesIfInOwnTerritory))) {
+
            World w = loc.getWorld();
            double x = loc.getX();
            double y = loc.getY();
--- a/src/main/java/com/massivecraft/factions/cmd/CmdInspect.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdInventorySee.java
+++ b/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;
        }

--- a/src/main/java/com/massivecraft/factions/cmd/CmdInvite.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdJoin.java
+++ b/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);
+        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) {
--- a/src/main/java/com/massivecraft/factions/cmd/CmdKick.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdKillHolograms.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdLeave.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdList.java
+++ b/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,6 +43,7 @@ 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();
            factionList.remove(Factions.getInstance().getWilderness());
@@ -107,6 +112,7 @@ public class CmdList extends FCommand {
                lines.add(FactionsPlugin.getInstance().txt.parse(TagUtil.parsePlain(faction, context.fPlayer, FactionsPlugin.getInstance().getConfig().getString("list.entry", defaults[2]))));
            }
            context.sendMessage(lines);
+        });
    }

    @Override
--- a/src/main/java/com/massivecraft/factions/cmd/CmdLock.java
+++ b/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:
@@ -19,7 +23,6 @@ public class CmdLock extends FCommand {
        this.optionalArgs.put("on/off", "flip");

        this.requirements = new CommandRequirements.Builder(Permission.LOCK)
-                .playerOnly()
                .build();
    }

--- a/src/main/java/com/massivecraft/factions/cmd/CmdLogins.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdLookup.java
+++ b/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;
+    }
+}
--- a/src/main/java/com/massivecraft/factions/cmd/CmdLowPower.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdMap.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdMapHeight.java
+++ b/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();

--- a/src/main/java/com/massivecraft/factions/cmd/CmdMod.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdModifyPower.java
+++ b/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();

--- a/src/main/java/com/massivecraft/factions/cmd/CmdNear.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdOpen.java
+++ b/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,6 +28,7 @@ public class CmdOpen extends FCommand {

    @Override
    public void perform(CommandContext context) {
+        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
            // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
            if (!context.payForCommand(Conf.econCostOpen, TL.COMMAND_OPEN_TOOPEN, TL.COMMAND_OPEN_FOROPEN)) {
                return;
@@ -40,6 +46,7 @@ public class CmdOpen extends FCommand {
                }
                fplayer.msg(TL.COMMAND_OPEN_CHANGED, context.faction.getTag(fplayer.getFaction()), open);
            }
+        });
    }

    @Override
--- a/src/main/java/com/massivecraft/factions/cmd/CmdOwner.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdOwnerList.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSee.java
+++ b/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;
        }

--- a/src/main/java/com/massivecraft/factions/cmd/CmdPaypalSet.java
+++ b/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()) {
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPeaceful.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPerm.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPermanent.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPermanentPower.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPlayerTitleToggle.java
+++ b/src/main/java/com/massivecraft/factions/cmd/CmdPlayerTitleToggle.java
@@ -0,0 +1,21 @@
+package com.massivecraft.factions.cmd;
+
+import com.massivecraft.factions.FactionsPlugin;
+import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.zcore.util.TL;
+
+public class CmdPlayerTitleToggle extends FCommand {
+    public CmdPlayerTitleToggle() {
+        super();
+        this.aliases.add("titles");
+        this.requirements = new CommandRequirements.Builder(Permission.TOGGLE_TITLES)
+                .build();
+    }
+    @Override
+    public void perform(CommandContext context) {
+        context.fPlayer.setTitlesEnabled(!context.fPlayer.hasTitlesEnabled());
+        context.msg(TL.COMMAND_TITLETOGGLE_TOGGLED, context.fPlayer.hasTitlesEnabled() ? FactionsPlugin.getInstance().color("&dEnabled") : FactionsPlugin.getInstance().color("&dDisabled"));
+    }
+    @Override
+    public TL getUsageTranslation() {return TL.COMMAND_TITLETOGGLE_DESCRIPTION;}
+}
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPower.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdPowerBoost.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdReload.java
+++ b/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);
--- a/src/main/java/com/massivecraft/factions/cmd/CmdRules.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdSB.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdSaveAll.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdSeeChunk.java
+++ b/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;
--- a/src/main/java/com/massivecraft/factions/cmd/CmdSeeDiscord.java
+++ b/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;
        }

--- a/src/main/java/com/massivecraft/factions/cmd/CmdSetBanner.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdSetDefaultRole.java
+++ b/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();

--- a/src/main/java/com/massivecraft/factions/cmd/CmdSetDiscord.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdSetFWarp.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdSetMaxVaults.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdSethome.java
+++ b/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,6 +24,7 @@ public class CmdSethome extends FCommand {

    @Override
    public void perform(CommandContext context) {
+        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
            if (!Conf.homesEnabled) {
                context.msg(TL.COMMAND_SETHOME_DISABLED);
                return;
@@ -50,6 +55,7 @@ public class CmdSethome extends FCommand {
            if (faction != context.faction) {
                context.msg(TL.COMMAND_SETHOME_SETOTHER, faction.getTag(context.fPlayer));
            }
+        });
    }

    @Override
--- a/src/main/java/com/massivecraft/factions/cmd/CmdShow.java
+++ b/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() {
--- a/src/main/java/com/massivecraft/factions/cmd/CmdShowClaims.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdShowInvites.java
+++ b/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");
@@ -29,8 +34,6 @@ public class CmdShowInvites extends FCommand {
                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);
            }
-
-        context.sendFancyMessage(msg);
    }

    @Override
--- a/src/main/java/com/massivecraft/factions/cmd/CmdSpawnerLock.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdStatus.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdStealth.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdStrikes.java
+++ b/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();
--- a/src/main/java/com/massivecraft/factions/cmd/CmdStrikesGive.java
+++ b/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();
--- a/src/main/java/com/massivecraft/factions/cmd/CmdStrikesInfo.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdStrikesSet.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdStrikesTake.java
+++ b/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();
--- a/src/main/java/com/massivecraft/factions/cmd/CmdStuck.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdTag.java
+++ b/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,6 +33,8 @@ public class CmdTag extends FCommand {

    @Override
    public void perform(CommandContext context) {
+        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
+
            String tag = context.argAsString(0);

            // TODO does not first test cover selfcase?
@@ -61,6 +68,7 @@ public class CmdTag extends FCommand {

            String oldtag = context.faction.getTag();
            context.faction.setTag(tag);
+            Discord.changeFactionTag(context.faction, oldtag);

            // Inform
            for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers()) {
@@ -77,6 +85,7 @@ public class CmdTag extends FCommand {
            }

            FTeamWrapper.updatePrefixes(context.faction);
+        });
    }

    @Override
--- a/src/main/java/com/massivecraft/factions/cmd/CmdTitle.java
+++ b/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) {
+        FactionsPlugin.getInstance().getServer().getScheduler().runTaskAsynchronously(FactionsPlugin.instance, () -> {
            FPlayer you = context.argAsBestFPlayerMatch(0);
            if (you == null) return;
            context.args.remove(0);
            String title = TextUtil.implode(context.args, " ");
            if (!context.canIAdministerYou(context.fPlayer, you)) return;
            // if economy is enabled, they're not on the bypass list, and this command has a cost set, make 'em pay
-        if (!context.payForCommand(Conf.econCostTitle, TL.COMMAND_TITLE_TOCHANGE, TL.COMMAND_TITLE_FORCHANGE)) return;
+            if (!context.payForCommand(Conf.econCostTitle, TL.COMMAND_TITLE_TOCHANGE, TL.COMMAND_TITLE_FORCHANGE))
+                return;
            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
--- a/src/main/java/com/massivecraft/factions/cmd/CmdToggleAllianceChat.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdTop.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdTpBanner.java
+++ b/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", () -> {
--- a/src/main/java/com/massivecraft/factions/cmd/CmdUnban.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdUpgrades.java
+++ b/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");
@@ -21,7 +26,7 @@ public class CmdUpgrades extends FCommand {
    @Override
    public void perform(CommandContext context) {
        if (!FactionsPlugin.getInstance().getConfig().getBoolean("fupgrades.Enabled")) {
-            context.fPlayer.sendMessage("This command is disabled!");
+            context.fPlayer.msg(TL.COMMAND_UPGRADES_DISABLED);
            return;
        }
        new FUpgradesGUI().openMainMenu(context.fPlayer);
--- a/src/main/java/com/massivecraft/factions/cmd/CmdVault.java
+++ b/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;
        }

--- a/src/main/java/com/massivecraft/factions/cmd/CmdVersion.java
+++ b/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");
--- a/src/main/java/com/massivecraft/factions/cmd/CmdViewChest.java
+++ b/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;
        }

--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Driftay	5d1e1ea6ed	Version Change	2019-12-24 09:32:23 -05:00
Driftay	372eed65a0	Fixed OCD	2019-12-24 09:27:36 -05:00
Driftay	86f92a7fb0	[+] 1.15 Support Added! [+] Greatly optmized ALOT of Commands! [+] Removed Portal Travel Agent (Recoding) [+] Added Administrator Command F Lookup	2019-12-24 09:19:43 -05:00
Driftay	897fdbf83a	Added TL Fixture for Drain Description	2019-12-22 18:24:50 -05:00
Driftay	4e11234a08	Added F Drain Command (A Command which allows players with permission to obtain all the money in faction members balances.)	2019-12-22 18:21:17 -05:00
Driftay	3a22bb348e	Fixed Spawner Breaking NPE	2019-12-22 01:03:47 -05:00
Driftay	91ca08e66b	Fixed Co-Leader Default Permissions	2019-12-21 23:52:14 -05:00
Driftay	11d9f9230b	Version Change	2019-12-21 22:05:01 -05:00
Driftay	38cf542d8c	Fixed territoryBypassProtectedMaterials - 2 Maps were defined	2019-12-21 22:03:40 -05:00
DroppingAnvil	93b485aae8	Version change + /f wild permission added to permission kits Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>	2019-12-19 17:35:29 -06:00
DroppingAnvil	b9996a2250	Fix /f deinvite	2019-12-19 15:10:55 -08:00
Driftay	368a605d31	Format Code, Fixed 2 NPE's	2019-12-19 14:23:41 -05:00
DroppingAnvil	fec07b6fac	Added a wilderness teleport command (/f wild) and fixed a few bugs Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>	2019-12-16 18:46:38 -06:00
DroppingAnvil	58e43b41cc	CmdReload made more useful by changing how commands that can be disabled are added to the root. You can now get the instance of FCmdRoot, Recheck variable added commands, rebuild brigadierManager, and get the status of each command that can be disabled. CmdDebug now gets the status of variable added commands. Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>	2019-12-16 13:32:12 -06:00
DroppingAnvil	d5645f3b0a	Revamped in-game Discord mention system. Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>	2019-12-15 19:37:12 -06:00
DroppingAnvil	fa10bf7003	Discord feature additions, Discord startup flow changed, /f debug added Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>	2019-12-12 04:48:00 -06:00
Driftay	ca9502a4b6	TL References Properly to Generic_Disabled	2019-12-03 05:16:37 -05:00
Driftay	0a60a581f5	Started Base For Custom GUI Handling	2019-12-02 22:31:58 -05:00
Driftay	faf245b870	Proper Shading Acknowledged	2019-12-02 21:32:09 -05:00
DroppingAnvil	f124877dba	Fixed message issue with lang when promoting a player in a faction to Admin. Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>	2019-12-02 19:52:30 -06:00
Driftay	fc5befd7cc	Proper Credit Noted	2019-12-02 20:12:58 -05:00
Driftay	d03ca58105	More Credit	2019-12-02 14:03:27 -05:00
Driftay	f437144fba	Giving Credit	2019-12-02 13:55:38 -05:00
Driftay	9284707db6	Fixed ArrayIndexOutOfBounds Exception With Deinvite Command	2019-11-30 00:41:44 -05:00
Driftay	7b07e3ed23	Version 2.1.0 Implemented	2019-11-29 12:13:46 -05:00
Driftay	c0719ec4f5	Reverted final persistence	2019-11-29 05:12:07 -05:00
Driftay	c9fd86ef9e	Merge remote-tracking branch 'origin/1.6.x' into 1.6.x	2019-11-29 04:59:20 -05:00
Driftay	939a60c611	Bunch of Econ, Lang.yml Additions	2019-11-29 04:58:59 -05:00
DroppingAnvil	36f22262c6	Added the ability to toggle titles when entering claims of a different faction Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>	2019-11-28 19:34:39 -06:00
Driftay	f5e9ce3d90	Fly Changes, And Message Persistence	2019-11-28 02:09:21 -05:00
DroppingAnvil	e244b469aa	Update Permission.java	2019-11-25 01:20:07 -06:00
Driftay	5f80ecfa76	Fixed Permissions And Removed Shield Code From Main Branch to Avoid pointless runnables	2019-11-24 22:37:31 -05:00
Driftay	28517ef391	More to Shields & Mission Class Cleanup	2019-11-23 22:33:49 -05:00
Driftay	5744b7e28e	Version Change	2019-11-22 04:56:18 -05:00
Driftay	f3b0dcdb7f	Quick Fix With Fly Check Console Spam & Properly Defined Variables In TL for TNT command	2019-11-22 04:55:58 -05:00
Driftay	0b127cbe72	SyncSaving and Persistence with Unclaiming and Disbanding With Fly Checks	2019-11-21 09:38:15 -05:00
Driftay	4f6329996f	Fixed Version Handling	2019-11-21 09:11:47 -05:00
Driftay	3710031b80	Fixed World Guard Initiation	2019-11-21 09:10:04 -05:00
Driftay	6c10cdd47d	Version Change	2019-11-21 09:04:57 -05:00
Driftay	5eeb8a2020	Version Change	2019-11-21 08:52:16 -05:00
Driftay	fe5378e9d7	Massive Code Reformat (Fixed 4 Issues Brought up in Discord)	2019-11-21 08:50:51 -05:00
Driftay	e60d58e68b	CoreProtect Persistence of ForEach	2019-11-21 08:07:55 -05:00
DroppingAnvil	649392363f	Randomized missions implemented! Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>	2019-11-18 17:06:05 -06:00
Driftay	1927f49221	Fixed CmdMoneyBalance ClassCastException	2019-11-17 11:17:08 -05:00
Driftay	9349a914ce	Misc Changes	2019-11-16 04:25:34 -05:00
Driftay	f8e22896d5	Fixed NPE with FlyTask	2019-11-16 04:23:43 -05:00
Driftay	ac859db55f	TntFill Logic Fixed	2019-11-14 04:23:35 -05:00
Driftay	8c7addb68e	F Home and ClaimAt Fix	2019-11-14 03:44:35 -05:00
Driftay	d808bac17b	Merge remote-tracking branch 'origin/1.6.x' into 1.6.x # Conflicts: # src/main/java/com/massivecraft/factions/cmd/CmdHome.java	2019-11-14 03:43:06 -05:00
Driftay	d3a7fc67a5	F Home and ClaimAt Fix	2019-11-14 03:42:47 -05:00
DroppingAnvil	bd77c8266c	Small bug fix + Code added to run randomized missions Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>	2019-11-14 02:27:41 -06:00
Driftay	8bde1385fc	Few Fixes	2019-11-09 15:20:25 -05:00
Driftay	472cb86465	TNT Dialog Fixed	2019-11-07 13:17:59 -05:00
Driftay	d77ee76ea7	Blacklisted Names & Misc changes to setup for new revamp	2019-11-07 07:09:45 -05:00
DroppingAnvil	441382acdc	Fix issues with 1.13+ Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>	2019-11-05 18:31:17 -06:00
DroppingAnvil	d3870731f4	Introduced updater for config.yml Signed-off-by: DroppingAnvil <dr0pping.4nvi1@gmail.com>	2019-11-05 17:15:42 -06:00