Version Change

Fix typo in issue template

.github/ISSUE_TEMPLATE/bug_report.md

@@ -23,7 +23,7 @@ A clear and concise description of what you expected to happen.
 **Screenshots**
 If applicable, add screenshots to help explain your problem.
 
-**Server VErsion (please complete the following information):**
+**Server Version (please complete the following information):**
  - Spigot Version: [e.g. Paperspigot 1.8.8]
  - Factions Version [use /f version]
  - Minecraft Version: [If a bug is dependent on client version]

README.md

@@ -1,9 +1,8 @@
 # SaberFactions
 
-![Downloads](https://img.shields.io/github/downloads/driftay/saber-factions/total.svg) [![CodeFactor](https://www.codefactor.io/repository/github/driftay/saber-factions/badge)](https://www.codefactor.io/repository/github/driftay/saber-factions)
+![Downloads](https://img.shields.io/github/downloads/driftay/saber-factions/total.svg) [![CodeFactor](https://www.codefactor.io/repository/github/driftay/saber-factions/badge)](https://www.codefactor.io/repository/github/driftay/saber-factions) [![License](https://img.shields.io/badge/license-GNU%20General%20Public%20License%20v3.0-brightgreen)](https://github.com/SaberLLC/Saber-Factions/blob/1.6.x/LICENSE) ![GitHub commit activity](https://img.shields.io/github/commit-activity/m/SaberLLC/Saber-Factions)
 
-SaberFactions is a fork of both FactionsUUID and SavageFactions. Creators of those plugins include DtrShock and ProSavage. Credits to them.
-SaberFactions is the newest, latest and greatest factions plugin designed for the best and most functional factions experience minecraft has seen!
+SaberFactions is an exotic, performance optmized, and feature rich factions plugin that focuses on not only making the player experience as great as possibly but maintaining this aspect with the cost of NOTHING! We strive to continue development for SaberFactions as the factions community is strongly growing and seeking new players every day. 
 
 ## Some Exciting Features
 Some of our features include the following 
@@ -14,21 +13,27 @@ Some of our features include the following
 * More F Upgrades - Unbreakable Redstone Upgrade, Members Upgrade, and Power Upgrade.
 * Factions Corner - In the corner of a world? No Problem /f corner will claim your entire buffer for you!
 * Command Cooldowns - Configurable Command Cooldowns for most "spam" commands. And so Much More to Come!
+* Faction Points - A point based currency that can be used for any aspect of factions gameplay!
+* Faction Shop - A shop that essentially lets players buy in-game items in exchange for faction points!
+* Faction Discord Integration - A discord intergrated factions bot for each faction to have their own personalized discord bot within their faction!
+* Faction Audit - A full based logging system (GUI designed) to see every aspect of what happens in your faction!
+* Factions Check System - An automated check system that alerts players when to check walls/buffers!
+* Faction Reserves - A system designed to reserve a specific faction name for a specific player!
 
 ## Dependency With Maven
 ```	
- <repositories>
-	<repository>
-	<id>jitpack.io</id>
-	<url>https://jitpack.io</url>
-  	</repository>
-</repositories>
+	<repositories>
+		<repository>
+		    <id>jitpack.io</id>
+		    <url>https://jitpack.io</url>
+		</repository>
+	</repositories>
 
-<dependency>
-	<groupId>com.github.Driftay</groupId>
-	<artifactId>Saber-Factions</artifactId>
-	<version>1.4.1</version>
-</dependency>
+	<dependency>
+	    <groupId>com.github.SaberLLC</groupId>
+	    <artifactId>Saber-Factions</artifactId>
+	    <version>2.2.7-STABLE</version>
+	</dependency>
 ```
 ## Moving Forward
 
@@ -36,8 +41,8 @@ Moving forward we plan to take all suggestions into consideration, as they come
 We Plan on Releasing the latest and greatest factions/skyblock/prison plugins minecraft has to offer and wont settle for anything less
 
 ## Support
-Our Discord is Currently In Progress of a Massive Overhaul, but we still encourage our community to join and express any concerns/questions/suggestions they may have
-https://Discord.Saber.pw
+Have a problem, question, or concer? We encourage our community to join and express any inquiry you may have
+https://discord.saber.pw
 
 Look forward to a bright future and a journey with all of you!
 

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.massivecraft</groupId>
     <artifactId>Factions</artifactId>
-    <version>1.6.9.5-2.2.5-RC</version>
+    <version>1.6.9.5-2.2.9-RC</version>
     <packaging>jar</packaging>
 
     <name>SaberFactions</name>

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

@@ -105,6 +105,9 @@ public class Conf {
     //AUDIT
     public static boolean useAuditSystem = true;
 
+    //GUI's
+    public static boolean useDisbandGUI = true;
+
     //DISCORD
     public static boolean useDiscordSystem = false;
     public static String discordBotToken = "<token here>";

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

@@ -31,6 +31,19 @@ public interface FPlayer extends EconomyParticipator {
 
     boolean hasNotificationsEnabled();
 
+    /**
+     * Determine if a player has enemies nearby based on the enemy check task in CmdFly
+     * NOTE: THIS VALUE IS ONLY UPDATED WHEN A USER IS USING FLY
+     * @return enemiesNearby as a boolean
+     */
+    boolean hasEnemiesNearby();
+
+    /**
+     * Set if this FPlayer has an enemy nearby
+     * @param b enemiesNearby
+     */
+    void setEnemiesNearby(Boolean b);
+
     /**
      * Get if a player has setup their Discord before
      * @return if the player setup Discord as a boolean

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

@@ -69,7 +69,6 @@ public class FactionsPlugin extends MPlugin {
     // Plugins can check this boolean while hooking in have
     // a green light to use the api.
     public static boolean startupFinished = false;
-    public static Economy econ = null;
     public boolean PlaceholderApi;
     // Commands
     public FCmdRoot cmdBase;
@@ -79,6 +78,7 @@ public class FactionsPlugin extends MPlugin {
     public boolean mc112 = false;
     public boolean mc113 = false;
     public boolean mc114 = false;
+    public boolean mc115 = false;
     public boolean useNonPacketParticles = false;
     public boolean factionsFlight = false;
     SkriptAddon skriptAddon;
@@ -165,6 +165,10 @@ public class FactionsPlugin extends MPlugin {
                 FactionsPlugin.instance.log("Minecraft Version 1.14 found.");
                 mc114 = true;
                 break;
+            case 15:
+                FactionsPlugin.instance.log("Minecraft Version 1.15 found.");
+                mc115 = true;
+                break;
         }
         migrateFPlayerLeaders();
         log("==== End Setup ====");
@@ -182,10 +186,10 @@ public class FactionsPlugin extends MPlugin {
         Conf.load();
         fLogManager = new FLogManager();
         //Dependency checks
-        if (Conf.dependencyCheck && (!Bukkit.getPluginManager().isPluginEnabled("Vault") && !Bukkit.getPluginManager().isPluginEnabled("Essentials"))) {
+        if (Conf.dependencyCheck && (!Bukkit.getPluginManager().isPluginEnabled("Vault"))) {
             divider();
             System.out.println("You are missing dependencies!");
-            System.out.println("Please verify EssentialsX and Vault are installed!");
+            System.out.println("Please verify and Vault are installed!");
             Conf.save();
             Bukkit.getPluginManager().disablePlugin(instance);
             divider();
@@ -194,7 +198,6 @@ public class FactionsPlugin extends MPlugin {
         //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();
@@ -210,7 +213,6 @@ public class FactionsPlugin extends MPlugin {
             if (fPlayer.isAlt()) faction.addAltPlayer(fPlayer);
             else faction.addFPlayer(fPlayer);
         }
-        if (getConfig().getBoolean("enable-faction-flight", true)) UtilFly.run();
 
 
         Board.getInstance().load();
@@ -437,6 +439,9 @@ public class FactionsPlugin extends MPlugin {
             AutoLeaveTask = null;
         }
         DiscordListener.saveGuilds();
+        if (Discord.jda != null) {
+            Discord.jda.shutdownNow();
+        }
         super.onDisable();
         try {
             fLogManager.saveLogs();
@@ -464,7 +469,7 @@ public class FactionsPlugin extends MPlugin {
     }
 
     public ItemStack createItem(Material material, int amount, short datavalue, String name, List<String> lore) {
-        ItemStack item = new ItemStack(XMaterial.matchXMaterial(material.toString()).parseMaterial(), amount, datavalue);
+        ItemStack item = new ItemStack(XMaterial.matchXMaterial(material.toString()).get().parseMaterial(), amount, datavalue);
         ItemMeta meta = item.getItemMeta();
         meta.setDisplayName(color(name));
         meta.setLore(colorList(lore));

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

@@ -46,7 +46,7 @@ public class Aliases {
     public static ArrayList<String> relation_truce = new ArrayList<>(Collections.singletonList("truce"));
     public static ArrayList<String> reserve = new ArrayList<>(Collections.singletonList("reserve"));
     public static ArrayList<String> roles_demote = new ArrayList<>(Collections.singletonList("demote"));
-    public static ArrayList<String> roles_promote = new ArrayList<>(Collections.singletonList("ally"));
+    public static ArrayList<String> roles_promote = new ArrayList<>(Collections.singletonList("promote"));
     public static ArrayList<String> tnt_tnt = new ArrayList<>(Collections.singletonList("tnt"));
     public static ArrayList<String> tnt_tntfill = new ArrayList<>(Collections.singletonList("tntfill"));
     public static ArrayList<String> wild = new ArrayList<>(Collections.singletonList("wild"));
@@ -143,6 +143,7 @@ public class Aliases {
     public static ArrayList<String> vault = new ArrayList<>(Collections.singletonList("vault"));
     public static ArrayList<String> viewChest = new ArrayList<>(Arrays.asList("viewchest", "viewpv"));
     private static transient Aliases i = new Aliases();
+
     public static void load() {
         FactionsPlugin.getInstance().persist.loadOrSaveDefault(i, Aliases.class, "aliases");
     }

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

@@ -70,7 +70,7 @@ public class CmdAdmin extends FCommand {
 
             // if target player is currently admin, demote and replace him
             if (fyou == admin) {
-                targetFaction.promoteNewLeader();
+                promoteNewLeader(targetFaction);
                 context.msg(TL.COMMAND_ADMIN_DEMOTES, fyou.describeTo(context.fPlayer, true));
                 fyou.msg(TL.COMMAND_ADMIN_DEMOTED, context.player == null ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(fyou, true));
                 return;
@@ -78,9 +78,9 @@ public class CmdAdmin extends FCommand {
 
             // promote target player, and demote existing admin if one exists
             if (admin != null) {
-                admin.setRole(Role.COLEADER);
+                setRole(admin, Role.COLEADER);
             }
-            fyou.setRole(Role.LEADER);
+            setRole(fyou, Role.LEADER);
             context.msg(TL.COMMAND_ADMIN_PROMOTES, fyou.describeTo(context.fPlayer, true));
 
             FactionsPlugin.instance.getFlogManager().log(targetFaction, FLogType.RANK_EDIT, context.fPlayer.getName(), fyou.getName(), ChatColor.RED + "Admin");
@@ -94,6 +94,18 @@ public class CmdAdmin extends FCommand {
         });
     }
 
+    private void setRole(FPlayer fp, Role r) {
+        FactionsPlugin.getInstance().getServer().getScheduler().runTask(FactionsPlugin.instance, () -> {
+            fp.setRole(r);
+        });
+    }
+
+    private void promoteNewLeader(Faction f) {
+        FactionsPlugin.getInstance().getServer().getScheduler().runTask(FactionsPlugin.instance, () -> {
+            f.promoteNewLeader();
+        });
+    }
+
     public TL getUsageTranslation() {
         return TL.COMMAND_ADMIN_DESCRIPTION;
     }

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

@@ -46,6 +46,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();
@@ -55,6 +56,7 @@ 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)) {

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

@@ -225,7 +225,7 @@ public class CmdConfig extends FCommand {
         if (!success.isEmpty()) {
             if (context.sender instanceof Player) {
                 context.sendMessage(success);
-                FactionsPlugin.getInstance().log(success + TL.COMMAND_CONFIG_LOG.format((Player) context.sender));
+                FactionsPlugin.getInstance().log(success + TL.COMMAND_CONFIG_LOG.format(context.sender));
             } else  // using FactionsPlugin.getInstance().log() instead of sendMessage if run from server console so that "[Factions v#.#.#]" is prepended in server log
             {
                 FactionsPlugin.getInstance().log(success);

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

@@ -115,7 +115,9 @@ public class CmdCreate extends FCommand {
                     Discord.mainGuild.getController().setNickname(m, Discord.getNicknameString(context.fPlayer)).queue();
                 }
             }
-        } catch (HierarchyException e) {System.out.print(e.getMessage());}
+        } 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);

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

@@ -13,6 +13,7 @@ public class CmdDebug extends FCommand {
         this.aliases.add("debug");
         this.requirements = new CommandRequirements.Builder(Permission.DEBUG).build();
     }
+
     @Override
     public void perform(CommandContext context) {
         FactionsPlugin.getInstance().divider();
@@ -51,7 +52,9 @@ public class CmdDebug extends FCommand {
         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());}
+        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--------");

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

@@ -31,47 +31,47 @@ public class CmdDeinvite extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-            if (context.args.size() == 0) {
-                FancyMessage msg = new FancyMessage(TL.COMMAND_DEINVITE_CANDEINVITE.toString()).color(ChatColor.GOLD);
-                for (String id : context.faction.getInvites()) {
-                    FPlayer fp = FPlayers.getInstance().getById(id);
-                    String name = fp != null ? fp.getName() : id;
-                    msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_DEINVITE_CLICKTODEINVITE.format(name)).command("/" + Conf.baseCommandAliases.get(0) + " deinvite " + name);
-                }
-                context.sendFancyMessage(msg);
+        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);
+                String name = fp != null ? fp.getName() : id;
+                msg.then(name + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_DEINVITE_CLICKTODEINVITE.format(name)).command("/" + Conf.baseCommandAliases.get(0) + " deinvite " + name);
+            }
+            context.sendFancyMessage(msg);
+            return;
+        }
+
+        FPlayer you = context.argAsBestFPlayerMatch(0);
+        if (!context.fPlayer.isAdminBypassing()) {
+            Access access = context.faction.getAccess(context.fPlayer, PermissableAction.INVITE);
+            if (access != Access.ALLOW && context.fPlayer.getRole() != Role.LEADER) {
+                context.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage invites");
                 return;
             }
+        }
 
-            FPlayer you = context.argAsBestFPlayerMatch(0);
-            if (!context.fPlayer.isAdminBypassing()) {
-                Access access = context.faction.getAccess(context.fPlayer, PermissableAction.INVITE);
-                if (access != Access.ALLOW && context.fPlayer.getRole() != Role.LEADER) {
-                    context.msg(TL.GENERIC_FPERM_NOPERMISSION, "manage invites");
-                    return;
-                }
+        if (you == null) {
+            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);
             }
+            context.sendFancyMessage(msg);
+            return;
+        }
 
-            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);
-                }
-                context.sendFancyMessage(msg);
-                return;
-            }
+        if (you.getFaction() == context.faction) {
+            context.msg(TL.COMMAND_DEINVITE_ALREADYMEMBER, you.getName(), context.faction.getTag());
+            context.msg(TL.COMMAND_DEINVITE_MIGHTWANT, FactionsPlugin.getInstance().cmdBase.cmdKick.getUsageTemplate(context));
+            return;
+        }
 
-            if (you.getFaction() == context.faction) {
-                context.msg(TL.COMMAND_DEINVITE_ALREADYMEMBER, you.getName(), context.faction.getTag());
-                context.msg(TL.COMMAND_DEINVITE_MIGHTWANT, FactionsPlugin.getInstance().cmdBase.cmdKick.getUsageTemplate(context));
-                return;
-            }
-
-            context.faction.deinvite(you);
-            you.msg(TL.COMMAND_DEINVITE_REVOKED, context.fPlayer.describeTo(you), context.faction.describeTo(you));
-            context.faction.msg(TL.COMMAND_DEINVITE_REVOKES, context.fPlayer.describeTo(context.faction), you.describeTo(context.faction));
+        context.faction.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));
     }
 
     @Override

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

@@ -4,14 +4,16 @@ import com.massivecraft.factions.*;
 import com.massivecraft.factions.event.FactionDisbandEvent.PlayerDisbandReason;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
-import com.massivecraft.factions.util.UtilFly;
+import com.massivecraft.factions.zcore.fdisband.FDisbandFrame;
 import com.massivecraft.factions.zcore.fperms.Access;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
+import org.bukkit.Sound;
 import org.bukkit.command.ConsoleCommandSender;
 
 import java.util.HashMap;
+import java.util.concurrent.TimeUnit;
 
 
 public class CmdDisband extends FCommand {
@@ -35,6 +37,7 @@ public class CmdDisband extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
+        long time;
         // The faction, default to your own.. but null if console sender.
         Faction faction = context.argAsFaction(0, context.fPlayer == null ? null : context.faction);
         if (faction == null) return;
@@ -42,9 +45,7 @@ public class CmdDisband extends FCommand {
         boolean isMyFaction = context.fPlayer != null && faction == context.faction;
 
         if (!isMyFaction) {
-            if (!Permission.DISBAND_ANY.has(context.sender, true)) {
-                return;
-            }
+            if (!Permission.DISBAND_ANY.has(context.sender, true)) return;
         }
 
 
@@ -71,6 +72,22 @@ public class CmdDisband extends FCommand {
             return;
         }
 
+
+        boolean access = false;
+        if (context.fPlayer.getPlayer().hasMetadata("disband_confirm") && (time = context.fPlayer.getPlayer().getMetadata("disband_confirm").get(0).asLong()) != 0L && System.currentTimeMillis() - time <= TimeUnit.SECONDS.toMillis(3L)) {
+            access = true;
+        }
+
+        if (!access) {
+            if(Conf.useDisbandGUI && !context.fPlayer.isAdminBypassing() || !context.player.isOp()) {
+                if (!disbandMap.containsKey(context.player.getUniqueId().toString())) {
+                    new FDisbandFrame(context.faction).buildGUI(context.fPlayer);
+                    return;
+                }
+            }
+        }
+
+
         // check for tnt before disbanding.
         if (!disbandMap.containsKey(context.player.getUniqueId().toString()) && faction.getTnt() > 0) {
             context.msg(TL.COMMAND_DISBAND_CONFIRM.toString().replace("{tnt}", faction.getTnt() + ""));
@@ -89,7 +106,8 @@ public class CmdDisband extends FCommand {
                         follower.msg(TL.COMMAND_DISBAND_BROADCAST_NOTYOURS, amountString, faction.getTag(follower));
                     }
                 }
-                if(FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight")) context.fPlayer.setFFlying(false, false);
+                if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight"))
+                    context.fPlayer.setFFlying(false, false);
             } else {
                 context.player.sendMessage(String.valueOf(TL.COMMAND_DISBAND_PLAYER));
             }

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

@@ -14,6 +14,7 @@ public class CmdDiscord extends FCommand {
                 .playerOnly()
                 .build();
     }
+
     @Override
     public void perform(CommandContext context) {
         if (context.fPlayer.discordSetup()) {

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

@@ -7,15 +7,14 @@ 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(){
+public class CmdDrain extends FCommand {
+    public CmdDrain() {
         this.aliases.addAll(Aliases.drain);
         this.requirements = new CommandRequirements.Builder(Permission.DRAIN)
                 .playerOnly()
@@ -34,12 +33,12 @@ public class CmdDrain extends FCommand{
 
         double totalBalance = 0;
 
-        for(FPlayer fPlayer : context.faction.getFPlayers()) {
-            if(context.faction.getFPlayers().size() == 1){
+        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)){
+            if (FPlayers.getInstance().getByPlayer(context.player).equals(fPlayer)) {
                 continue; // skip the command executor
             }
             double balance = FactionsPlugin.getInstance().getEcon().getBalance(fPlayer.getPlayer());

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

@@ -34,7 +34,7 @@ public class CmdFly extends FCommand {
         this.aliases.addAll(Aliases.fly);
         this.optionalArgs.put("on/off", "flip");
 
-        this.requirements = new CommandRequirements.Builder(Permission.FLY)
+        this.requirements = new CommandRequirements.Builder(Permission.FLY_FLY)
                 .playerOnly()
                 .memberOnly()
                 .build();
@@ -78,19 +78,15 @@ public class CmdFly extends FCommand {
                     }
                     FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
                     Faction myFaction = fPlayer.getFaction();
-                    if (myFaction.isWilderness()) {
-                        fPlayer.setFlying(false);
-                        flyMap.remove(name);
-                        continue;
-                    }
-                    if (player.hasPermission("factions.fly.bypassnearbyenemycheck") || fPlayer.checkIfNearbyEnemies()) {
+                    if (!player.hasPermission("factions.fly.bypassnearbyenemycheck") && !fPlayer.isAdminBypassing()) {
+                        if (fPlayer.hasEnemiesNearby()) disableFlightSync(fPlayer);
+                        checkEnemiesSync(fPlayer);
                         continue;
                     }
                     FLocation myFloc = new FLocation(player.getLocation());
                     if (Board.getInstance().getFactionAt(myFloc) != myFaction) {
-                        if (!checkBypassPerms(fPlayer, player, Board.getInstance().getFactionAt(myFloc))) {
-                            Bukkit.getScheduler().runTask(FactionsPlugin.instance, () -> fPlayer.setFFlying(false, false));
-                            flyMap.remove(name);
+                        if (!checkFly(fPlayer, player, Board.getInstance().getFactionAt(myFloc))) {
+                            disableFlightSync(fPlayer);
                         }
                     }
 
@@ -100,36 +96,17 @@ public class CmdFly extends FCommand {
         }, 20L, 20L);
     }
 
-    public static boolean checkBypassPerms(FPlayer fme, Player me, Faction toFac) {
+    public static boolean checkFly(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));
-                return false;
-            }
-            Access access = toFac.getAccess(fme, PermissableAction.FLY);
-            if ((!(me.hasPermission(Permission.FLY_ENEMY.node) || access == Access.ALLOW)) && toFac.getRelationTo(fme.getFaction()) == Relation.ENEMY) {
-                fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
-                return false;
-            }
-            if (!(me.hasPermission(Permission.FLY_ALLY.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.ALLY) {
-                fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
-                return false;
-            }
-            if (!(me.hasPermission(Permission.FLY_TRUCE.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.TRUCE) {
-                fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
-                return false;
-            }
-
-            if (!(me.hasPermission(Permission.FLY_NEUTRAL.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.NEUTRAL && !toFac.isSystemFaction()) {
-                fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
-                return false;
-            }
-            return me.hasPermission(Permission.FLY.node) && (access != Access.DENY || toFac.isSystemFaction());
-        }
-        return true;
+        if (toFac.getAccess(fme, PermissableAction.FLY) == Access.ALLOW) return true;
+        if (fme.getFaction().isWilderness()) return false;
+        if (toFac.isSystemFaction())
+            return me.hasPermission(toFac.isWilderness() ? Permission.FLY_WILDERNESS.node : toFac.isSafeZone() ? Permission.FLY_SAFEZONE.node : Permission.FLY_WARZONE.node);
+        Relation relationTo = toFac.getRelationTo(fme.getFaction());
+        if (!relationTo.isEnemy() && !relationTo.isMember())
+            return me.hasPermission(Permission.valueOf("FLY_" + relationTo.name()).node);
+        return false;
     }
 
 
@@ -145,34 +122,43 @@ public class CmdFly extends FCommand {
         flyMap.remove(fme.getPlayer().getName());
     }
 
+    private static void disableFlightSync(FPlayer fme) {
+        Bukkit.getScheduler().runTask(FactionsPlugin.instance, () -> fme.setFFlying(false, false));
+        flyMap.remove(fme.getName());
+    }
+
+    private static void checkEnemiesSync(FPlayer fp) {
+        Bukkit.getScheduler().runTask(FactionsPlugin.instance, fp::checkIfNearbyEnemies);
+    }
+
     public boolean isInFlightChecker(Player player) {
         return flyMap.containsKey(player.getName());
     }
 
     @Override
     public void perform(CommandContext context) {
-        // Disabled by default.
-        if (!FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight", false)) {
-            context.fPlayer.msg(TL.COMMAND_FLY_DISABLED);
-            return;
-        }
+        if (!context.fPlayer.isAdminBypassing()) {
+            List<Entity> entities = context.player.getNearbyEntities(16.0D, 256.0D, 16.0D);
 
-        FLocation myfloc = new FLocation(context.player.getLocation());
-        Faction toFac = Board.getInstance().getFactionAt(myfloc);
-        if (!checkBypassPerms(context.fPlayer, context.player, toFac)) return;
-        List<Entity> entities = context.player.getNearbyEntities(16.0D, 256.0D, 16.0D);
-
-        for (int i = 0; i <= entities.size() - 1; ++i) {
-            if (entities.get(i) instanceof Player) {
-                Player eplayer = (Player) entities.get(i);
-                FPlayer efplayer = FPlayers.getInstance().getByPlayer(eplayer);
-                if (efplayer.getRelationTo(context.fPlayer) == Relation.ENEMY && !efplayer.isStealthEnabled()) {
-                    context.msg(TL.COMMAND_FLY_CHECK_ENEMY);
-                    return;
+            for (int i = 0; i <= entities.size() - 1; ++i) {
+                if (entities.get(i) instanceof Player) {
+                    Player eplayer = (Player) entities.get(i);
+                    FPlayer efplayer = FPlayers.getInstance().getByPlayer(eplayer);
+                    if (efplayer.getRelationTo(context.fPlayer) == Relation.ENEMY && !efplayer.isStealthEnabled()) {
+                        context.msg(TL.COMMAND_FLY_CHECK_ENEMY);
+                        return;
+                    }
+                    context.fPlayer.setEnemiesNearby(false);
                 }
             }
-        }
 
+            FLocation myfloc = new FLocation(context.player.getLocation());
+            Faction toFac = Board.getInstance().getFactionAt(myfloc);
+            if (!checkFly(context.fPlayer, context.player, toFac)) {
+                context.fPlayer.sendMessage(TL.COMMAND_FLY_NO_ACCESS.format(toFac.getTag()));
+                return;
+            }
+        }
 
         if (context.args.size() == 0) {
             toggleFlight(context.fPlayer.isFlying(), context.fPlayer, context);
@@ -188,22 +174,17 @@ public class CmdFly extends FCommand {
             return;
         }
 
+        context.doWarmUp(WarmUpUtil.Warmup.FLIGHT, TL.WARMUPS_NOTIFY_FLIGHT, "Fly", () -> {
+            fme.setFlying(true);
+            flyMap.put(fme.getPlayer().getName(), true);
+            if (particleTask == null) {
+                startParticles();
+            }
 
-        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());
-        }
+            if (flyTask == null) {
+                startFlyCheck();
+            }
+        }, FactionsPlugin.getInstance().getConfig().getLong("warmups.f-fly", 0));
     }
 
     @Override

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

@@ -47,7 +47,9 @@ public class CmdGetVault extends FCommand {
             return;
         }
 
-        if (!context.fPlayer.takeMoney(amount)) {return;}
+        if (!context.fPlayer.takeMoney(amount)) {
+            return;
+        }
 
         //success :)
         context.player.getInventory().addItem(vault);

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

@@ -18,6 +18,7 @@ public class CmdHelp extends FCommand {
      */
 
     public ArrayList<ArrayList<String>> helpPages;
+
     //TODO: Add Help GUI
     public CmdHelp() {
         super();

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

@@ -139,7 +139,9 @@ public class CmdJoin extends FCommand {
                     Discord.mainGuild.getController().setNickname(m, Discord.getNicknameString(context.fPlayer)).queue();
                 }
             }
-        } catch (HierarchyException e) {System.out.print(e.getMessage());}
+        } catch (HierarchyException e) {
+            System.out.print(e.getMessage());
+        }
 
         if (Conf.logFactionJoin) {
             if (samePlayer) {

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

@@ -1,9 +1,7 @@
 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 {
 

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

@@ -16,7 +16,6 @@ public class CmdLock extends FCommand {
 	description: use the /f lock [on/off] command to temporarily lock the data files from being overwritten
 	default: op
 	 */
-
     public CmdLock() {
         super();
         this.aliases.addAll(Aliases.lock);

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

@@ -31,53 +31,53 @@ public class CmdMod extends FCommand {
 
     @Override
     public void perform(CommandContext context) {
-            FPlayer you = context.argAsBestFPlayerMatch(0);
-            if (you == null) {
-                FancyMessage msg = new FancyMessage(TL.COMMAND_MOD_CANDIDATES.toString()).color(ChatColor.GOLD);
-                for (FPlayer player : context.faction.getFPlayersWhereRole(Role.NORMAL)) {
-                    String s = player.getName();
-                    msg.then(s + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_MOD_CLICKTOPROMOTE.toString() + s).command("/" + Conf.baseCommandAliases.get(0) + " mod " + s);
-                }
-
-                context.sendFancyMessage(msg);
-                return;
+        FPlayer you = context.argAsBestFPlayerMatch(0);
+        if (you == null) {
+            FancyMessage msg = new FancyMessage(TL.COMMAND_MOD_CANDIDATES.toString()).color(ChatColor.GOLD);
+            for (FPlayer player : context.faction.getFPlayersWhereRole(Role.NORMAL)) {
+                String s = player.getName();
+                msg.then(s + " ").color(ChatColor.WHITE).tooltip(TL.COMMAND_MOD_CLICKTOPROMOTE.toString() + s).command("/" + Conf.baseCommandAliases.get(0) + " mod " + s);
             }
 
-            boolean permAny = Permission.MOD_ANY.has(context.sender, false);
-            Faction targetFaction = you.getFaction();
-            if (targetFaction != context.faction && !permAny) {
-                context.msg(TL.COMMAND_MOD_NOTMEMBER, you.describeTo(context.fPlayer, true));
-                return;
-            }
+            context.sendFancyMessage(msg);
+            return;
+        }
 
-            if (context.fPlayer != null && context.fPlayer.getRole() != Role.LEADER && !permAny) {
-                context.msg(TL.COMMAND_MOD_NOTADMIN);
-                return;
-            }
+        boolean permAny = Permission.MOD_ANY.has(context.sender, false);
+        Faction targetFaction = you.getFaction();
+        if (targetFaction != context.faction && !permAny) {
+            context.msg(TL.COMMAND_MOD_NOTMEMBER, you.describeTo(context.fPlayer, true));
+            return;
+        }
 
-            if (you == context.fPlayer && !permAny) {
-                context.msg(TL.COMMAND_MOD_SELF);
-                return;
-            }
+        if (context.fPlayer != null && context.fPlayer.getRole() != Role.LEADER && !permAny) {
+            context.msg(TL.COMMAND_MOD_NOTADMIN);
+            return;
+        }
 
-            if (you.getRole() == Role.LEADER) {
-                context.msg(TL.COMMAND_MOD_TARGETISADMIN);
-                return;
-            }
+        if (you == context.fPlayer && !permAny) {
+            context.msg(TL.COMMAND_MOD_SELF);
+            return;
+        }
 
-            if (you.getRole() == Role.MODERATOR) {
-                // Revoke
-                you.setRole(Role.NORMAL);
-                targetFaction.msg(TL.COMMAND_MOD_REVOKED, you.describeTo(targetFaction, true));
-                context.msg(TL.COMMAND_MOD_REVOKES, you.describeTo(context.fPlayer, true));
-            } else {
-                // Give
-                you.setRole(Role.MODERATOR);
-                targetFaction.msg(TL.COMMAND_MOD_PROMOTED, you.describeTo(targetFaction, true));
-                context.msg(TL.COMMAND_MOD_PROMOTES, you.describeTo(context.fPlayer, true));
-                FactionsPlugin.instance.getFlogManager().log(targetFaction, FLogType.RANK_EDIT, context.fPlayer.getName(), you.getName(), ChatColor.LIGHT_PURPLE + "Mod");
+        if (you.getRole() == Role.LEADER) {
+            context.msg(TL.COMMAND_MOD_TARGETISADMIN);
+            return;
+        }
 
-            }
+        if (you.getRole() == Role.MODERATOR) {
+            // Revoke
+            you.setRole(Role.NORMAL);
+            targetFaction.msg(TL.COMMAND_MOD_REVOKED, you.describeTo(targetFaction, true));
+            context.msg(TL.COMMAND_MOD_REVOKES, you.describeTo(context.fPlayer, true));
+        } else {
+            // Give
+            you.setRole(Role.MODERATOR);
+            targetFaction.msg(TL.COMMAND_MOD_PROMOTED, you.describeTo(targetFaction, true));
+            context.msg(TL.COMMAND_MOD_PROMOTES, you.describeTo(context.fPlayer, true));
+            FactionsPlugin.instance.getFlogManager().log(targetFaction, FLogType.RANK_EDIT, context.fPlayer.getName(), you.getName(), ChatColor.LIGHT_PURPLE + "Mod");
+
+        }
     }
 
     @Override

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

@@ -29,7 +29,6 @@ public class CmdPaypalSee extends FCommand {
         }
 
 
-
         if (context.args.size() == 0) {
             if (context.fPlayer.getFaction().getPaypal() == null) {
                 context.msg(TL.COMMAND_PAYPAL_NOTSET);

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

@@ -11,11 +11,15 @@ public class CmdPlayerTitleToggle extends FCommand {
         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;}
+    public TL getUsageTranslation() {
+        return TL.COMMAND_TITLETOGGLE_DESCRIPTION;
+    }
 }

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

@@ -74,7 +74,9 @@ public class CmdSeeChunk extends FCommand {
             for (Object nameObject : seeChunkMap.keySet()) {
                 String name = nameObject + "";
                 Player player = Bukkit.getPlayer(name);
-                showBorders(player);
+                if (player != null) {
+                    showBorders(player);
+                }
             }
             manageTask();
         }, 0, interval);
@@ -110,24 +112,19 @@ public class CmdSeeChunk extends FCommand {
     private void showPillar(Player player, World world, int blockX, int blockZ) {
         for (int blockY = 0; blockY < player.getLocation().getBlockY() + 30; blockY++) {
             Location loc = new Location(world, blockX, blockY, blockZ).add(0.5, 0, 0.5);
-            if (loc.getBlock().getType() != Material.AIR) {
-                continue;
-            }
+            if (loc.getBlock().getType() != Material.AIR) continue;
             if (useParticles) {
                 if (FactionsPlugin.getInstance().useNonPacketParticles) {
                     // Dust options only exists in the 1.13 API, so we use an
                     // alternative method to achieve this in lower versions.
-                    if (FactionsPlugin.getInstance().mc113 || FactionsPlugin.getInstance().mc114) {
+                    if (FactionsPlugin.getInstance().mc113 || FactionsPlugin.getInstance().mc114 || FactionsPlugin.getInstance().mc115) {
                         player.spawnParticle(Particle.REDSTONE, loc, 0, new Particle.DustOptions(Color.RED, 1));
                     } else {
                         player.getWorld().spawnParticle(Particle.REDSTONE, loc, 0, 255, 0, 0, 1);
                     }
-
                 } else {
                     this.effect.display(0, 0, 0, 0, 1, loc, player);
                 }
-
-
             } else {
                 Material type = blockY % 5 == 0 ? XMaterial.REDSTONE_LAMP.parseMaterial() : XMaterial.BLACK_STAINED_GLASS.parseMaterial();
                 VisualizeUtil.addLocation(player, loc, type);

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

@@ -5,7 +5,7 @@ import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
 
-public class CmdSeeDiscord extends FCommand{
+public class CmdSeeDiscord extends FCommand {
 
     /**
      * @author Driftay
@@ -29,7 +29,6 @@ public class CmdSeeDiscord extends FCommand{
         }
 
 
-
         if (context.args.size() == 0) {
             if (context.fPlayer.getFaction().getDiscord() == null) {
                 context.msg(TL.COMMAND_DISCORD_NOTSET);

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

@@ -12,7 +12,7 @@ public class CmdSetDiscord extends FCommand {
      * @author Driftay
      */
 
-    public CmdSetDiscord(){
+    public CmdSetDiscord() {
         super();
         this.aliases.addAll(Aliases.discord_set);
 
@@ -64,7 +64,7 @@ public class CmdSetDiscord extends FCommand {
         }
     }
 
-    private boolean isDiscordInvite(String invite){
+    private boolean isDiscordInvite(String invite) {
         return invite.contains("discord.gg") || invite.contains("discord.me");
     }
 

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

@@ -2,6 +2,7 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.*;
 import com.massivecraft.factions.struct.Permission;
+import com.massivecraft.factions.zcore.fperms.Access;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
 
@@ -43,6 +44,16 @@ public class CmdSethome extends FCommand {
                 return;
             }
 
+            if (!context.args.isEmpty()) {
+                Faction target = context.argAsFaction(0);
+                if (target == null) return;
+                context.faction = target;
+                if (target.getAccess(context.fPlayer, PermissableAction.SETHOME) != Access.ALLOW) {
+                    context.fPlayer.msg(TL.GENERIC_FPERM_NOPERMISSION, "set faction home");
+                    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.econCostSethome, TL.COMMAND_SETHOME_TOSET, TL.COMMAND_SETHOME_FORSET)) {
                 return;

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

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

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

@@ -11,7 +11,7 @@ public class CmdSpawnerLock extends FCommand {
      * @author Illyria Team
      */
 
-    public CmdSpawnerLock(){
+    public CmdSpawnerLock() {
         super();
         this.aliases.addAll(Aliases.spawnerlock);
 
@@ -20,7 +20,7 @@ public class CmdSpawnerLock extends FCommand {
     }
 
     @Override
-    public void perform(CommandContext context){
+    public void perform(CommandContext context) {
         Conf.spawnerLock = !Conf.spawnerLock;
         context.msg(TL.COMMAND_SPAWNER_LOCK_TOGGLED, Conf.spawnerLock ? FactionsPlugin.getInstance().color("&aEnabled") : FactionsPlugin.getInstance().color("&4Disabled"));
     }

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

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

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

@@ -2,7 +2,6 @@ package com.massivecraft.factions.cmd;
 
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.listeners.FactionsBlockListener;
-import com.massivecraft.factions.listeners.FactionsPlayerListener;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.util.WarmUpUtil;
 import com.massivecraft.factions.zcore.util.TL;

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

@@ -268,7 +268,6 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
         this.addSubCommand(this.cmdPromote);
         this.addSubCommand(this.cmdDebug);
         this.addSubCommand(this.cmdDemote);
-        this.addSubCommand(this.cmdDiscord);
         this.addSubCommand(this.cmdSetDefaultRole);
         this.addSubCommand(this.cmdMapHeight);
         this.addSubCommand(this.cmdClaimAt);
@@ -309,16 +308,16 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
      */
     public void addVariableCommands() {
         //Discord
-         if (Conf.useDiscordSystem && !discordEnabled) {
-             this.addSubCommand(this.cmdInviteBot);
-             this.addSubCommand(this.cmdSetGuild);
-             this.addSubCommand(this.cmdSetDiscord);
-             this.addSubCommand(this.cmdSeeDiscord);
-             this.addSubCommand(this.cmdDiscord);
-             discordEnabled = true;
-         }
-         //Reserve
-        if(Conf.useReserveSystem){
+        if (Conf.useDiscordSystem && !discordEnabled) {
+            this.addSubCommand(this.cmdInviteBot);
+            this.addSubCommand(this.cmdSetGuild);
+            this.addSubCommand(this.cmdSetDiscord);
+            this.addSubCommand(this.cmdSeeDiscord);
+            this.addSubCommand(this.cmdDiscord);
+            discordEnabled = true;
+        }
+        //Reserve
+        if (Conf.useReserveSystem) {
             this.addSubCommand(this.cmdReserve);
         }
 
@@ -351,7 +350,7 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
             internalFTOPEnabled = true;
         }
 
-        if(Conf.useAuditSystem){
+        if (Conf.useAuditSystem) {
             this.addSubCommand(cmdAudit);
             fAuditEnabled = true;
         }
@@ -395,7 +394,9 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
         }
     }
 
-    public void rebuild() {if (CommodoreProvider.isSupported()) brigadierManager.build();}
+    public void rebuild() {
+        if (CommodoreProvider.isSupported()) brigadierManager.build();
+    }
 
     @Override
     public void perform(CommandContext context) {

src/main/java/com/massivecraft/factions/cmd/alts/CmdKickAlt.java

@@ -25,7 +25,7 @@ public class CmdKickAlt extends FCommand {
      * @author Driftay
      */
 
-    public CmdKickAlt(){
+    public CmdKickAlt() {
         super();
         this.aliases.addAll(Aliases.alts_kick);
         this.requiredArgs.add("player name");
@@ -86,7 +86,7 @@ public class CmdKickAlt extends FCommand {
         // This statement allows us to check if they've specifically denied it,
         // or default to
         // the old setting of allowing moderators to kick
-        if (access !=  Access.ALLOW && !context.assertMinRole(Role.MODERATOR)) {
+        if (access != Access.ALLOW && !context.assertMinRole(Role.MODERATOR)) {
             context.msg(TL.GENERIC_NOPERMISSION, "kick");
             return;
         }

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

@@ -26,10 +26,11 @@ public class CmdAudit extends FCommand {
                 .noErrorOnManyArgs()
                 .build();
     }
+
     @Override
     public void perform(CommandContext context) {
         Faction faction = context.args.size() == 1 && context.sender.isOp() ? context.argAsFaction(0) : context.faction;
-        new FAuditMenu((Player)context.sender, faction).open((Player)context.sender);
+        new FAuditMenu((Player) context.sender, faction).open((Player) context.sender);
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/audit/FAuditMenu.java

@@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd.audit;
 /*
   @author Saser
  */
+
 import com.google.common.collect.Lists;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FactionsPlugin;
@@ -92,9 +93,9 @@ public class FAuditMenu extends GUIMenu {
                 LinkedList<FactionLogs.FactionLog> log = logs.getMostRecentLogs().get(logType);
                 if (log != null) {
                     int slot = logType == FLogType.F_TNT ? 0 : 3;
-                    int pagesToShow = (int)Math.max(1.0D, Math.ceil((double)log.size() / (double)perPage));
+                    int pagesToShow = (int) Math.max(1.0D, Math.ceil((double) log.size() / (double) perPage));
 
-                    for(int page = 1; page <= pagesToShow; ++page) {
+                    for (int page = 1; page <= pagesToShow; ++page) {
                         int startIndex = log.size() - (page * perPage - perPage);
                         if (startIndex >= log.size()) {
                             startIndex = log.size() - 1;
@@ -102,7 +103,7 @@ public class FAuditMenu extends GUIMenu {
 
                         List<String> lore = Lists.newArrayList("", CC.GreenB + "Logs");
 
-                        for(int i = startIndex; i > startIndex - perPage; --i) {
+                        for (int i = startIndex; i > startIndex - perPage; --i) {
                             if (i < log.size()) {
                                 if (i < 0) {
                                     break;

src/main/java/com/massivecraft/factions/cmd/audit/FChestListener.java

@@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd.audit;
 /**
  * @author Saser
  */
+
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.Faction;
@@ -45,17 +46,20 @@ public class FChestListener implements Listener {
         Player player = (Player) event.getWhoClicked();
         FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
         Faction faction;
-        if(!event.getView().getTitle().equalsIgnoreCase(FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fchest.Inventory-Title")))) return;
+        if (!event.getView().getTitle().equalsIgnoreCase(FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fchest.Inventory-Title"))))
+            return;
         if (event.getClick() == ClickType.UNKNOWN) {
             event.setCancelled(true);
             player.sendMessage(CC.RedB + "(!) " + CC.Red + "You cannot use that click type inside the /f chest!");
             return;
         }
         ItemStack currentItem = event.getCurrentItem();
-        if (event.getClick() == ClickType.NUMBER_KEY) currentItem = event.getClickedInventory().getItem(event.getSlot());
+        if (event.getClick() == ClickType.NUMBER_KEY)
+            currentItem = event.getClickedInventory().getItem(event.getSlot());
         Material currentItemType = currentItem != null ? currentItem.getType() : Material.AIR;
         ItemStack cursorItem = event.getCursor();
-        if (event.getClick() == ClickType.NUMBER_KEY) cursorItem = player.getInventory().getItem(event.getHotbarButton());
+        if (event.getClick() == ClickType.NUMBER_KEY)
+            cursorItem = player.getInventory().getItem(event.getHotbarButton());
         Material cursorItemType = cursorItem != null ? cursorItem.getType() : Material.AIR;
         if (fPlayer == null || !(faction = fPlayer.getFaction()).isNormal()) {
             player.closeInventory();
@@ -65,16 +69,16 @@ public class FChestListener implements Listener {
         if (event.getClickedInventory() == null) return;
         if (event.getView().getTitle().equalsIgnoreCase(FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fchest.Inventory-Title"))) && !event.getClick().isShiftClick()) {
             if (currentItemType != Material.AIR) {
-                    Inventory ours = faction.getChestInventory();
-                    if(event.getClickedInventory() == ours) {
-                        if (ours == null || !ours.contains(currentItem)) {
-                            event.setCancelled(true);
-                            player.sendMessage(CC.RedB + "(!) That item not longer exists!");
-                            Bukkit.getLogger().info("[FactionChest] " + player.getName() + " tried to remove " + currentItem + " from /f chest when it didnt contain! Items: " + (ours == null ? "none" : Arrays.toString(ours.getContents())));
-                            player.closeInventory();
-                            return;
-                        }
+                Inventory ours = faction.getChestInventory();
+                if (event.getClickedInventory() == ours) {
+                    if (ours == null || !ours.contains(currentItem)) {
+                        event.setCancelled(true);
+                        player.sendMessage(CC.RedB + "(!) That item not longer exists!");
+                        Bukkit.getLogger().info("[FactionChest] " + player.getName() + " tried to remove " + currentItem + " from /f chest when it didnt contain! Items: " + (ours == null ? "none" : Arrays.toString(ours.getContents())));
+                        player.closeInventory();
+                        return;
                     }
+                }
                 logRemoveItem(currentItem, fPlayer, player);
             } else if (cursorItemType != Material.AIR && !event.isShiftClick()) {
                 logAddItem(cursorItem, fPlayer, player);

src/main/java/com/massivecraft/factions/cmd/audit/FLogManager.java

@@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd.audit;
 /**
  * @author Saser
  */
+
 import com.google.common.reflect.TypeToken;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.Factions;
@@ -127,7 +128,7 @@ public class FLogManager {
             }
 
             try {
-                JSONUtils.saveJSONToFile(logFile, factionLogMap,logToken);
+                JSONUtils.saveJSONToFile(logFile, factionLogMap, logToken);
             } catch (Exception e1) {
                 Bukkit.getLogger().info("ERROR SAVING JSON LOGS: " + e1.getMessage());
                 e1.printStackTrace();

src/main/java/com/massivecraft/factions/cmd/audit/FLogType.java

@@ -27,8 +27,10 @@ public enum FLogType {
     private String msg;
     private int requiredArgs;
 
-    public String getDisplayName() {
-        return this.displayName;
+    FLogType(String displayName, String msg, int requiredArgs) {
+        this.displayName = displayName;
+        this.msg = msg;
+        this.requiredArgs = requiredArgs;
     }
 
     /**
@@ -46,15 +48,22 @@ public enum FLogType {
         return null;
     }
 
-    @Override
-    public String toString() { return name(); }
-
-    public int getSlot() { return FactionsPlugin.getInstance().getConfig().getInt("faudit-gui.slots." + name().toLowerCase()); }
-
-    public Material getMaterial(){
-        return XMaterial.matchXMaterial(FactionsPlugin.getInstance().getConfig().getString("faudit-gui.materials." + name().toLowerCase())).parseMaterial();
+    public String getDisplayName() {
+        return this.displayName;
     }
 
+    @Override
+    public String toString() {
+        return name();
+    }
+
+    public int getSlot() {
+        return FactionsPlugin.getInstance().getConfig().getInt("faudit-gui.slots." + name().toLowerCase());
+    }
+
+    public Material getMaterial() {
+        return XMaterial.matchXMaterial(FactionsPlugin.getInstance().getConfig().getString("faudit-gui.materials." + name().toLowerCase())).get().parseMaterial();
+    }
 
     public String getMsg() {
         return this.msg;
@@ -63,10 +72,4 @@ public enum FLogType {
     public int getRequiredArgs() {
         return this.requiredArgs;
     }
-
-    FLogType(String displayName, String msg, int requiredArgs) {
-        this.displayName = displayName;
-        this.msg = msg;
-        this.requiredArgs = requiredArgs;
-    }
 }

src/main/java/com/massivecraft/factions/cmd/audit/FactionLogs.java

@@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd.audit;
 /**
  * @author Saser
  */
+
 import com.google.common.collect.Lists;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
@@ -16,8 +17,8 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.TimeUnit;
 
 public class FactionLogs {
-    private Map<FLogType, LinkedList<FactionLog>> mostRecentLogs = new ConcurrentHashMap<>();
     public static transient SimpleDateFormat format = new SimpleDateFormat("MM/dd hh:mmaa");
+    private Map<FLogType, LinkedList<FactionLog>> mostRecentLogs = new ConcurrentHashMap<>();
 
     public FactionLogs() {
     }

src/main/java/com/massivecraft/factions/cmd/audit/LogTimer.java

@@ -3,6 +3,7 @@ package com.massivecraft.factions.cmd.audit;
 /**
  * @author Saser
  */
+
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FactionsPlugin;
 import org.apache.commons.lang.StringUtils;
@@ -65,11 +66,32 @@ public class LogTimer extends ConcurrentHashMap<LogTimer.TimerType, Map<LogTimer
         return this.username;
     }
 
+    public enum TimerSubType {
+        SPAWNER_BREAK,
+        SPAWNER_PLACE;
+
+        TimerSubType() {
+        }
+    }
+
+    public enum TimerType {
+        SPAWNER_EDIT;
+
+        TimerType() {
+        }
+    }
+
     public class Timer {
         private long startTime;
         private long count;
         private Object extraData;
 
+        public Timer(long startTime, long count, Object extraData) {
+            this.startTime = startTime;
+            this.count = count;
+            this.extraData = extraData;
+        }
+
         LogTimer.Timer increment(long amount) {
             this.count += amount;
             return this;
@@ -79,47 +101,28 @@ public class LogTimer extends ConcurrentHashMap<LogTimer.TimerType, Map<LogTimer
             return System.currentTimeMillis() - this.startTime >= expiration;
         }
 
-        public Timer(long startTime, long count, Object extraData) {
-            this.startTime = startTime;
-            this.count = count;
-            this.extraData = extraData;
-        }
-
         public long getStartTime() {
             return this.startTime;
         }
 
-        public long getCount() {
-            return this.count;
-        }
-
-        public Object getExtraData() {
-            return this.extraData;
-        }
-
         public void setStartTime(long startTime) {
             this.startTime = startTime;
         }
 
+        public long getCount() {
+            return this.count;
+        }
+
         public void setCount(long count) {
             this.count = count;
         }
 
+        public Object getExtraData() {
+            return this.extraData;
+        }
+
         public void setExtraData(Object extraData) {
             this.extraData = extraData;
         }
     }
-
-    public enum TimerSubType {
-        SPAWNER_BREAK,
-        SPAWNER_PLACE;
-        TimerSubType() {
-        }
-    }
-
-    public enum TimerType {
-        SPAWNER_EDIT;
-        TimerType() {
-        }
-    }
 }

src/main/java/com/massivecraft/factions/cmd/check/CheckSettingsFrame.java

@@ -52,19 +52,19 @@ public class CheckSettingsFrame implements InventoryHolder, FactionGUI {
 
     public void build() {
         Faction faction = fPlayer.getFaction();
-        ItemStack wallsStack = XMaterial.matchXMaterial(FactionsPlugin.getInstance().getConfig().getString("f-check.wall-check.Type")).parseItem();
+        ItemStack wallsStack = XMaterial.matchXMaterial(FactionsPlugin.getInstance().getConfig().getString("f-check.wall-check.Type")).get().parseItem();
         ItemMeta wallsMeta = wallsStack.getItemMeta();
         wallsMeta.setDisplayName(TL.CHECK_WALL_CHECK_GUI_ICON.toString());
         wallsMeta.setLore(Collections.singletonList(TL.CHECK_CHECK_LORE_LINE.format(getFormatted(faction.getWallCheckMinutes()))));
         wallsStack.setItemMeta(wallsMeta);
         inventory.setItem(FactionsPlugin.getInstance().getConfig().getInt("f-check.wall-check.slot"), wallsStack);
-        ItemStack bufferStack = XMaterial.matchXMaterial(FactionsPlugin.getInstance().getConfig().getString("f-check.buffer-check.Type")).parseItem();
+        ItemStack bufferStack = XMaterial.matchXMaterial(FactionsPlugin.getInstance().getConfig().getString("f-check.buffer-check.Type")).get().parseItem();
         ItemMeta bufferMeta = bufferStack.getItemMeta();
         bufferMeta.setDisplayName(TL.CHECK_BUFFER_CHECK_GUI_ICON.toString());
         bufferMeta.setLore(Collections.singletonList(TL.CHECK_CHECK_LORE_LINE.format(getFormatted(faction.getBufferCheckMinutes()))));
         bufferStack.setItemMeta(bufferMeta);
         inventory.setItem(FactionsPlugin.getInstance().getConfig().getInt("f-check.buffer-check.slot"), bufferStack);
-        ItemStack historyStack = XMaterial.matchXMaterial(FactionsPlugin.getInstance().getConfig().getString("f-check.history.Type")).parseItem();
+        ItemStack historyStack = XMaterial.matchXMaterial(FactionsPlugin.getInstance().getConfig().getString("f-check.history.Type")).get().parseItem();
         ItemMeta historyMeta = historyStack.getItemMeta();
         historyMeta.setDisplayName(TL.CHECK_HISTORY_GUI_ICON.toString());
         historyStack.setItemMeta(historyMeta);

src/main/java/com/massivecraft/factions/cmd/check/CmdWeeWoo.java

@@ -59,7 +59,7 @@ public class CmdWeeWoo extends FCommand {
             }
             context.faction.setWeeWoo(false);
             context.msg(TL.COMMAND_WEEWOO_STOPPED, context.fPlayer.getNameAndTag());
-            if(!Conf.useDiscordSystem) return;
+            if (!Conf.useDiscordSystem) return;
             String discordChannelId = context.faction.getWeeWooChannelId();
             if (discordChannelId != null && !discordChannelId.isEmpty()) {
                 TextChannel textChannel = Discord.jda.getTextChannelById(discordChannelId);

src/main/java/com/massivecraft/factions/cmd/claim/CmdClaimAt.java

@@ -1,7 +1,6 @@
 package com.massivecraft.factions.cmd.claim;
 
 import com.massivecraft.factions.Board;
-import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FLocation;
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.cmd.Aliases;

src/main/java/com/massivecraft/factions/cmd/claim/CmdClaimLine.java

@@ -89,7 +89,7 @@ public class CmdClaimLine extends FCommand {
             location = location.add(blockFace.getModX() * 16, 0, blockFace.getModZ() * 16);
             FactionsPlugin.instance.logFactionEvent(forFaction, FLogType.CHUNK_CLAIMS, context.fPlayer.getName(), CC.GreenB + "CLAIMED", String.valueOf(i), new FLocation(context.player.getLocation()).formatXAndZ(","));
         }
-}
+    }
 
     @Override
     public TL getUsageTranslation() {

src/main/java/com/massivecraft/factions/cmd/claim/CmdCorner.java

@@ -10,8 +10,6 @@ import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.util.CornerTask;
 import com.massivecraft.factions.zcore.fperms.PermissableAction;
 import com.massivecraft.factions.zcore.util.TL;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
 
 import java.util.ArrayList;
 import java.util.Comparator;

src/main/java/com/massivecraft/factions/cmd/claim/CmdUnclaimall.java

@@ -21,7 +21,6 @@ public class CmdUnclaimall extends FCommand {
      */
 
     //TODO: Add UnclaimAll Confirmation GUI
-
     public CmdUnclaimall() {
         this.aliases.addAll(Aliases.unclaim_all_unsafe);
 

src/main/java/com/massivecraft/factions/cmd/econ/CmdMoney.java

@@ -40,7 +40,7 @@ public class CmdMoney extends FCommand {
     @Override
     public void perform(CommandContext context) {
         if (!Conf.econEnabled || !Conf.bankEnabled) {
-            context.msg(TL.ECON_OFF, "economy option is enabled, please set \'econEnabled\' to true in conf.json");
+            context.msg(TL.ECON_OFF, "economy option is enabled, please set 'econEnabled' to true in conf.json");
             return;
         }
         context.commandChain.add(this);

src/main/java/com/massivecraft/factions/cmd/econ/CmdMoneyBalance.java

@@ -8,7 +8,6 @@ import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.zcore.util.TL;
-import org.bukkit.command.CommandSender;
 
 public class CmdMoneyBalance extends FCommand {
 

src/main/java/com/massivecraft/factions/cmd/grace/CmdGrace.java

@@ -16,7 +16,6 @@ public class CmdGrace extends FCommand {
      */
 
     //TODO: Make Timed Format For Grace Period
-
     public CmdGrace() {
         super();
         this.aliases.addAll(Aliases.grace);

src/main/java/com/massivecraft/factions/cmd/relational/FRelationCommand.java

@@ -84,7 +84,7 @@ public abstract class FRelationCommand extends FCommand {
             // trigger the faction relation event
             FactionRelationEvent relationEvent = new FactionRelationEvent(context.faction, them, oldRelation, currentRelation);
             Bukkit.getServer().getPluginManager().callEvent(relationEvent);
-            FactionsPlugin.instance.logFactionEvent(context.faction, FLogType.RELATION_CHANGE,context.fPlayer.getName(), this.targetRelation.getColor() + this.targetRelation.name(), oldRelation.getColor() + them.getTag());
+            FactionsPlugin.instance.logFactionEvent(context.faction, FLogType.RELATION_CHANGE, context.fPlayer.getName(), this.targetRelation.getColor() + this.targetRelation.name(), oldRelation.getColor() + them.getTag());
             FactionsPlugin.instance.logFactionEvent(them, FLogType.RELATION_CHANGE, oldRelation.getColor() + context.fPlayer.getName(), this.targetRelation.getColor() + this.targetRelation.name(), "your faction");
 
             them.msg(TL.COMMAND_RELATIONS_MUTUAL, currentRelationColor + targetRelation.getTranslation(), currentRelationColor + context.faction.getTag());

src/main/java/com/massivecraft/factions/cmd/reserve/ListParameterizedType.java

@@ -10,14 +10,22 @@ import java.util.ArrayList;
 public class ListParameterizedType implements ParameterizedType {
     private Type type;
 
-    public ListParameterizedType(Type type) { this.type = type; }
+    public ListParameterizedType(Type type) {
+        this.type = type;
+    }
 
     @Override
-    public Type[] getActualTypeArguments() { return new Type[] { this.type }; }
+    public Type[] getActualTypeArguments() {
+        return new Type[]{this.type};
+    }
 
     @Override
-    public Type getRawType() { return ArrayList.class; }
+    public Type getRawType() {
+        return ArrayList.class;
+    }
 
     @Override
-    public Type getOwnerType() { return null; }
+    public Type getOwnerType() {
+        return null;
+    }
 }

src/main/java/com/massivecraft/factions/cmd/reserve/ReserveObject.java

@@ -6,13 +6,16 @@ package com.massivecraft.factions.cmd.reserve;
 public class ReserveObject {
     private String name;
     private String factionName;
-    public ReserveObject(String name, String factionName){
+
+    public ReserveObject(String name, String factionName) {
         this.name = name;
         this.factionName = factionName;
     }
+
     public String getName() {
         return this.name;
     }
+
     public String getFactionName() {
         return this.factionName;
     }

src/main/java/com/massivecraft/factions/cmd/tnt/CmdTnt.java

@@ -34,6 +34,24 @@ public class CmdTnt extends FCommand {
                 .build();
     }
 
+    public static void removeItems(Inventory inventory, ItemStack item, int toRemove) {
+        if (toRemove <= 0 || inventory == null || item == null)
+            return;
+        for (int i = 0; i < inventory.getSize(); i++) {
+            ItemStack loopItem = inventory.getItem(i);
+            if (loopItem == null || !item.isSimilar(loopItem))
+                continue;
+            if (toRemove <= 0)
+                return;
+            if (toRemove < loopItem.getAmount()) {
+                loopItem.setAmount(loopItem.getAmount() - toRemove);
+                return;
+            }
+            inventory.clear(i);
+            toRemove -= loopItem.getAmount();
+        }
+    }
+
     @Override
     public void perform(CommandContext context) {
         if (!FactionsPlugin.instance.getConfig().getBoolean("ftnt.Enabled")) {
@@ -110,8 +128,10 @@ public class CmdTnt extends FCommand {
                     return;
                 }
 
-                for (int i = 0; i <= fullStacks - 1; i++) context.player.getInventory().addItem(new ItemStack(XMaterial.TNT.parseMaterial(), 64));
-                if (remainderAmt != 0) context.player.getInventory().addItem(new ItemStack(XMaterial.TNT.parseMaterial(), remainderAmt));
+                for (int i = 0; i <= fullStacks - 1; i++)
+                    context.player.getInventory().addItem(new ItemStack(XMaterial.TNT.parseMaterial(), 64));
+                if (remainderAmt != 0)
+                    context.player.getInventory().addItem(new ItemStack(XMaterial.TNT.parseMaterial(), remainderAmt));
 
                 context.faction.takeTnt(amount);
                 context.player.updateInventory();
@@ -123,7 +143,9 @@ public class CmdTnt extends FCommand {
                 Inventory inv = context.player.getInventory();
                 int invTnt = 0;
                 for (int i = 0; i <= inv.getSize(); i++) {
-                    if (inv.getItem(i) == null) { continue; }
+                    if (inv.getItem(i) == null) {
+                        continue;
+                    }
                     if (inv.getItem(i).getType() == Material.TNT) {
                         invTnt += inv.getItem(i).getAmount();
                     }
@@ -152,7 +174,6 @@ public class CmdTnt extends FCommand {
         context.sendMessage(TL.COMMAND_TNT_AMOUNT.toString().replace("{amount}", context.faction.getTnt() + "").replace("{maxAmount}", context.faction.getTntBankLimit() + ""));
     }
 
-
     public boolean inventoryContains(Inventory inventory, ItemStack item) {
         int count = 0;
         ItemStack[] items = inventory.getContents();
@@ -177,24 +198,6 @@ public class CmdTnt extends FCommand {
         return check >= howmany;
     }
 
-    public static void removeItems(Inventory inventory, ItemStack item, int toRemove) {
-        if (toRemove <= 0 || inventory == null || item == null)
-            return;
-        for (int i = 0; i < inventory.getSize(); i++) {
-            ItemStack loopItem = inventory.getItem(i);
-            if (loopItem == null || !item.isSimilar(loopItem))
-                continue;
-            if (toRemove <= 0)
-                return;
-            if (toRemove < loopItem.getAmount()) {
-                loopItem.setAmount(loopItem.getAmount() - toRemove);
-                return;
-            }
-            inventory.clear(i);
-            toRemove -= loopItem.getAmount();
-        }
-    }
-
     public void removeFromInventory(Inventory inventory, ItemStack item) {
         int amt = item.getAmount();
         ItemStack[] items = inventory.getContents();

src/main/java/com/massivecraft/factions/cmd/tnt/CmdTntFill.java

@@ -1,6 +1,7 @@
 package com.massivecraft.factions.cmd.tnt;
 
 import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.Factions;
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.cmd.Aliases;
 import com.massivecraft.factions.cmd.CommandContext;
@@ -23,10 +24,6 @@ import java.util.*;
 
 public class CmdTntFill extends FCommand {
 
-    /**
-     * @author Illyria Team
-     */
-
     public CmdTntFill() {
         super();
         this.aliases.addAll(Aliases.tnt_tntfill);
@@ -66,15 +63,15 @@ public class CmdTntFill extends FCommand {
             return;
         }
 
-        if (radius > FactionsPlugin.instance.getConfig().getInt("Tntfill.max-radius")) {
-            context.msg(TL.COMMAND_TNTFILL_RADIUSMAX.toString().replace("{max}", FactionsPlugin.instance.getConfig().getInt("Tntfill.max-radius") + ""));
+        if (radius > FactionsPlugin.getInstance().getConfig().getInt("Tntfill.max-radius")) {
+            context.msg(TL.COMMAND_TNTFILL_RADIUSMAX.toString().replace("{max}", FactionsPlugin.getInstance().getConfig().getInt("Tntfill.max-radius") + ""));
+            return;
+        }
+        if (amount > FactionsPlugin.getInstance().getConfig().getInt("Tntfill.max-amount")) {
+            context.msg(TL.COMMAND_TNTFILL_AMOUNTMAX.toString().replace("{max}", FactionsPlugin.getInstance().getConfig().getInt("Tntfill.max-amount") + ""));
             return;
         }
 
-        if (amount > FactionsPlugin.instance.getConfig().getInt("Tntfill.max-amount")) {
-            context.msg(TL.COMMAND_TNTFILL_AMOUNTMAX.toString().replace("{max}", FactionsPlugin.instance.getConfig().getInt("Tntfill.max-amount") + ""));
-            return;
-        }
         // How many dispensers are we to fill in?
 
         Location start = context.player.getLocation();
@@ -89,103 +86,82 @@ public class CmdTntFill extends FCommand {
                     if (block == null) continue;
                     BlockState blockState = block.getState();
                     if (!(blockState instanceof Dispenser)) continue;
+                    Dispenser dis = (Dispenser) blockState;
+                    // skip if we can't add anything
+                    if (isInvFull(dis.getInventory())) continue;
                     opDispensers.add((Dispenser) blockState);
                 }
         if (opDispensers.isEmpty()) {
             context.fPlayer.msg(TL.COMMAND_TNTFILL_NODISPENSERS.toString().replace("{radius}", radius + ""));
             return;
         }
-
-        // What's the required amount of resources
         int requiredTnt = (opDispensers.size() * amount);
-
-        // Do I have enough tnt in my inventory?
-        int playerTnt = inventoryItemCount(context.player.getInventory(), Material.TNT);
+        int playerTnt = getTNTInside(context.player);
+        // if player does not have enough tnt, just take whatever he has and add it to the bank
+        // then use the bank as source. If bank < required abort.
         if (playerTnt < requiredTnt) {
-            // How much TNT will I take from bank?
-            int getFactionTnt = requiredTnt - playerTnt;
-
             // Do I have enough tnt in bank?
-            if ((context.faction.getTnt() < getFactionTnt)) {
+            if ((context.faction.getTnt() < (requiredTnt - playerTnt))) {
                 context.fPlayer.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH_TNT.toString());
                 return;
             }
-
-            // Take TNT from the bank.
-            removeFromBank(context, getFactionTnt);
+            // move whatever tnt you have to the bank, ignoring limit because its gonna be taken out later anyways
+            context.faction.addTnt(playerTnt);
+            removeItems(context.fPlayer.getPlayer().getInventory(), new ItemStack(Material.TNT), playerTnt);
+            // Take TNT from the bank
+            fillDispensers(context, opDispensers, amount);
+        } else {
+            // Take TNT from the player
+            fillDispensers(context.fPlayer, opDispensers, amount);
         }
-        fillDispensers(context.fPlayer, opDispensers, amount);
-        // Remove used TNT from player inventory.
         context.sendMessage(TL.COMMAND_TNTFILL_SUCCESS.toString().replace("{amount}", requiredTnt + "").replace("{dispensers}", opDispensers.size() + ""));
     }
+
     // Actually fill every dispenser with the precise amount.
     private void fillDispensers(FPlayer fPlayer, List<Dispenser> dispensers, int count) {
         for (Dispenser dispenser : dispensers) {
-            if (takeTnt(fPlayer, count)) {
-                dispenser.getInventory().addItem(new ItemStack(Material.TNT, count));
-            } else {return;}
+            int canBeAdded = getAddable(dispenser.getInventory(), Material.TNT);
+            if (canBeAdded <= 0) continue;
+            int toAdd = Math.min(canBeAdded, count);
+            if (toAdd > getTNTInside(fPlayer.getPlayer())) {
+                fPlayer.msg(TL.COMMAND_TNTFILL_NOTENOUGH.toString());
+                return;
+            }
+            removeItems(fPlayer.getPlayer().getInventory(), new ItemStack(Material.TNT), toAdd);
+            dispenser.getInventory().addItem(new ItemStack(Material.TNT, toAdd));
         }
     }
 
-    private void removeFromBank(CommandContext context, int amount) {
-        try {
-            Integer.parseInt(context.args.get(1));
-        } catch (NumberFormatException e) {
-            context.fPlayer.msg(TL.COMMAND_TNT_INVALID_NUM.toString());
-            return;
+    private void fillDispensers(CommandContext context, List<Dispenser> dispensers, int count) {
+        for (Dispenser dispenser : dispensers) {
+            int canBeAdded = getAddable(dispenser.getInventory(), Material.TNT);
+            if (canBeAdded <= 0) continue;
+            int toAdd = Math.min(canBeAdded, count);
+            if (context.faction.getTnt() < toAdd) {
+                context.fPlayer.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH_TNT.toString());
+                return;
+            }
+            context.faction.takeTnt(toAdd);
+            dispenser.getInventory().addItem(new ItemStack(Material.TNT, toAdd));
         }
-        if (amount < 0) {
-            context.fPlayer.msg(TL.COMMAND_TNT_POSITIVE.toString());
-            return;
-        }
-        if (context.faction.getTnt() < amount) {
-            context.fPlayer.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH_TNT.toString());
-            return;
-        }
-        int fullStacks = amount / 64;
-        int remainderAmt = amount % 64;
-        if ((remainderAmt == 0 && getEmptySlots(context.player) <= fullStacks)) {
-            context.fPlayer.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH_TNT.toString());
-            return;
-        }
-        if (getEmptySlots(context.player) + 1 <= fullStacks) {
-            context.fPlayer.msg(TL.COMMAND_TNT_WIDTHDRAW_NOTENOUGH_TNT.toString());
-            return;
-        }
-        ItemStack tnt64 = new ItemStack(Material.TNT, 64);
-        for (int i = 0; i <= fullStacks - 1; i++) {
-            context.player.getInventory().addItem(tnt64);
-        }
-        if (remainderAmt != 0) {
-            ItemStack tnt = new ItemStack(Material.TNT, remainderAmt);
-            context.player.getInventory().addItem(tnt);
-        }
-        context.faction.takeTnt(amount);
-        context.player.updateInventory();
     }
 
-    private boolean takeTnt(FPlayer fme, int amount) {
-        Inventory inv = fme.getPlayer().getInventory();
-        int invTnt = 0;
-        for (int i = 0; i <= inv.getSize(); i++) {
-            if (inv.getItem(i) == null) {
+    public static void removeItems(Inventory inventory, ItemStack item, int toRemove) {
+        if (toRemove <= 0 || inventory == null || item == null)
+            return;
+        for (int i = 0; i < inventory.getSize(); i++) {
+            ItemStack loopItem = inventory.getItem(i);
+            if (loopItem == null || !item.isSimilar(loopItem))
                 continue;
+            if (toRemove <= 0)
+                return;
+            if (toRemove < loopItem.getAmount()) {
+                loopItem.setAmount(loopItem.getAmount() - toRemove);
+                return;
             }
-            if (inv.getItem(i).getType() == Material.TNT) {
-                invTnt += inv.getItem(i).getAmount();
-            }
+            inventory.clear(i);
+            toRemove -= loopItem.getAmount();
         }
-        if (amount > invTnt) {
-            fme.msg(TL.COMMAND_TNTFILL_NOTENOUGH.toString());
-            return false;
-        }
-        ItemStack tnt = new ItemStack(Material.TNT, amount);
-        if (fme.getFaction().getTnt() + amount > FactionsPlugin.getInstance().getConfig().getInt("ftnt.Bank-Limit")) {
-            fme.msg(TL.COMMAND_TNT_EXCEEDLIMIT.toString());
-            return false;
-        }
-        removeFromInventory(fme.getPlayer().getInventory(), tnt);
-        return true;
     }
 
     // Counts the item type available in the inventory.
@@ -197,35 +173,37 @@ public class CmdTntFill extends FCommand {
         return count;
     }
 
-    private void removeFromInventory(Inventory inventory, ItemStack item) {
-        int amt = item.getAmount();
-        ItemStack[] items = inventory.getContents();
-        for (int i = 0; i < items.length; i++) {
-            if (items[i] != null && items[i].getType() == item.getType() && items[i].getDurability() == item.getDurability()) {
-                if (items[i].getAmount() > amt) {
-                    items[i].setAmount(items[i].getAmount() - amt);
-                    break;
-                } else if (items[i].getAmount() == amt) {
-                    items[i] = null;
-                    break;
-                } else {
-                    amt -= items[i].getAmount();
-                    items[i] = null;
+    public int getAddable(Inventory inv, Material material) {
+        int output = 0;
+        int notempty = 0;
+        for (int i = 0; i < inv.getSize(); ++i) {
+            ItemStack is = inv.getItem(i);
+            if (is != null) {
+                ++notempty;
+                if (is.getType() == material) {
+                    int amount = is.getAmount();
+                    output += 64 - amount;
                 }
             }
         }
-        inventory.setContents(items);
+        return output + (inv.getSize() - notempty) * 64;
     }
 
-    private int getEmptySlots(Player p) {
-        PlayerInventory inventory = p.getInventory();
-        ItemStack[] cont = inventory.getContents();
-        int i = 0;
-        for (ItemStack item : cont)
-            if (item != null && item.getType() != Material.AIR) {
-                i++;
+    public boolean isInvFull(Inventory inv) {
+        return inv.firstEmpty() == -1;
+    }
+
+    public int getTNTInside(Player p) {
+        int result = 0;
+        PlayerInventory pi = p.getInventory();
+        ItemStack[] contents;
+        for (int length = (contents = pi.getContents()).length, i = 0; i < length; ++i) {
+            ItemStack is = contents[i];
+            if (is != null && is.getType() == Material.TNT) {
+                result += is.getAmount();
             }
-        return 36 - i;
+        }
+        return result;
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/wild/CmdWild.java

@@ -27,22 +27,26 @@ public class CmdWild extends FCommand {
     public static HashMap<Player, Integer> waitingTeleport;
     public static HashMap<Player, String> teleportRange;
     public static HashSet<Player> teleporting;
+
     public CmdWild() {
         super();
         this.aliases.addAll(Aliases.wild);
         this.requirements = new CommandRequirements.Builder(Permission.WILD)
                 .playerOnly()
                 .build();
-         waitingTeleport = new HashMap<>();
+        waitingTeleport = new HashMap<>();
         teleporting = new HashSet<>();
         teleportRange = new HashMap<>();
         startWild();
     }
+
     @Override
     public void perform(CommandContext context) {
         if (!waitingTeleport.containsKey(context.player)) {
             context.player.openInventory(new WildGUI(context.player, context.fPlayer).getInventory());
-        } else {context.fPlayer.msg(TL.COMMAND_WILD_WAIT);}
+        } else {
+            context.fPlayer.msg(TL.COMMAND_WILD_WAIT);
+        }
     }
 
     public void startWild() {
@@ -64,6 +68,7 @@ public class CmdWild extends FCommand {
             }
         }, 0L, 20L);
     }
+
     public void attemptTeleport(Player p) {
         boolean success = false;
         int tries = 0;
@@ -84,26 +89,34 @@ public class CmdWild extends FCommand {
             }
             tries++;
         }
-        if (!success) {p.sendMessage(TL.COMMAND_WILD_FAILED.toString());}
+        if (!success) {
+            p.sendMessage(TL.COMMAND_WILD_FAILED.toString());
+        }
     }
+
     public void teleportPlayer(Player p, FLocation loc) {
         Location finalLoc;
         if (FactionsPlugin.getInstance().getConfig().getBoolean("Wild.Arrival.SpawnAbove")) {
             finalLoc = new Location(p.getWorld(), loc.getX(), p.getWorld().getHighestBlockYAt(Math.round(loc.getX()), Math.round(loc.getZ())) + FactionsPlugin.getInstance().getConfig().getInt("Wild.Arrival.SpawnAboveBlocks", 1), loc.getZ());
-        } else {finalLoc = new Location(p.getWorld(), loc.getX(), p.getWorld().getHighestBlockYAt(Math.round(loc.getX()), Math.round(loc.getZ())), loc.getZ());}
+        } else {
+            finalLoc = new Location(p.getWorld(), loc.getX(), p.getWorld().getHighestBlockYAt(Math.round(loc.getX()), Math.round(loc.getZ())), loc.getZ());
+        }
         p.teleport(finalLoc, PlayerTeleportEvent.TeleportCause.PLUGIN);
         setTeleporting(p);
         applyEffects(p);
     }
+
     public void applyEffects(Player p) {
         for (String s : FactionsPlugin.getInstance().getConfig().getStringList("Wild.Arrival.Effects")) {
             p.addPotionEffect(new PotionEffect(PotionEffectType.getByName(s), 40, 1));
         }
     }
+
     public void setTeleporting(Player p) {
         teleporting.add(p);
         Bukkit.getScheduler().scheduleSyncDelayedTask(FactionsPlugin.instance, () -> teleporting.remove(p), FactionsPlugin.getInstance().getConfig().getInt("Wild.Arrival.FallDamageWindow") * 20);
     }
+
     @Override
     public TL getUsageTranslation() {
         return TL.COMMAND_WILD_DESCRIPTION;

src/main/java/com/massivecraft/factions/cmd/wild/WildGUI.java

@@ -23,11 +23,13 @@ public class WildGUI implements FactionGUI {
     FPlayer fplayer;
     HashMap<Integer, String> map;
     Inventory inv;
+
     public WildGUI(Player player, FPlayer fplayer) {
         this.player = player;
         this.fplayer = fplayer;
         map = new HashMap<>();
     }
+
     @Override
     public void onClick(int slot, ClickType action) {
         if (map.containsKey(slot)) {
@@ -44,18 +46,18 @@ public class WildGUI implements FactionGUI {
     @Override
     public void build() {
         inv = Bukkit.createInventory(this, FactionsPlugin.getInstance().getConfig().getInt("Wild.GUI.Size"), FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("Wild.GUI.Name")));
-        ItemStack fillItem = XMaterial.matchXMaterial(FactionsPlugin.getInstance().getConfig().getString("Wild.GUI.FillMaterial")).parseItem();
+        ItemStack fillItem = XMaterial.matchXMaterial(FactionsPlugin.getInstance().getConfig().getString("Wild.GUI.FillMaterial")).get().parseItem();
         ItemMeta meta = fillItem.getItemMeta();
-        if(meta == null) return;
+        if (meta == null) return;
         meta.setDisplayName("");
         fillItem.setItemMeta(meta);
         for (int fill = 0; fill < FactionsPlugin.getInstance().getConfig().getInt("Wild.GUI.Size"); ++fill) {
             inv.setItem(fill, fillItem);
         }
         for (String key : Objects.requireNonNull(FactionsPlugin.getInstance().getConfig().getConfigurationSection("Wild.Zones")).getKeys(false)) {
-            ItemStack zoneItem = XMaterial.matchXMaterial(FactionsPlugin.getInstance().getConfig().getString("Wild.Zones." + key + ".Material")).parseItem();
+            ItemStack zoneItem = XMaterial.matchXMaterial(FactionsPlugin.getInstance().getConfig().getString("Wild.Zones." + key + ".Material")).get().parseItem();
             ItemMeta zoneMeta = zoneItem.getItemMeta();
-            if(zoneMeta == null) return;
+            if (zoneMeta == null) return;
             List<String> lore = new ArrayList<>();
             for (String s : FactionsPlugin.getInstance().getConfig().getStringList("Wild.Zones." + key + ".Lore")) {
                 lore.add(FactionsPlugin.getInstance().color(s));
@@ -72,7 +74,9 @@ public class WildGUI implements FactionGUI {
     @NotNull
     @Override
     public Inventory getInventory() {
-        if (inv == null) {build();}
+        if (inv == null) {
+            build();
+        }
         return inv;
     }
 }

src/main/java/com/massivecraft/factions/event/FPlayerRoleChangeEvent.java

@@ -32,7 +32,7 @@ public class FPlayerRoleChangeEvent extends FactionPlayerEvent implements Cancel
 
     @Override
     public boolean isCancelled() {
-        return false;
+        return cancelled;
     }
 
     @Override

src/main/java/com/massivecraft/factions/integration/dynmap/EngineDynmap.java

@@ -73,6 +73,9 @@ public class EngineDynmap {
     }
 
     public static String escapeHtml(String string) {
+        if (string == null) {
+            return "";
+        }
         StringBuilder out = new StringBuilder(Math.max(16, string.length()));
         for (int i = 0; i < string.length(); i++) {
             char c = string.charAt(i);

src/main/java/com/massivecraft/factions/listeners/FactionsBlockListener.java

@@ -40,6 +40,7 @@ import org.bukkit.potion.PotionEffectType;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
 
@@ -161,18 +162,20 @@ public class FactionsBlockListener implements Listener {
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
     public void onBlockPlace(BlockPlaceEvent event) {
-        Faction at = Board.getInstance().getFactionAt(new FLocation(event.getBlockPlaced()));
 
         if (!event.canBuild()) return;
         if (event.getBlockPlaced().getType() == Material.FIRE) return;
-
+        boolean isSpawner = event.getBlock().getType().equals(XMaterial.SPAWNER.parseMaterial());
         if (!playerCanBuildDestroyBlock(event.getPlayer(), event.getBlock().getLocation(), "build", false)) {
             event.setCancelled(true);
             return;
         }
-        if (event.getBlock().getType().equals(XMaterial.SPAWNER.parseMaterial()) && Conf.spawnerLock) {
-            event.setCancelled(true);
-            event.getPlayer().sendMessage(FactionsPlugin.getInstance().color(TL.COMMAND_SPAWNER_LOCK_CANNOT_PLACE.toString()));
+
+        if (isSpawner) {
+            if (Conf.spawnerLock) {
+                event.setCancelled(true);
+                event.getPlayer().sendMessage(FactionsPlugin.getInstance().color(TL.COMMAND_SPAWNER_LOCK_CANNOT_PLACE.toString()));
+            }
         }
     }
 
@@ -265,7 +268,8 @@ public class FactionsBlockListener implements Listener {
 
     @EventHandler
     public void onHopperPlace(BlockPlaceEvent e) {
-        if (e.getItemInHand().getType() != Material.HOPPER && !FactionsPlugin.instance.getConfig().getBoolean("fvault.No-Hoppers-near-vault")) return;
+        if (e.getItemInHand().getType() != Material.HOPPER && !FactionsPlugin.instance.getConfig().getBoolean("fvault.No-Hoppers-near-vault"))
+            return;
         Faction factionAt = Board.getInstance().getFactionAt(new FLocation(e.getBlockPlaced().getLocation()));
         if (factionAt.isWilderness() || factionAt.getVault() == null) return;
         FPlayer fme = FPlayers.getInstance().getByPlayer(e.getPlayer());
@@ -356,11 +360,7 @@ public class FactionsBlockListener implements Listener {
                         return;
                     }
                     for (FPlayer fplayer : fme.getFaction().getFPlayers()) {
-                        if (XMaterial.isVersionOrHigher(XMaterial.MinecraftVersion.VERSION_1_9)) {
-                            fplayer.getPlayer().sendTitle(FactionsPlugin.getInstance().color(fme.getTag() + " Placed A WarBanner!"), FactionsPlugin.getInstance().color("&7use &c/f tpbanner&7 to tp to the banner!"), 10, 70, 20);
-                        } else {
-                            fplayer.getPlayer().sendTitle(FactionsPlugin.getInstance().color(fme.getTag() + " Placed A WarBanner!"), FactionsPlugin.getInstance().color("&7use &c/f tpbanner&7 to tp to the banner!"));
-                        }
+                        fplayer.getPlayer().sendTitle(FactionsPlugin.getInstance().color(fme.getTag() + " Placed A WarBanner!"), FactionsPlugin.getInstance().color("&7use &c/f tpbanner&7 to tp to the banner!"));
                     }
                     bannerCooldownMap.put(fme.getTag(), true);
                     FactionsBlockListener.bannerLocations.put(fme.getTag(), e.getBlockPlaced().getLocation());
@@ -380,7 +380,7 @@ public class FactionsBlockListener implements Listener {
                     int radius = FactionsPlugin.getInstance().getConfig().getInt("fbanners.Banner-Effect-Radius");
                     List<String> effects = FactionsPlugin.getInstance().getConfig().getStringList("fbanners.Effects");
                     int affectorTask = Bukkit.getScheduler().scheduleSyncRepeatingTask(FactionsPlugin.getInstance(), () -> {
-                        for (Entity e1 : banner.getLocation().getWorld().getNearbyEntities(banner.getLocation(), radius, 255.0, radius)) {
+                        for (Entity e1 : Objects.requireNonNull(banner.getLocation().getWorld()).getNearbyEntities(banner.getLocation(), radius, 255.0, radius)) {
                             if (e1 instanceof Player) {
                                 Player player = (Player) e1;
                                 FPlayer fplayer = FPlayers.getInstance().getByPlayer(player);
@@ -389,7 +389,7 @@ public class FactionsBlockListener implements Listener {
                                 }
                                 for (String effect : effects) {
                                     String[] components = effect.split(":");
-                                    player.addPotionEffect(new PotionEffect(PotionEffectType.getByName(components[0]), 100, Integer.parseInt(components[1])));
+                                    player.addPotionEffect(new PotionEffect(Objects.requireNonNull(PotionEffectType.getByName(components[0])), 100, Integer.parseInt(components[1])));
                                 }
                                 ParticleEffect.LAVA.display(1.0f, 1.0f, 1.0f, 1.0f, 10, banner.getLocation(), 16.0);
                                 ParticleEffect.FLAME.display(1.0f, 1.0f, 1.0f, 1.0f, 10, banner.getLocation(), 16.0);
@@ -496,13 +496,25 @@ public class FactionsBlockListener implements Listener {
         Block block = event.getBlock();
 
         Faction at = Board.getInstance().getFactionAt(new FLocation(block));
-        boolean isSpawner = event.getBlock().getType() == XMaterial.SPAWNER.parseMaterial();
-        if (!playerCanBuildDestroyBlock(event.getPlayer(), event.getBlock().getLocation(), !isSpawner ? "destroy" : "mine spawners", false)) {
+        boolean isSpawner = event.getBlock().getType().equals(XMaterial.SPAWNER.parseMaterial());
+
+        if (!playerCanBuildDestroyBlock(event.getPlayer(), event.getBlock().getLocation(), "destroy", false)) {
             event.setCancelled(true);
             return;
         }
-        if (block != null && isSpawner) {
-            ItemStack item = new ItemStack(block.getType(), 1, (short) block.getData());
+
+        FPlayer fme = FPlayers.getInstance().getByPlayer(event.getPlayer());
+        if (fme == null || !fme.hasFaction()) return;
+
+        if (isSpawner) {
+            Access access = fme.getFaction().getAccess(fme, PermissableAction.SPAWNER);
+            if (access != Access.ALLOW && fme.getRole() != Role.LEADER) {
+                fme.msg(TL.GENERIC_FPERM_NOPERMISSION, "mine spawners");
+            }
+        }
+
+        if (isSpawner && !fme.isAdminBypassing()) {
+            ItemStack item = new ItemStack(block.getType(), 1, block.getData());
             if (at != null && at.isNormal()) {
                 FPlayer fplayer = FPlayers.getInstance().getByPlayer(event.getPlayer());
                 if (fplayer != null) {

src/main/java/com/massivecraft/factions/listeners/FactionsPlayerListener.java

@@ -338,7 +338,7 @@ public class FactionsPlayerListener implements Listener {
             return PermissableAction.DOOR;
         if (material.name().toUpperCase().contains("BUTTON") || material.name().toUpperCase().contains("PRESSURE") || material.name().contains("DIODE") || material.name().contains("COMPARATOR"))
             return PermissableAction.BUTTON;
-        if (FactionsPlugin.instance.mc113 || FactionsPlugin.instance.mc114) {
+        if (FactionsPlugin.instance.mc113 || FactionsPlugin.instance.mc114 || FactionsPlugin.getInstance().mc115) {
             switch (material) {
                 case LEVER:
                     return PermissableAction.LEVER;
@@ -381,6 +381,8 @@ public class FactionsPlayerListener implements Listener {
                 case TRAPPED_CHEST:
                 case CHEST_MINECART:
 
+                case BARREL:
+
                 case SHULKER_BOX:
                 case BLACK_SHULKER_BOX:
                 case BLUE_SHULKER_BOX:
@@ -668,7 +670,7 @@ public class FactionsPlayerListener implements Listener {
                             if (!fPlayer.checkIfNearbyEnemies()) {
                                 FLocation myFloc = new FLocation(player.getLocation());
                                 if (Board.getInstance().getFactionAt(myFloc) != myFaction) {
-                                    if (!CmdFly.checkBypassPerms(fPlayer, player, Board.getInstance().getFactionAt(myFloc))) {
+                                    if (!CmdFly.checkFly(fPlayer, player, Board.getInstance().getFactionAt(myFloc))) {
                                         fPlayer.setFFlying(false, false);
                                         CmdFly.flyMap.remove(name);
                                     }
@@ -819,7 +821,7 @@ public class FactionsPlayerListener implements Listener {
         Material type;
         if (event.getItem() != null) {
             // Convert 1.8 Material Names -> 1.14
-            type = XMaterial.matchXMaterial(event.getItem().getType().toString()).parseMaterial();
+            type = XMaterial.matchXMaterial(event.getItem().getType().toString()).get().parseMaterial();
         } else {
             type = null;
         }
@@ -918,13 +920,22 @@ public class FactionsPlayerListener implements Listener {
         }
     }
 
+
+
     @EventHandler
     public void onLogoutMove(PlayerMoveEvent e) {
         LogoutHandler handler = LogoutHandler.getByName(e.getPlayer().getName());
+
+        if (Objects.requireNonNull(e.getTo()).getBlockX() == e.getFrom().getBlockX() &&
+                e.getTo().getBlockY() == e.getFrom().getBlockY() &&
+                e.getTo().getBlockZ() == e.getFrom().getBlockZ())
+            return;
+
         if (handler.isLogoutActive(e.getPlayer())) {
             handler.cancelLogout(e.getPlayer());
             e.getPlayer().sendMessage(String.valueOf(TL.COMMAND_LOGOUT_MOVED));
         }
+
         if (CmdWild.waitingTeleport.containsKey(e.getPlayer())) {
             CmdWild.waitingTeleport.remove(e.getPlayer());
             FPlayers.getInstance().getByPlayer(e.getPlayer()).msg(TL.COMMAND_WILD_INTERUPTED);
@@ -1060,13 +1071,13 @@ public class FactionsPlayerListener implements Listener {
         }
         FPlayer fp = FPlayers.getInstance().getByPlayer(e.getPlayer());
 
-        if(fp == null) return;
+        if (fp == null) return;
 
         if (fp.getChatMode() != ChatMode.FACTION) {
             return;
         }
         Faction f = fp.getFaction();
-        if(f == null) return;
+        if (f == null) return;
         if (f.isSystemFaction()) {
             return;
         }
@@ -1085,7 +1096,7 @@ public class FactionsPlayerListener implements Listener {
             }
         } else {
             for (Member m : t.getMembers()) {
-                if (m.getEffectiveName().contains(target) | m.getUser().getName().contains(target)){
+                if (m.getEffectiveName().contains(target) | m.getUser().getName().contains(target)) {
                     targets.add("@" + m.getUser().getName() + "#" + m.getUser().getDiscriminator());
                 }
             }

src/main/java/com/massivecraft/factions/missions/MissionGUI.java

@@ -96,7 +96,7 @@ public class MissionGUI implements FactionGUI {
         if (configurationSection == null) {
             return;
         }
-        ItemStack fillItem = XMaterial.matchXMaterial(configurationSection.getString("FillItem.Material")).parseItem();
+        ItemStack fillItem = XMaterial.matchXMaterial(configurationSection.getString("FillItem.Material")).get().parseItem();
         ItemMeta fillmeta = fillItem.getItemMeta();
         fillmeta.setDisplayName("");
         fillItem.setItemMeta(fillmeta);
@@ -109,7 +109,7 @@ public class MissionGUI implements FactionGUI {
                 ConfigurationSection section = configurationSection.getConfigurationSection(key);
                 int slot = section.getInt("Slot");
 
-                ItemStack itemStack = XMaterial.matchXMaterial(section.getString("Material")).parseItem();
+                ItemStack itemStack = XMaterial.matchXMaterial(section.getString("Material")).get().parseItem();
                 ItemMeta itemMeta = itemStack.getItemMeta();
                 itemMeta.setDisplayName(ChatColor.translateAlternateColorCodes('&', section.getString("Name")));
                 List<String> loreLines = new ArrayList<>();
@@ -134,7 +134,7 @@ public class MissionGUI implements FactionGUI {
         if (plugin.getConfig().getBoolean("Randomization.Enabled")) {
             ItemStack start;
             ItemMeta meta;
-            start = XMaterial.matchXMaterial(plugin.getConfig().getString("Randomization.Start-Item.Allowed.Material")).parseItem();
+            start = XMaterial.matchXMaterial(plugin.getConfig().getString("Randomization.Start-Item.Allowed.Material")).get().parseItem();
             meta = start.getItemMeta();
             meta.setDisplayName(plugin.color(plugin.getConfig().getString("Randomization.Start-Item.Allowed.Name")));
             List<String> loree = new ArrayList<>();
@@ -144,7 +144,7 @@ public class MissionGUI implements FactionGUI {
             meta.setLore(loree);
             start.setItemMeta(meta);
             if (fPlayer.getFaction().getCompletedMissions().size() >= configurationSection.getKeys(false).size() - 1 && plugin.getConfig().getBoolean("DenyMissionsMoreThenOnce")) {
-                start = XMaterial.matchXMaterial(plugin.getConfig().getString("Randomization.Start-Item.Disallowed.Material")).parseItem();
+                start = XMaterial.matchXMaterial(plugin.getConfig().getString("Randomization.Start-Item.Disallowed.Material")).get().parseItem();
                 meta = start.getItemMeta();
                 meta.setDisplayName(plugin.color(plugin.getConfig().getString("Randomization.Start-Item.Disallowed.Name")));
                 List<String> lore = new ArrayList<>();
@@ -155,7 +155,7 @@ public class MissionGUI implements FactionGUI {
                 start.setItemMeta(meta);
             }
             if (fPlayer.getFaction().getMissions().size() >= plugin.getConfig().getInt("MaximumMissionsAllowedAtOnce")) {
-                start = XMaterial.matchXMaterial(plugin.getConfig().getString("Randomization.Start-Item.Disallowed.Material")).parseItem();
+                start = XMaterial.matchXMaterial(plugin.getConfig().getString("Randomization.Start-Item.Disallowed.Material")).get().parseItem();
                 meta = start.getItemMeta();
                 meta.setDisplayName(plugin.color(plugin.getConfig().getString("Randomization.Start-Item.Disallowed.Name")));
                 List<String> lore = new ArrayList<>();

src/main/java/com/massivecraft/factions/shop/ShopGUIFrame.java

@@ -47,7 +47,7 @@ public class ShopGUIFrame {
         for (int a = 1; a <= items; a++) {
             String s = a + "";
             int slot = ShopConfig.getShop().getInt("items." + s + ".slot");
-            Material material = XMaterial.matchXMaterial(ShopConfig.getShop().getString("items." + s + ".block")).parseMaterial();
+            Material material = XMaterial.matchXMaterial(ShopConfig.getShop().getString("items." + s + ".block")).get().parseMaterial();
             int cost = ShopConfig.getShop().getInt("items." + s + ".cost");
             String name = ShopConfig.getShop().getString("items." + s + ".name");
             boolean glowing = ShopConfig.getShop().getBoolean("items." + s + ".glowing");
@@ -93,7 +93,7 @@ public class ShopGUIFrame {
 
     private ItemStack buildDummyItem(Faction f) {
         ConfigurationSection config = FactionsPlugin.getInstance().getConfig().getConfigurationSection("F-Shop.GUI.dummy-item");
-        ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).parseItem();
+        ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).get().parseItem();
         ItemMeta meta = item.getItemMeta();
         if (meta != null) {
             meta.setLore(FactionsPlugin.getInstance().colorList(config.getStringList("Lore")));

src/main/java/com/massivecraft/factions/struct/Permission.java

@@ -44,8 +44,8 @@ public enum Permission {
     DISBAND_ANY("disband.any"),
     DISCORD("discord"),
     DRAIN("drain"),
-    FLY("fly"),
-    FLY_WILD("fly.wilderness"),
+    FLY_FLY("fly"),
+    FLY_WILDERNESS("fly.wilderness"),
     FLY_SAFEZONE("fly.safezone"),
     FLY_WARZONE("fly.warzone"),
     FLY_ENEMY("fly.enemy"),

src/main/java/com/massivecraft/factions/struct/Relation.java

@@ -210,7 +210,7 @@ public enum Relation implements Permissable {
         String displayName = replacePlaceholders(RELATION_CONFIG.getString("placeholder-item.name", ""));
         List<String> lore = new ArrayList<>();
 
-        Material material = XMaterial.matchXMaterial(RELATION_CONFIG.getString("materials." + name().toLowerCase())).parseMaterial();
+        Material material = XMaterial.matchXMaterial(RELATION_CONFIG.getString("materials." + name().toLowerCase())).get().parseMaterial();
         if (material == null) {
             return null;
         }

src/main/java/com/massivecraft/factions/struct/Role.java

@@ -128,7 +128,7 @@ public enum Role implements Permissable {
         String displayName = replacePlaceholders(RELATION_CONFIG.getString("placeholder-item.name", ""));
         List<String> lore = new ArrayList<>();
 
-        Material material = XMaterial.matchXMaterial(RELATION_CONFIG.getString("materials." + name().toLowerCase(), "STAINED_CLAY")).parseMaterial();
+        Material material = XMaterial.matchXMaterial(RELATION_CONFIG.getString("materials." + name().toLowerCase(), "STAINED_CLAY")).get().parseMaterial();
         if (material == null) {
             return null;
         }

src/main/java/com/massivecraft/factions/tag/FactionTag.java

@@ -49,6 +49,8 @@ public enum FactionTag implements Tag {
         }
         return null;
     }),
+
+    ANNOUNCEMENT("{announcement}", (fac) -> { return String.valueOf(fac.getAnnouncements()); }),
     PEACEFUL("{peaceful}", (fac) -> fac.isPeaceful() ? Conf.colorNeutral + TL.COMMAND_SHOW_PEACEFUL.toString() : ""),
     PERMANENT("permanent", (fac) -> fac.isPermanent() ? "permanent" : "{notPermanent}"), // no braces needed
     LAND_VALUE("{land-value}", (fac) -> Econ.shouldBeUsed() ? Econ.moneyString(Econ.calculateTotalLandValue(fac.getLandRounded())) : Tag.isMinimalShow() ? null : TL.ECON_OFF.format("value")),
@@ -61,6 +63,19 @@ public enum FactionTag implements Tag {
         }
         return Tag.isMinimalShow() ? null : TL.ECON_OFF.format("balance");
     }),
+    TNT_BALANCE("{tnt-balance}", (fac) -> {
+        if (FactionsPlugin.instance.getConfig().getBoolean("ftnt.Enabled")) {
+            return String.valueOf(fac.getTnt());
+        }
+        return Tag.isMinimalShow() ? null : "";
+    }),
+    TNT_MAX("{tnt-max-balance}", (fac) -> {
+        if (FactionsPlugin.instance.getConfig().getBoolean("ftnt.Enabled")) {
+            return String.valueOf(fac.getTntBankLimit());
+        }
+        return Tag.isMinimalShow() ? null : "";
+    }),
+
     ALLIES_COUNT("{allies}", (fac) -> String.valueOf(fac.getRelationCount(Relation.ALLY))),
     ENEMIES_COUNT("{enemies}", (fac) -> String.valueOf(fac.getRelationCount(Relation.ENEMY))),
     TRUCES_COUNT("{truces}", (fac) -> String.valueOf(fac.getRelationCount(Relation.TRUCE))),
@@ -80,6 +95,8 @@ public enum FactionTag implements Tag {
             return String.valueOf(fac.getFPlayersWhereOnline(false).size());
         }
     }),
+    FACTION_STRIKES("{faction-strikes}",(fac) -> String.valueOf(fac.getStrikes())),
+    FACTION_POINTS("{faction-points}", (fac) -> String.valueOf(fac.getPoints())),
     FACTION_SIZE("{members}", (fac) -> String.valueOf(fac.getFPlayers().size())),
     FACTION_KILLS("{faction-kills}", (fac) -> String.valueOf(fac.getKills())),
     FACTION_DEATHS("{faction-deaths}", (fac) -> String.valueOf(fac.getDeaths())),

src/main/java/com/massivecraft/factions/tag/FancyTag.java

@@ -100,7 +100,7 @@ public enum FancyTag implements Tag {
                 return tag.getMessage(text, faction, player, groupMap);
             }
         }
-        return Collections.EMPTY_LIST; // We really shouldn't be here.
+        return Collections.emptyList(); // We really shouldn't be here.
     }
 
     public static boolean anyMatch(String text) {
@@ -174,7 +174,7 @@ public enum FancyTag implements Tag {
         return test != null && test.contains(this.tag);
     }
 
-    public List<FancyMessage> getMessage(String text, Faction faction, FPlayer player, Map<UUID, String> groupMap) {
+    public List getMessage(String text, Faction faction, FPlayer player, Map<UUID, String> groupMap) {
         if (!this.foundInString(text)) {
             return Collections.EMPTY_LIST; // We really, really shouldn't be here.
         }

src/main/java/com/massivecraft/factions/tag/GeneralTag.java

@@ -18,8 +18,8 @@ public enum GeneralTag implements Tag {
     MAX_ALLIES("{max-allies}", () -> getRelation("ally")),
     MAX_ENEMIES("{max-enemies}", () -> getRelation("enemy")),
     MAX_TRUCES("{max-truces}", () -> getRelation("truce")),
-    FACTIONLESS("factionless", () -> String.valueOf(FPlayers.getInstance().getOnlinePlayers().stream().filter(p -> !p.hasFaction()).count())),
-    FACTIONLESS_TOTAL("factionless-total", () -> String.valueOf(FPlayers.getInstance().getAllFPlayers().stream().filter(p -> !p.hasFaction()).count())),
+    FACTIONLESS("{factionless}", () -> String.valueOf(FPlayers.getInstance().getOnlinePlayers().stream().filter(p -> !p.hasFaction()).count())),
+    FACTIONLESS_TOTAL("{factionless-total}", () -> String.valueOf(FPlayers.getInstance().getAllFPlayers().stream().filter(p -> !p.hasFaction()).count())),
     TOTAL_ONLINE("{total-online}", () -> String.valueOf(Bukkit.getOnlinePlayers().size())),
     ;
 

src/main/java/com/massivecraft/factions/util/ClipPlaceholderAPIManager.java

@@ -3,6 +3,7 @@ package com.massivecraft.factions.util;
 import com.massivecraft.factions.*;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.struct.Relation;
+import com.massivecraft.factions.tag.FactionTag;
 import com.massivecraft.factions.tag.Tag;
 import com.massivecraft.factions.zcore.util.TL;
 import me.clip.placeholderapi.expansion.PlaceholderExpansion;
@@ -133,8 +134,14 @@ public class ClipPlaceholderAPIManager extends PlaceholderExpansion implements R
                 return faction.isPeaceful() ? Conf.colorNeutral + TL.COMMAND_SHOW_PEACEFUL.toString() : "";
             case "faction_tntbank_balance":
                 return String.valueOf(faction.getTnt());
+            case "faction_tnt_max_balance":
+                return FactionTag.TNT_MAX.replace(FactionTag.TNT_MAX.getTag(), faction);
             case "faction_points":
                 return fPlayer.hasFaction() ? String.valueOf(faction.getPoints()) : "0";
+            case "discord_acount":
+                return fPlayer.discordSetup() ? String.valueOf(fPlayer.discordUserID()) : "Not Linked";
+            case "faction_discord":
+                return fPlayer.hasFaction() ? String.valueOf(faction.getDiscord()) : "Not Linked";
             case "faction_powerboost":
                 double powerBoost = faction.getPowerBoost();
                 return (powerBoost == 0.0) ? "" : (powerBoost > 0.0 ? TL.COMMAND_SHOW_BONUS.toString() : TL.COMMAND_SHOW_PENALTY.toString()) + powerBoost + ")";
@@ -172,6 +179,8 @@ public class ClipPlaceholderAPIManager extends PlaceholderExpansion implements R
                 return String.valueOf(faction.getFPlayers().size() - faction.getOnlinePlayers().size());
             case "faction_size":
                 return String.valueOf(faction.getFPlayers().size());
+            case "faction_announcement":
+                return String.valueOf(faction.getAnnouncements());
             case "faction_kills":
                 return String.valueOf(faction.getKills());
             case "faction_deaths":

src/main/java/com/massivecraft/factions/util/FactionWarpsFrame.java

@@ -72,7 +72,7 @@ public class FactionWarpsFrame {
 
     private ItemStack buildWarpAsset(final Map.Entry<String, LazyLocation> warp, final Faction faction) {
         final ConfigurationSection config = this.section.getConfigurationSection("warp-item");
-        final ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).parseItem();
+        final ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).get().parseItem();
         final ItemMeta meta = item.getItemMeta();
         meta.setLore(FactionsPlugin.getInstance().colorList(FactionsPlugin.getInstance().replacePlaceholders(config.getStringList("Lore"), new Placeholder("{warp-protected}", faction.hasWarpPassword(warp.getKey()) ? "Enabled" : "Disabled"), new Placeholder("{warp-cost}", FactionsPlugin.getInstance().getConfig().getBoolean("warp-cost.enabled", false) ? Integer.toString(FactionsPlugin.getInstance().getConfig().getInt("warp-cost.warp", 5)) : "Disabled"))));
         meta.setDisplayName(FactionsPlugin.getInstance().color(config.getString("Name").replace("{warp}", warp.getKey())));
@@ -82,7 +82,7 @@ public class FactionWarpsFrame {
 
     private ItemStack buildDummyItem() {
         final ConfigurationSection config = this.section.getConfigurationSection("dummy-item");
-        final ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).parseItem();
+        final ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).get().parseItem();
         final ItemMeta meta = item.getItemMeta();
         meta.setLore(FactionsPlugin.getInstance().colorList(config.getStringList("Lore")));
         meta.setDisplayName(FactionsPlugin.getInstance().color(config.getString("Name")));

src/main/java/com/massivecraft/factions/util/ItemBuilder.java

@@ -21,14 +21,9 @@ public class ItemBuilder {
         this.meta = item.getItemMeta();
     }
 
-    public ItemBuilder(Material material, int amount, int durability) {
-        this(new ItemStack(material, amount, (short) durability));
-    }
-
     public ItemBuilder(Material material, int amount) {
-        this(material, amount, 0);
+        this(new ItemStack(material, amount));
     }
-
     public ItemBuilder(Material material) {
         this(material, 1);
     }

src/main/java/com/massivecraft/factions/util/Pair.java

@@ -0,0 +1,27 @@
+package com.massivecraft.factions.util;
+
+/**
+ * Factions - Developed by FactionsUUID Team.
+ */
+public class Pair<Left, Right> {
+
+    public static <Left, Right> Pair<Left, Right> of(Left left, Right right) {
+        return new Pair<>(left, right);
+    }
+
+    private final Left left;
+    private final Right right;
+
+    private Pair(Left left, Right right) {
+        this.left = left;
+        this.right = right;
+    }
+
+    public Left getLeft() {
+        return this.left;
+    }
+
+    public Right getRight() {
+        return this.right;
+    }
+}

src/main/java/com/massivecraft/factions/util/TimeUtil.java

@@ -0,0 +1,108 @@
+package com.massivecraft.factions.util;
+
+import java.util.Calendar;
+import java.util.GregorianCalendar;
+import java.util.concurrent.TimeUnit;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+/**
+ * Factions - Developed by Driftay.
+ * All rights reserved 2020.
+ * Creation Date: 1/30/2020
+ */
+public class TimeUtil {
+
+    public static long parseDateDiff(String time, boolean future) throws Exception {
+        Pattern timePattern = Pattern.compile("(?:([0-9]+)\\s*y[a-z]*[,\\s]*)?(?:([0-9]+)\\s*mo[a-z]*[,\\s]*)?(?:([0-9]+)\\s*w[a-z]*[,\\s]*)?(?:([0-9]+)\\s*d[a-z]*[,\\s]*)?(?:([0-9]+)\\s*h[a-z]*[,\\s]*)?(?:([0-9]+)\\s*m[a-z]*[,\\s]*)?(?:([0-9]+)\\s*(?:s[a-z]*)?)?", 2);
+        Matcher m = timePattern.matcher(time);
+        int years = 0;
+        int months = 0;
+        int weeks = 0;
+        int days = 0;
+        int hours = 0;
+        int minutes = 0;
+        int seconds = 0;
+        boolean found = false;
+        while (m.find()) {
+            if (m.group() != null) {
+                if (m.group().isEmpty()) continue;
+                for (int i = 0; i < m.groupCount(); ++i) {
+                    if (m.group(i) != null && !m.group(i).isEmpty()) {
+                        found = true;
+                        break;
+                    }
+                }
+                if (!found) continue;
+
+                if (m.group(1) != null && !m.group(1).isEmpty()) years = Integer.parseInt(m.group(1));
+
+                if (m.group(2) != null && !m.group(2).isEmpty()) months = Integer.parseInt(m.group(2));
+
+                if (m.group(3) != null && !m.group(3).isEmpty()) weeks = Integer.parseInt(m.group(3));
+
+                if (m.group(4) != null && !m.group(4).isEmpty()) days = Integer.parseInt(m.group(4));
+
+                if (m.group(5) != null && !m.group(5).isEmpty()) hours = Integer.parseInt(m.group(5));
+
+                if (m.group(6) != null && !m.group(6).isEmpty()) minutes = Integer.parseInt(m.group(6));
+
+                if (m.group(7) != null && !m.group(7).isEmpty()) {
+                    seconds = Integer.parseInt(m.group(7));
+                    break;
+                }
+                break;
+            }
+        }
+        if (!found) throw new Exception("Illegal Date");
+
+        if (years > 20) throw new Exception("Illegal Date");
+
+        Calendar c = new GregorianCalendar();
+        if (years > 0) c.add(Calendar.YEAR, years * (future ? 1 : -1));
+
+        if (months > 0) c.add(Calendar.MONTH, months * (future ? 1 : -1));
+
+        if (weeks > 0) c.add(Calendar.WEEK_OF_YEAR, weeks * (future ? 1 : -1));
+
+        if (days > 0) c.add(Calendar.DATE, days * (future ? 1 : -1));
+
+        if (hours > 0) c.add(Calendar.HOUR_OF_DAY, hours * (future ? 1 : -1));
+
+        if (minutes > 0) c.add(Calendar.MINUTE, minutes * (future ? 1 : -1));
+
+        if (seconds > 0) c.add(Calendar.SECOND, seconds * (future ? 1 : -1));
+
+        System.out.println("current: " + c.getTimeInMillis() + " Time: " + System.currentTimeMillis() + " Form: " + formatTime(c.getTimeInMillis() / 1000L));
+        return c.getTimeInMillis() / 1000L;
+    }
+
+    public static String formatDifference(long time) {
+        if (time == 0L) return "Never";
+
+        long day = TimeUnit.SECONDS.toDays(time);
+        long hours = TimeUnit.SECONDS.toHours(time) - day * 24L;
+        long minutes = TimeUnit.SECONDS.toMinutes(time) - TimeUnit.SECONDS.toHours(time) * 60L;
+        long seconds = TimeUnit.SECONDS.toSeconds(time) - TimeUnit.SECONDS.toMinutes(time) * 60L;
+        StringBuilder sb = new StringBuilder();
+        if (day > 0L) sb.append(day).append((day == 1L) ? "day" : "days").append(" ");
+
+        if (hours > 0L) sb.append(hours).append((hours == 1L) ? "h" : "h").append(" ");
+
+        if (minutes > 0L) sb.append(minutes).append((minutes == 1L) ? "m" : "m").append(" ");
+
+        if (seconds > 0L) sb.append(seconds).append((seconds == 1L) ? "s" : "s");
+
+        String diff = sb.toString().trim();
+        return diff.isEmpty() ? "Now" : diff;
+    }
+
+    public static String formatTime(long time) {
+        if (time == System.currentTimeMillis()) return "Now";
+
+        if (time == -1L) return "Never";
+
+        return formatDifference(time - System.currentTimeMillis() / 1000L);
+    }
+}
+

src/main/java/com/massivecraft/factions/util/UtilFly.java

@@ -10,7 +10,10 @@ import org.bukkit.Bukkit;
 
 
 public class UtilFly {
-
+    /**
+     * UtilFly is being removed very soon as all of its functionality has been updated and moved to CmdFly
+     */
+    @Deprecated
     public static void run() {
         if (!FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight"))
             return;
@@ -22,7 +25,7 @@ public class UtilFly {
             }
         }, 0, FactionsPlugin.getInstance().getConfig().getInt("fly-task-interval", 10));
     }
-
+    @Deprecated
     public static void setFly(FPlayer fp, boolean fly, boolean silent, boolean damage) {
         if (!FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight"))
             return;
@@ -42,7 +45,7 @@ public class UtilFly {
 
         setFallDamage(fp, fly, damage);
     }
-
+    @Deprecated
     public static void checkFly(FPlayer me, Faction factionTo) {
         if (!FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight"))
             return;

src/main/java/com/massivecraft/factions/util/serializable/SaberGUI.java

@@ -1,151 +0,0 @@
-package com.massivecraft.factions.util.serializable;
-
-/**
- * @author Driftay
- */
-import com.massivecraft.factions.FactionsPlugin;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.bukkit.event.inventory.InventoryType;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Consumer;
-
-
-public abstract class SaberGUI {
-    public static Set<String> allGUINames = new HashSet<>();
-    public static Map<UUID, SaberGUI> activeGUIs = new ConcurrentHashMap<>();
-    public SaberGUI parentGUI;
-    protected String title;
-    protected int size;
-    protected Player player;
-    protected Inventory inventory;
-    private Map<Integer, InventoryItem> inventoryItems;
-    private String owningPluginName;
-    private Runnable closeRunnable;
-
-    public SaberGUI(Player player, String title, int size) {
-        this(player, title, size, InventoryType.CHEST);
-    }
-
-    public SaberGUI(Player player, String title, int size, InventoryType type) {
-        this.inventoryItems = new HashMap<>();
-        this.inventory = type == InventoryType.CHEST ? Bukkit.createInventory(null, size, title) : Bukkit.createInventory(null, type, title);
-        this.player = player;
-        this.size = size;
-        this.title = title;
-        allGUINames.add(this.title);
-    }
-
-    public SaberGUI setParentGUI(SaberGUI parent) {
-        this.parentGUI = parent;
-        return this;
-    }
-
-    public void onUnknownItemClick(InventoryClickEvent event) {
-    }
-
-    public abstract void redraw();
-
-    public void openGUI(JavaPlugin owning) {
-        this.owningPluginName = owning.getName();
-        SaberGUI currentlyActive = activeGUIs.get(this.player.getUniqueId());
-        if (currentlyActive != null) {
-            Bukkit.getLogger().info("Closing already open menu first!");
-            Bukkit.getScheduler().scheduleSyncDelayedTask(owning, () -> {
-                currentlyActive.close();
-                activeGUIs.put(this.player.getUniqueId(), this);
-                this.redraw();
-                this.player.openInventory(this.inventory);
-            });
-        } else {
-            activeGUIs.put(this.player.getUniqueId(), this);
-            this.redraw();
-            this.player.openInventory(this.inventory);
-        }
-    }
-
-    public void setItem(int slot, InventoryItem inventoryItem) {
-        if (inventoryItem != null && inventoryItem.getItem() != null) {
-            this.inventoryItems.put(slot, inventoryItem);
-            this.inventory.setItem(slot, inventoryItem.getItem());
-        } else {
-            this.removeItem(slot);
-        }
-    }
-
-    public void closeWithDelay() {
-        this.closeWithDelay(null);
-    }
-
-    public void closeWithDelay(Consumer<Player> afterClose) {
-        Bukkit.getScheduler().scheduleSyncDelayedTask(FactionsPlugin.instance, () -> {
-            this.player.closeInventory();
-            if (afterClose != null) {
-                afterClose.accept(this.player);
-            }
-
-        }, 1L);
-    }
-
-    public void setItem(int slot, ItemStack item, Runnable runnable) {
-        this.setItem(slot, (new InventoryItem(item)).click(runnable));
-    }
-
-    public void onInventoryClose() {
-        if (this.closeRunnable != null) {
-            this.closeRunnable.run();
-        }
-    }
-
-    public void close() {
-        this.onInventoryClose();
-        this.player.closeInventory();
-    }
-
-    public void removeItem(int slot) {
-        this.inventory.setItem(slot, null);
-        this.inventoryItems.remove(slot);
-    }
-
-    public SaberGUI setOnClose(Runnable runnable) {
-        this.closeRunnable = runnable;
-        return this;
-    }
-
-    public boolean isInventory(Inventory inventory) {
-        return this.inventory.equals(inventory);
-    }
-
-    public static SaberGUI getActiveGUI(UUID uuid) { return activeGUIs.get(uuid); }
-
-    public static void removeGUI(UUID uuid) {
-        activeGUIs.remove(uuid);
-    }
-
-    public SaberGUI getParentGUI() {
-        return this.parentGUI;
-    }
-
-    public Map<Integer, InventoryItem> getInventoryItems() {
-        return this.inventoryItems;
-    }
-
-    public String getOwningPluginName() {
-        return this.owningPluginName;
-    }
-
-    public void setOwningPluginName(String owningPluginName) {
-        this.owningPluginName = owningPluginName;
-    }
-
-    public Runnable getCloseRunnable() {
-        return this.closeRunnable;
-    }
-}
-

src/main/java/com/massivecraft/factions/zcore/fdisband/FDisbandFrame.java

@@ -0,0 +1,89 @@
+package com.massivecraft.factions.zcore.fdisband;
+
+import com.github.stefvanschie.inventoryframework.Gui;
+import com.github.stefvanschie.inventoryframework.GuiItem;
+import com.github.stefvanschie.inventoryframework.pane.PaginatedPane;
+import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.Faction;
+import com.massivecraft.factions.FactionsPlugin;
+import com.massivecraft.factions.util.XMaterial;
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
+import org.bukkit.metadata.FixedMetadataValue;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Factions - Developed by Driftay.
+ * All rights reserved 2020.
+ * Creation Date: 1/18/2020
+ */
+public class FDisbandFrame {
+
+    private Gui gui;
+
+    public FDisbandFrame(Faction faction) {
+        this.gui = new Gui(FactionsPlugin.getInstance(), 1, "Confirm Disband");
+    }
+
+    public void buildGUI(FPlayer fPlayer) {
+        int i;
+        PaginatedPane pane = new PaginatedPane(0, 0, 9, this.gui.getRows());
+        List<GuiItem> GUIItems = new ArrayList<>();
+        ItemStack confirm = buildConfirmDummyItem(fPlayer.getFaction());
+        ItemStack deny = buildDenyDummyItem();
+        for (i = 0; i < 5; ++i) {
+            GUIItems.add(new GuiItem(confirm, (e) -> {
+                e.setCancelled(true);
+                fPlayer.getPlayer().setMetadata("disband_confirm", new FixedMetadataValue(FactionsPlugin.getInstance(), System.currentTimeMillis()));
+                fPlayer.getPlayer().closeInventory();
+                fPlayer.getPlayer().performCommand("f disband");
+            }));
+        }
+
+        GUIItems.set(4, new GuiItem(XMaterial.BLACK_WOOL.parseItem(), (e) -> e.setCancelled(true)));
+
+        for (i = 5; i < 10; ++i) {
+            GUIItems.add(new GuiItem(deny, (e) -> {
+                e.setCancelled(true);
+                fPlayer.getPlayer().closeInventory();
+            }));
+        }
+        pane.populateWithGuiItems(GUIItems);
+        gui.addPane(pane);
+        gui.update();
+        gui.show(fPlayer.getPlayer());
+    }
+
+
+    private ItemStack buildConfirmDummyItem(Faction faction) {
+        ConfigurationSection config = FactionsPlugin.getInstance().getConfig().getConfigurationSection("f-disband-gui.confirm-item");
+        ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).get().parseItem();
+        ItemMeta meta = item.getItemMeta();
+        if (meta != null) {
+            List<String> lore = new ArrayList<>();
+            for (String s : config.getStringList("Lore")) {
+                lore.add(FactionsPlugin.getInstance().color(s).replace("{faction}", faction.getTag()));
+            }
+            meta.setLore(lore);
+            meta.setDisplayName(FactionsPlugin.getInstance().color(Objects.requireNonNull(config.getString("Name"))));
+            item.setItemMeta(meta);
+        }
+        return item;
+    }
+
+    private ItemStack buildDenyDummyItem() {
+        ConfigurationSection config = FactionsPlugin.getInstance().getConfig().getConfigurationSection("f-disband-gui.deny-item");
+        ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).get().parseItem();
+        ItemMeta meta = item.getItemMeta();
+        if (meta != null) {
+            meta.setLore(FactionsPlugin.getInstance().colorList(config.getStringList("Lore")));
+            meta.setDisplayName(FactionsPlugin.getInstance().color(config.getString("Name")));
+            item.setItemMeta(meta);
+        }
+        return item;
+    }
+}

src/main/java/com/massivecraft/factions/zcore/fperms/PermissableAction.java

@@ -104,7 +104,7 @@ public enum PermissableAction {
 
     public ItemStack buildAsset(FPlayer fme, Permissable perm) {
         ConfigurationSection section = FactionsPlugin.getInstance().getConfig().getConfigurationSection("fperm-gui.action");
-        ItemStack item = XMaterial.matchXMaterial(section.getString("Materials." + this.name)).parseItem();
+        ItemStack item = XMaterial.matchXMaterial(section.getString("Materials." + this.name)).get().parseItem();
         ItemMeta meta = item.getItemMeta();
 
         meta.setDisplayName(FactionsPlugin.getInstance().color(section.getString("placeholder-item.name").replace("{action}", this.name)));

src/main/java/com/massivecraft/factions/zcore/fperms/gui/PermissableActionFrame.java

@@ -91,7 +91,7 @@ public class PermissableActionFrame {
 
     private ItemStack buildDummyItem() {
         ConfigurationSection config = FactionsPlugin.getInstance().getConfig().getConfigurationSection("fperm-gui.dummy-item");
-        ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).parseItem();
+        ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).get().parseItem();
         ItemMeta meta = item.getItemMeta();
         meta.setLore(FactionsPlugin.getInstance().colorList(config.getStringList("Lore")));
         meta.setDisplayName(FactionsPlugin.getInstance().color(config.getString("Name")));
@@ -101,7 +101,7 @@ public class PermissableActionFrame {
 
     private ItemStack buildBackItem() {
         ConfigurationSection config = FactionsPlugin.getInstance().getConfig().getConfigurationSection("fperm-gui.back-item");
-        ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).parseItem();
+        ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).get().parseItem();
         ItemMeta meta = item.getItemMeta();
         meta.setLore(FactionsPlugin.getInstance().colorList(config.getStringList("Lore")));
         meta.setDisplayName(FactionsPlugin.getInstance().color(config.getString("Name")));

src/main/java/com/massivecraft/factions/zcore/fperms/gui/PermissableRelationFrame.java

@@ -56,7 +56,7 @@ public class PermissableRelationFrame {
     }
 
     private ItemStack buildAsset(String loc, String relation) {
-        ItemStack item = XMaterial.matchXMaterial(FactionsPlugin.getInstance().getConfig().getString(loc)).parseItem();
+        ItemStack item = XMaterial.matchXMaterial(FactionsPlugin.getInstance().getConfig().getString(loc)).get().parseItem();
         ItemMeta meta = item.getItemMeta();
         meta.setDisplayName(FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fperm-gui.relation.Placeholder-Item.Name").replace("{relation}", relation)));
         item.setItemMeta(meta);
@@ -65,7 +65,7 @@ public class PermissableRelationFrame {
 
     private ItemStack buildDummyItem() {
         ConfigurationSection config = FactionsPlugin.getInstance().getConfig().getConfigurationSection("fperm-gui.dummy-item");
-        ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).parseItem();
+        ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).get().parseItem();
         ItemMeta meta = item.getItemMeta();
         meta.setLore(FactionsPlugin.getInstance().colorList(config.getStringList("Lore")));
         meta.setDisplayName(FactionsPlugin.getInstance().color(config.getString("Name")));

src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradeFrame.java

@@ -25,7 +25,7 @@ public class FUpgradeFrame {
 
     public FUpgradeFrame(Faction f) {
         this.gui = new Gui(FactionsPlugin.getInstance(),
-                FactionsPlugin.getInstance().getConfig().getInt("fupgrades.MainMenu.rows", 5),
+                FactionsPlugin.getInstance().getConfig().getInt("fupgrades.MainMenu.Rows", 5),
                 FactionsPlugin.getInstance().getConfig().getString("fupgrades.MainMenu.Title").replace("{faction}", f.getTag()));
     }
 
@@ -95,13 +95,13 @@ public class FUpgradeFrame {
     private void updateFactionPowerBoost(Faction f) {
         double boost = FactionsPlugin.getInstance().getConfig().getDouble("fupgrades.MainMenu.Power.Power-Boost.level-" + (f.getUpgrade(UpgradeType.POWER) + 1));
         if (boost < 0.0) return;
-        f.setPowerBoost(f.getPower() + boost);
+        f.setPowerBoost(boost);
     }
 
 
     private ItemStack buildDummyItem() {
         ConfigurationSection config = FactionsPlugin.getInstance().getConfig().getConfigurationSection("fupgrades.MainMenu.DummyItem");
-        ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).parseItem();
+        ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).get().parseItem();
         ItemMeta meta = item.getItemMeta();
         if (meta != null) {
             meta.setLore(FactionsPlugin.getInstance().colorList(config.getStringList("Lore")));

src/main/java/com/massivecraft/factions/zcore/fupgrades/UpgradeType.java

@@ -58,7 +58,7 @@ public enum UpgradeType {
 
     public ItemStack buildAsset(Faction f) {
         ConfigurationSection config = FactionsPlugin.getInstance().getConfig().getConfigurationSection("fupgrades.MainMenu." + this.id + ".DisplayItem");
-        ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).parseItem();
+        ItemStack item = XMaterial.matchXMaterial(config.getString("Type")).get().parseItem();
         int level = f.getUpgrade(this);
         ItemMeta meta = item.getItemMeta();
         if (meta != null) {

src/main/java/com/massivecraft/factions/zcore/persist/MemoryFPlayer.java

@@ -47,6 +47,7 @@ import java.util.*;
  */
 
 public abstract class MemoryFPlayer implements FPlayer {
+    public boolean enemiesNearby = false;
     public boolean inChest = false;
     public boolean discordSetup = false;
     public String discordUserID = "";
@@ -221,6 +222,10 @@ public abstract class MemoryFPlayer implements FPlayer {
         return this.notificationsEnabled;
     }
 
+    public boolean hasEnemiesNearby() {return this.enemiesNearby;}
+
+    public void setEnemiesNearby(Boolean b) {this.enemiesNearby = b;}
+
     public boolean discordSetup() {return this.discordSetup;}
 
     public String discordUserID() {return this.discordUserID;}
@@ -972,7 +977,7 @@ public abstract class MemoryFPlayer implements FPlayer {
     public boolean canFlyAtLocation(FLocation location) {
         Faction faction = Board.getInstance().getFactionAt(location);
         if ((faction == getFaction() && getRole() == Role.LEADER) || isAdminBypassing) return true;
-        if (faction.isSystemFaction()) return CmdFly.checkBypassPerms(this, getPlayer(), faction);
+        if (faction.isSystemFaction()) return CmdFly.checkFly(this, getPlayer(), faction);
         Access access = faction.getAccess(this, PermissableAction.FLY);
         return access == null || access == Access.UNDEFINED || access == Access.ALLOW;
     }
@@ -1108,16 +1113,18 @@ public abstract class MemoryFPlayer implements FPlayer {
                     setFlying(false);
                     msg(TL.COMMAND_FLY_ENEMY_NEAR);
                     Bukkit.getServer().getPluginManager().callEvent(new FPlayerStoppedFlying(this));
+                    this.enemiesNearby = true;
                     return true;
                 }
             }
         }
+        this.enemiesNearby = false;
         return false;
     }
 
     @Override
     public Boolean canflyinWilderness() {
-        return getPlayer().hasPermission(Permission.FLY_WILD.node);
+        return getPlayer().hasPermission(Permission.FLY_WILDERNESS.node);
     }
 
     @Override

src/main/java/com/massivecraft/factions/zcore/persist/MemoryFaction.java

@@ -883,7 +883,7 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
      */
     public Access getAccess(FPlayer player, PermissableAction permissableAction) {
         if (player == null || permissableAction == null) return Access.UNDEFINED;
-
+        if (player.getFaction() == this && player.getRole() == Role.LEADER) return Access.ALLOW;
 
         Permissable perm = player.getFaction() == this ? player.getRole() : player.getFaction().getRelationTo(this);
 

src/main/resources/config.yml

@@ -276,19 +276,19 @@ hcf:
 show:
   # First line can be {header} for default header, or any string (we recommend &m for smooth lines ;plugin)
   - '&8&m--------------&7 &8<&e{faction}&8> &8&m--------------'
-  - '&4&l* &cOwner: &f{leader}'
-  - '&4&l* &cDescription: &f{description}'
-  - '&4&l* &cLand / Power / Max Power: &f{chunks} &8/ &f{power} &8/ &f{maxPower}'
-  - '&4&l* &cFaction Strikes: &f{strikes}'
-  - '&4&l* &cFaction Points: &f{faction-points}'
-  - '&4&l* &cFounded: &f{create-date}'
-  - '&4&l* &cBalance: &f{faction-balance}'
-  - '&4&l* &cAllies: &a{allies-list}'
-  - '&4&l* &cEnemies: &4{enemies-list}'
-  - '&4&l* &cOnline Members: &8[&f{online}/{members}&8] &a{online-list}'
-  - '&4&l* &cOffline Members: &8[&f{offline}/{members}&8] &a{offline-list}'
-  - '&4&l* &cAlts: &f{alts}'
-  - '&4&l* &cBans: &f{faction-bancount}'
+  - '&4* &cOwner: &f{leader}'
+  - '&4* &cDescription: &f{description}'
+  - '&4* &cLand / Power / Max Power: &f{chunks} &8/ &f{power} &8/ &f{maxPower}'
+  - '&4* &cFaction Strikes: &f{strikes}'
+  - '&4* &cFaction Points: &f{faction-points}'
+  - '&4* &cFounded: &f{create-date}'
+  - '&4* &cBalance: &f{faction-balance}'
+  - '&4* &cAllies: &a{allies-list}'
+  - '&4* &cEnemies: &4{enemies-list}'
+  - '&4* &cOnline Members: &8[&f{online}/{members}&8] &a{online-list}'
+  - '&4* &cOffline Members: &8[&f{offline}/{members}&8] &a{offline-list}'
+  - '&4* &cAlts: &f{alts}'
+  - '&4* &cBans: &f{faction-bancount}'
   - '&8&m----------------------------------------'
 # For a /f show that does not display fancy messages that are essentially empty, use minimal-show
 minimal-show: false
@@ -651,6 +651,7 @@ frules:
     - '&f'
     - '&r &r &r &r &r &r &r &r &r &r &r &7&o(( Tip: Use &f&o/f rules add <rule>&7&o add a &c&orule&7&o ))'
     - ''
+
 ############################################################
 # +------------------------------------------------------+ #
 # |                  Faction TNT Bank                    | #
@@ -708,6 +709,7 @@ F-Shop:
       Name: '&cFaction Points: &b{points}'
       Lore:
         - ' '
+
 ############################################################
 # +------------------------------------------------------+ #
 # |           Faction Command Cooldowns                  | #
@@ -730,6 +732,27 @@ fcooldowns:
 Falling-Block-Fix:
   enabled: true
 
+
+############################################################
+# +------------------------------------------------------+ #
+# |                  Faction Disband                     | #
+# +------------------------------------------------------+ #
+############################################################
+f-disband-gui:
+  confirm-item:
+    Type: LIME_STAINED_GLASS_PANE
+    Name: '&a&lConfirm'
+    Lore:
+      - ' '
+      - '&7Confirm disbanding of &a&b{faction}&7!'
+  deny-item:
+    Type: RED_STAINED_GLASS_PANE
+    Name: '&c&lCancel'
+    Lore:
+      - ' '
+      - '&7Click to cancel faction disband.'
+
+
 ############################################################
 # +------------------------------------------------------+ #
 # |                Faction GracePeriod                   | #

src/main/resources/plugin.yml

@@ -2,7 +2,7 @@ name: Factions
 version: ${project.version}
 api-version: 1.13
 main: com.massivecraft.factions.FactionsPlugin
-authors: [Olof Larsson, Brett Flannigan, drtshock, ProSavage, SvenjaReißaus, FroggyKnight, Driftay]
+authors: [Olof Larsson, Brett Flannigan, drtshock, ProSavage, SvenjaReißaus, Driftay]
 softdepend: [Skript, CoreProtect, PlayerVaults, PlaceholderAPI, MVdWPlaceholderAPI, PermissionsEx, Permissions, Essentials, EssentialsChat, HeroChat, iChat, LocalAreaChat, LWC, nChat, ChatManager, CAPI, AuthMe, Vault, Spout, WorldEdit, WorldGuard, AuthDB, CaptureThePoints, CombatTag, dynmap, FactionsTop]
 
 commands: