Code Optimizations

Merging

pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>com.massivecraft</groupId>
     <artifactId>Factions</artifactId>
-    <version>1.6.9.5-2.3.5-RC</version>
+    <version>1.6.9.5-2.3.7-RC</version>
     <packaging>jar</packaging>
 
     <name>SaberFactions</name>
@@ -108,7 +108,7 @@
         <dependency>
             <groupId>com.github.stefvanschie.inventoryframework</groupId>
             <artifactId>IF</artifactId>
-            <version>0.5.8</version>
+            <version>0.5.19</version>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>

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

@@ -103,6 +103,9 @@ public class Conf {
     public static boolean worldGuardChecking = false;
     public static boolean worldGuardBuildPriority = false;
 
+    //RADIUS CLAIMING
+    public static boolean useRadiusClaimSystem = true;
+
     //FRIENDLY FIRE
     public static boolean friendlyFireFPlayersCommand = false;
 
@@ -265,7 +268,6 @@ public class Conf {
     public static boolean ownedMessageInsideTerritory = true;
     public static boolean ownedMessageByChunk = false;
     public static boolean pistonProtectionThroughDenyBuild = true;
-    public static Set<Material> loggableMaterials = EnumSet.noneOf(Material.class);
     public static Set<Material> territoryProtectedMaterials = EnumSet.noneOf(Material.class);
     public static Set<Material> territoryDenyUsageMaterials = EnumSet.noneOf(Material.class);
     public static Set<Material> territoryProtectedMaterialsWhenOffline = EnumSet.noneOf(Material.class);
@@ -276,8 +278,7 @@ public class Conf {
     /// Useful for HCF features.
     /// </summary>
     public static Set<Material> territoryBypassProtectedMaterials = EnumSet.noneOf(Material.class);
-    // Dependency check
-    public static boolean dependencyCheck = true;
+
     public static boolean enableClickToClaim = true;
 
     public static Set<Material> territoryCancelAndAllowItemUseMaterial = new HashSet<>();
@@ -424,6 +425,8 @@ public class Conf {
     public static HashMap<String, DefaultPermissions> defaultFactionPermissions = new HashMap<>();
     public static HashSet<PermissableAction> lockedPermissions = new HashSet<>();
 
+    public static boolean useComplexFly = true;
+
     public static boolean wildLoadChunkBeforeTeleport = true;
 
     private static transient Conf i = new Conf();
@@ -556,7 +559,6 @@ public class Conf {
             territoryDenyUsageMaterials.add(Material.ARMOR_STAND);
         }
 
-
         territoryProtectedMaterialsWhenOffline.add(Material.BEACON);
 
         territoryDenyUsageMaterialsWhenOffline.add(XMaterial.FIRE_CHARGE.parseMaterial());

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

@@ -21,7 +21,6 @@ import com.massivecraft.factions.integration.Worldguard;
 import com.massivecraft.factions.integration.dynmap.EngineDynmap;
 import com.massivecraft.factions.listeners.*;
 import com.massivecraft.factions.missions.MissionHandler;
-import com.massivecraft.factions.struct.ChatMode;
 import com.massivecraft.factions.struct.Relation;
 import com.massivecraft.factions.struct.Role;
 import com.massivecraft.factions.util.*;
@@ -39,15 +38,15 @@ import me.lucko.commodore.CommodoreProvider;
 import net.milkbowl.vault.economy.Economy;
 import net.milkbowl.vault.permission.Permission;
 import org.bstats.bukkit.Metrics;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
-import org.bukkit.event.player.AsyncPlayerChatEvent;
 import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.RegisteredServiceProvider;
 
@@ -66,6 +65,7 @@ public class FactionsPlugin extends MPlugin {
     // Our single plugin instance.
     // Single 4 life.
     public static FactionsPlugin instance;
+    public static boolean cachedRadiusClaim;
     public static Permission perms = null;
     // This plugin sets the boolean true when fully enabled.
     // Plugins can check this boolean while hooking in have
@@ -82,7 +82,6 @@ public class FactionsPlugin extends MPlugin {
     public boolean mc114 = false;
     public boolean mc115 = false;
     public boolean useNonPacketParticles = false;
-    public static boolean factionsFlight = false;
     public List<String> itemList = getConfig().getStringList("fchest.Items-Not-Allowed");
     SkriptAddon skriptAddon;
     private FactionsPlayerListener factionsPlayerListener;
@@ -129,28 +128,20 @@ public class FactionsPlugin extends MPlugin {
         this.setAutoSave(val);
     }
 
-    public void playSoundForAll(String sound) {
-        for (Player pl : Bukkit.getOnlinePlayers()) playSound(pl, sound);
-    }
-
-    public void playSoundForAll(List<String> sounds) {
-        for (Player pl : Bukkit.getOnlinePlayers()) playSound(pl, sounds);
-    }
-
-    public void playSound(Player p, List<String> sounds) {
-        for (String sound : sounds) playSound(p, sound);
-    }
-
-    public void playSound(Player p, String sound) {
-        float pitch = Float.parseFloat(sound.split(":")[1]);
-        sound = sound.split(":")[0];
-        p.playSound(p.getLocation(), Sound.valueOf(sound), pitch, 5.0F);
-    }
-
     @Override
     public void onEnable() {
         log("==== Setup ====");
 
+        if (getServer().getPluginManager().getPlugin("Vault") == null) {
+            divider();
+            System.out.println("You are missing dependencies!");
+            System.out.println("Please verify [Vault] is installed!");
+            Conf.save();
+            Bukkit.getPluginManager().disablePlugin(instance);
+            divider();
+            return;
+        }
+
         int version = Integer.parseInt(ReflectionUtils.PackageType.getServerVersion().split("_")[1]);
         switch (version) {
             case 7:
@@ -176,44 +167,31 @@ public class FactionsPlugin extends MPlugin {
                 FactionsPlugin.instance.log("Minecraft Version 1.15 found.");
                 mc115 = true;
                 break;
+            default:
+                throw new IllegalStateException("Unexpected value: " + version);
         }
         migrateFPlayerLeaders();
         log("==== End Setup ====");
 
         int pluginId = 7013;
-        Metrics metrics = new Metrics(this, pluginId);
-
+        new Metrics(this, pluginId);
 
         if (!preEnable()) {
             this.loadSuccessful = false;
             return;
         }
 
-        if (!new File(this.getDataFolder() + "/config.yml").exists()) {
-            this.saveResource("config.yml", false);
-            this.reloadConfig();
-        }
-
+        saveDefaultConfig();
         //Start wait task executor
         WaitExecutor.startTask();
         // Load Conf from disk
-        fileManager = new FileManager();
-        getFileManager().setupFiles();
         Conf.load();
+
+        fileManager = new FileManager();
+        fileManager.setupFiles();
+
         fLogManager = new FLogManager();
-        //Dependency checks
-        if (Conf.dependencyCheck && (!Bukkit.getPluginManager().isPluginEnabled("Vault"))) {
-            divider();
-            System.out.println("You are missing dependencies!");
-            System.out.println("Please verify [Vault] is installed!");
-            Conf.save();
-            Bukkit.getPluginManager().disablePlugin(instance);
-            divider();
-            return;
-        }
-        //Update their config if needed
-        // Updater.updateIfNeeded(getConfig());
-        RegisteredServiceProvider<Economy> rsp = FactionsPlugin.this.getServer().getServicesManager().getRegistration(Economy.class);
+
         com.massivecraft.factions.integration.Essentials.setup();
         hookedPlayervaults = setupPlayervaults();
         FPlayers.getInstance().load();
@@ -230,6 +208,12 @@ public class FactionsPlugin extends MPlugin {
             else faction.addFPlayer(fPlayer);
         }
 
+        Factions.getInstance().getAllFactions().forEach(Faction::refreshFPlayers);
+
+        if (getConfig().getBoolean("enable-faction-flight", true)) {
+            UtilFly.run();
+        }
+
 
         Board.getInstance().load();
         Board.getInstance().clean();
@@ -249,15 +233,15 @@ public class FactionsPlugin extends MPlugin {
         // start up task which runs the autoLeaveAfterDaysOfInactivity routine
         startAutoLeaveTask(false);
 
+        cachedRadiusClaim = Conf.useRadiusClaimSystem;
+
         if (version > 8) {
             useNonPacketParticles = true;
             log("Minecraft Version 1.9 or higher found, using non packet based particle API");
         }
 
-        if (getConfig().getBoolean("enable-faction-flight")) factionsFlight = true;
-
         if (getServer().getPluginManager().getPlugin("Skript") != null) {
-            log("Skript was found! Registering FactionsPlugin Addon...");
+            log("Skript was found! Registering SaberFactions Addon...");
             skriptAddon = Skript.registerAddon(this);
             try {
                 skriptAddon.loadClasses("com.massivecraft.factions.skript", "expressions");
@@ -266,6 +250,7 @@ public class FactionsPlugin extends MPlugin {
             }
             log("Skript addon registered!");
         }
+
         if (Conf.useCheckSystem) {
             int minute = 1200;
             this.getServer().getScheduler().runTaskTimerAsynchronously(this, new CheckTask(this, 3), 0L, minute * 3);
@@ -303,13 +288,14 @@ public class FactionsPlugin extends MPlugin {
         for (Listener eventListener : eventsListener)
             getServer().getPluginManager().registerEvents(eventListener, this);
 
-        if(Conf.useGraceSystem){
+        if (Conf.useGraceSystem) {
             getServer().getPluginManager().registerEvents(timerManager.graceTimer, this);
         }
 
         this.getCommand(refCommand).setExecutor(cmdBase);
 
         if (!CommodoreProvider.isSupported()) this.getCommand(refCommand).setTabCompleter(this);
+
         reserveObjects = new ArrayList<>();
         String path = Paths.get(this.getDataFolder().getAbsolutePath()).toAbsolutePath().toString() + File.separator + "reserves.json";
         File file = new File(path);
@@ -345,10 +331,6 @@ public class FactionsPlugin extends MPlugin {
         FactionsPlugin.startupFinished = true;
     }
 
-    public SkriptAddon getSkriptAddon() {
-        return skriptAddon;
-    }
-
 
     private void setupPlaceholderAPI() {
         Plugin clip = getServer().getPluginManager().getPlugin("PlaceholderAPI");
@@ -414,14 +396,12 @@ public class FactionsPlugin extends MPlugin {
         return this.mvdwPlaceholderAPIManager;
     }
 
-    private boolean setupPermissions() {
+    private void setupPermissions() {
         try {
             RegisteredServiceProvider<Permission> rsp = getServer().getServicesManager().getRegistration(Permission.class);
             if (rsp != null) perms = rsp.getProvider();
-        } catch (NoClassDefFoundError ex) {
-            return false;
+        } catch (NoClassDefFoundError ignored) {
         }
-        return perms != null;
     }
 
     private boolean setupPlayervaults() {
@@ -455,31 +435,31 @@ public class FactionsPlugin extends MPlugin {
 
     @Override
     public void onDisable() {
-        // only save data if plugin actually completely loaded successfully
-        if (this.loadSuccessful) {
-            Conf.load();
-            Conf.saveSync();
-            timerManager.saveTimerData();
-            DiscordListener.saveGuilds();
-            if (Discord.jda != null) Discord.jda.shutdownNow();
-            try {
-                fLogManager.saveLogs();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
-            try {
-                String path = Paths.get(getDataFolder().getAbsolutePath()).toAbsolutePath().toString() + File.separator + "reserves.json";
-                File file = new File(path);
-                if (!file.exists()) {
-                    file.getParentFile().mkdirs();
-                    file.createNewFile();
-                }
-                Files.write(Paths.get(file.getPath()), getGsonBuilder().create().toJson(reserveObjects).getBytes());
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
+        if (this.AutoLeaveTask != null) {
+            getServer().getScheduler().cancelTask(this.AutoLeaveTask);
+            this.AutoLeaveTask = null;
         }
-        this.getServer().getScheduler().cancelTasks(this);
+
+        Conf.saveSync();
+        timerManager.saveTimerData();
+        DiscordListener.saveGuilds();
+
+        if (Discord.jda != null) Discord.jda.shutdownNow();
+
+        fLogManager.saveLogs();
+
+        try {
+            String path = Paths.get(getDataFolder().getAbsolutePath()).toAbsolutePath().toString() + File.separator + "reserves.json";
+            File file = new File(path);
+            if (!file.exists()) {
+                file.getParentFile().mkdirs();
+                file.createNewFile();
+            }
+            Files.write(Paths.get(file.getPath()), getGsonBuilder().create().toJson(reserveObjects).getBytes());
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+
         super.onDisable();
     }
 
@@ -501,26 +481,9 @@ public class FactionsPlugin extends MPlugin {
         Conf.save();
     }
 
-    public ItemStack createItem(Material material, int amount, short datavalue, String name, List<String> lore) {
-        ItemStack item = new ItemStack(XMaterial.matchXMaterial(material.toString()).get().parseMaterial(), amount, datavalue);
-        ItemMeta meta = item.getItemMeta();
-        meta.setDisplayName(color(name));
-        meta.setLore(colorList(lore));
-        item.setItemMeta(meta);
-        return item;
-    }
-
-    public ItemStack createLazyItem(Material material, int amount, short datavalue, String name, String lore) {
-        ItemStack item = new ItemStack(material, amount, datavalue);
-        ItemMeta meta = item.getItemMeta();
-        meta.setDisplayName(color(FactionsPlugin.instance.getConfig().getString(name)));
-        meta.setLore(colorList(FactionsPlugin.instance.getConfig().getStringList(lore)));
-        item.setItemMeta(meta);
-        return item;
-    }
 
     public Economy getEcon() {
-        RegisteredServiceProvider<Economy> rsp = FactionsPlugin.instance.getServer().getServicesManager().getRegistration(Economy.class);
+        RegisteredServiceProvider<Economy> rsp = getServer().getServicesManager().getRegistration(Economy.class);
         return rsp.getProvider();
     }
 
@@ -545,7 +508,6 @@ public class FactionsPlugin extends MPlugin {
         List<FCommand> commandsList = cmdBase.subCommands;
         FCommand commandsEx = cmdBase;
         List<String> completions = new ArrayList<>();
-
         // Check for "" first arg because spigot is mangled.
         if (context.args.get(0).equals("")) {
             for (FCommand subCommand : commandsEx.subCommands) {
@@ -593,70 +555,11 @@ public class FactionsPlugin extends MPlugin {
     // Functions for other plugins to hook into
     // -------------------------------------------- //
 
-    // This value will be updated whenever new hooks are added
-    public int hookSupportVersion() {
-        return 3;
-    }
-
     // If another plugin is handling insertion of chat tags, this should be used to notify Factions
     public void handleFactionTagExternally(boolean notByFactions) {
         Conf.chatTagHandledByAnotherPlugin = notByFactions;
     }
 
-    // Simply put, should this chat event be left for Factions to handle? For now, that means players with Faction Chat
-    // enabled or use of the Factions f command without a slash; combination of isPlayerFactionChatting() and isFactionsCommand()
-
-    public boolean shouldLetFactionsHandleThisChat(AsyncPlayerChatEvent event) {
-        return event != null && (isPlayerFactionChatting(event.getPlayer()) || isFactionsCommand(event.getMessage()));
-    }
-
-
-    // Does player have Faction Chat enabled? If so, chat plugins should preferably not do channels,
-    // local chat, or anything else which targets individual recipients, so Faction Chat can be done
-    public boolean isPlayerFactionChatting(Player player) {
-        if (player == null) return false;
-        FPlayer me = FPlayers.getInstance().getByPlayer(player);
-        return me != null && me.getChatMode().isAtLeast(ChatMode.ALLIANCE);
-    }
-
-    // Is this chat message actually a Factions command, and thus should be left alone by other plugins?
-
-    // TODO: GET THIS BACK AND WORKING
-
-    public boolean isFactionsCommand(String check) {
-        return !(check == null || check.isEmpty()) && this.handleCommand(null, check, true);
-    }
-
-    // Get a player's faction tag (faction name), mainly for usage by chat plugins for local/channel chat
-    public String getPlayerFactionTag(Player player) {
-        return getPlayerFactionTagRelation(player, null);
-    }
-
-    // Same as above, but with relation (enemy/neutral/ally) coloring potentially added to the tag
-    public String getPlayerFactionTagRelation(Player speaker, Player listener) {
-        String tag = "~";
-
-        if (speaker == null) return tag;
-
-
-        FPlayer me = FPlayers.getInstance().getByPlayer(speaker);
-        if (me == null) return tag;
-        // if listener isn't set, or config option is disabled, give back uncolored tag
-        if (listener == null || !Conf.chatTagRelationColored) {
-            tag = me.getChatTag().trim();
-        } else {
-            FPlayer you = FPlayers.getInstance().getByPlayer(listener);
-            if (you == null) {
-                tag = me.getChatTag().trim();
-            } else { // everything checks out, give the colored tag
-                tag = me.getChatTag(you).trim();
-            }
-        }
-        if (tag.isEmpty()) tag = "~";
-        return tag;
-    }
-
-
     public FLogManager getFlogManager() {
         return fLogManager;
     }
@@ -665,14 +568,6 @@ public class FactionsPlugin extends MPlugin {
         this.fLogManager.log(faction, type, arguments);
     }
 
-    // Get a player's title within their faction, mainly for usage by chat plugins for local/channel chat
-    public String getPlayerTitle(Player player) {
-        if (player == null) return "";
-        FPlayer me = FPlayers.getInstance().getByPlayer(player);
-        if (me == null) return "";
-        return me.getTitle().trim();
-    }
-
     public String color(String line) {
         line = ChatColor.translateAlternateColorCodes('&', line);
         return line;
@@ -684,38 +579,10 @@ public class FactionsPlugin extends MPlugin {
         return lore;
     }
 
-    // Get a list of all faction tags (names)
-    public Set<String> getFactionTags() {
-        return Factions.getInstance().getFactionTags();
-    }
-
     public List<ReserveObject> getFactionReserves() {
         return this.reserveObjects;
     }
 
-    // Get a list of all players in the specified faction
-    public Set<String> getPlayersInFaction(String factionTag) {
-        Set<String> players = new HashSet<>();
-        Faction faction = Factions.getInstance().getByTag(factionTag);
-        if (faction != null) {
-            for (FPlayer fplayer : faction.getFPlayers()) players.add(fplayer.getName());
-        }
-        return players;
-    }
-
-    // Get a list of all online players in the specified faction
-    public Set<String> getOnlinePlayersInFaction(String factionTag) {
-        Set<String> players = new HashSet<>();
-        Faction faction = Factions.getInstance().getByTag(factionTag);
-        if (faction != null) {
-            for (FPlayer fplayer : faction.getFPlayersWhereOnline(true)) players.add(fplayer.getName());
-        }
-        return players;
-    }
-
-    public boolean isHookedPlayervaults() {
-        return hookedPlayervaults;
-    }
 
     public String getPrimaryGroup(OfflinePlayer player) {
         return perms == null || !perms.hasGroupSupport() ? " " : perms.getPrimaryGroup(Bukkit.getWorlds().get(0).toString(), player);
@@ -737,7 +604,4 @@ public class FactionsPlugin extends MPlugin {
         debug(Level.INFO, s);
     }
 
-    public Worldguard getWg() {
-        return wg;
-    }
 }

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

@@ -57,6 +57,10 @@ public class CmdAdmin extends FCommand {
                 return;
             }
 
+            if(fyou.isAlt()){
+                return;
+            }
+
             // only perform a FPlayerJoinEvent when newLeader isn't actually in the faction
             if (fyou.getFaction() != targetFaction) {
                 FPlayerJoinEvent event = new FPlayerJoinEvent(FPlayers.getInstance().getByPlayer(context.player), targetFaction, FPlayerJoinEvent.PlayerJoinReason.LEADER);

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

@@ -50,7 +50,7 @@ public class CmdAnnounce extends FCommand {
         return TL.COMMAND_ANNOUNCE_DESCRIPTION;
     }
 
-    protected class AnnounceBrigadier implements BrigadierProvider {
+    protected static class AnnounceBrigadier implements BrigadierProvider {
         @Override
         public ArgumentBuilder<Object, ?> get(ArgumentBuilder<Object, ?> parent) {
             return parent.then(RequiredArgumentBuilder.argument("message", StringArgumentType.greedyString()));

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

@@ -60,7 +60,6 @@ public class CmdBanner extends FCommand {
     @Deprecated
     public void takeMoney(FPlayer fme, int amt) {
         if (this.hasMoney(fme, amt)) {
-            Economy econ = FactionsPlugin.getInstance().getEcon();
             fme.sendMessage(TL.COMMAND_BANNER_MONEYTAKE.toString().replace("{amount}", amt + ""));
         }
     }

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

@@ -14,7 +14,6 @@ public class CmdBoom extends FCommand {
         super();
         this.aliases.addAll(Aliases.boom);
 
-        //this.requiredArgs.add("");
         this.optionalArgs.put("on/off", "flip");
 
         this.requirements = new CommandRequirements.Builder(Permission.NO_BOOM)

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

@@ -14,7 +14,6 @@ public class CmdBypass extends FCommand {
         super();
         this.aliases.addAll(Aliases.bypass);
 
-        //this.requiredArgs.add("");
         this.optionalArgs.put("on/off", "flip");
 
         this.requirements = new CommandRequirements.Builder(Permission.BYPASS)

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

@@ -18,7 +18,6 @@ public class CmdChat extends FCommand {
         super();
         this.aliases.addAll(Aliases.chat);
 
-        //this.requiredArgs.add("");
         this.optionalArgs.put("mode", "next");
 
         this.requirements = new CommandRequirements.Builder(Permission.CHAT)
@@ -86,7 +85,7 @@ public class CmdChat extends FCommand {
         return TL.COMMAND_CHAT_DESCRIPTION;
     }
 
-    protected class ChatBrigadier implements BrigadierProvider {
+    protected static class ChatBrigadier implements BrigadierProvider {
         @Override
         public ArgumentBuilder<Object, ?> get(ArgumentBuilder<Object, ?> parent) {
             return parent.then(LiteralArgumentBuilder.literal("public"))

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

@@ -35,11 +35,10 @@ public class CmdCheckpoint extends FCommand {
             if (myLocFaction == Factions.getInstance().getWilderness() || myLocFaction == context.faction) {
                 context.faction.setCheckpoint(context.player.getLocation());
                 context.msg(TL.COMMAND_CHECKPOINT_SET);
-                return;
             } else {
                 context.msg(TL.COMMAND_CHECKPOINT_INVALIDLOCATION);
-                return;
             }
+            return;
         }
         if (context.faction.getCheckpoint() == null) {
             context.msg(TL.COMMAND_CHECKPOINT_NOT_SET);

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

@@ -55,6 +55,10 @@ public class CmdColeader extends FCommand {
             return;
         }
 
+        if(you.isAlt()){
+            return;
+        }
+
         if (context.fPlayer != null && context.fPlayer.getRole() != Role.LEADER && !permAny) {
             context.msg(TL.COMMAND_COLEADER_NOTADMIN);
             return;

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

@@ -66,7 +66,7 @@ public class CmdCreate extends FCommand {
         }
 
         ArrayList<String> tagValidationErrors = MiscUtil.validateTag(tag);
-        if (tagValidationErrors.size() > 0) {
+        if (tagValidationErrors.isEmpty()) {
             context.sendMessage(tagValidationErrors);
             return;
         }

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

@@ -39,7 +39,7 @@ public class CmdDescription extends FCommand {
 
             // since "&" color tags seem to work even through plain old FPlayer.sendMessage() for some reason, we need to break those up
             // And replace all the % because it messes with string formatting and this is easy way around that.
-            String desc = TextUtil.implode(context.args, " ").replaceAll("%", "").replaceAll("(&([a-f0-9klmnor]))", "& $2");
+            String desc = TextUtil.implode(context.args, " ").replace("%", "").replaceAll("(&([a-f0-9klmnor]))", "& $2");
             context.faction.setDescription(desc);
             Bukkit.getScheduler().scheduleSyncDelayedTask(FactionsPlugin.instance, () -> FactionsPlugin.instance.logFactionEvent(context.faction, FLogType.FDESC_EDIT, context.fPlayer.getName(), desc));
             if (!Conf.broadcastDescriptionChanges) {

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

@@ -42,8 +42,8 @@ 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 (!isMyFaction && !Permission.DISBAND_ANY.has(context.sender, true)) {
+            return;
         }
 
 
@@ -70,7 +70,7 @@ public class CmdDisband extends FCommand {
             return;
         }
 
-        if(Cooldown.isOnCooldown(context.fPlayer.getPlayer(), "disbandCooldown") && !context.fPlayer.isAdminBypassing()){
+        if (Cooldown.isOnCooldown(context.fPlayer.getPlayer(), "disbandCooldown") && !context.fPlayer.isAdminBypassing()) {
             context.msg(TL.COMMAND_COOLDOWN);
             return;
         }
@@ -81,13 +81,9 @@ public class CmdDisband extends FCommand {
             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;
-                }
-            }
+        if (!access && Conf.useDisbandGUI && (!context.fPlayer.isAdminBypassing() || !context.player.isOp()) && !disbandMap.containsKey(context.player.getUniqueId().toString())) {
+            new FDisbandFrame(context.faction).buildGUI(context.fPlayer);
+            return;
         }
 
         // check for tnt before disbanding.
@@ -101,27 +97,15 @@ public class CmdDisband extends FCommand {
                     String amountString = context.sender instanceof ConsoleCommandSender ? TL.GENERIC_SERVERADMIN.toString() : context.fPlayer.describeTo(follower);
                     if (follower.getFaction() == faction) {
                         follower.msg(TL.COMMAND_DISBAND_BROADCAST_YOURS, amountString);
-                        if (!follower.canFlyAtLocation() && FactionsPlugin.factionsFlight) {
-                            follower.setFFlying(false, false);
-                        }
                     } else {
                         follower.msg(TL.COMMAND_DISBAND_BROADCAST_NOTYOURS, amountString, faction.getTag(follower));
                     }
                 }
-                if (FactionsPlugin.factionsFlight) {
-                    faction.disband(context.player, PlayerDisbandReason.COMMAND);
-                    context.fPlayer.setFFlying(false, false);
-                    Cooldown.setCooldown(context.fPlayer.getPlayer(), "disbandCooldown", FactionsPlugin.getInstance().getConfig().getInt("fcooldowns.f-disband"));
-                    return;
-                }
             } else {
                 context.player.sendMessage(String.valueOf(TL.COMMAND_DISBAND_PLAYER));
             }
             faction.disband(context.player, PlayerDisbandReason.COMMAND);
             Cooldown.setCooldown(context.fPlayer.getPlayer(), "disbandCooldown", FactionsPlugin.getInstance().getConfig().getInt("fcooldowns.f-disband"));
-            if (!context.fPlayer.canFlyAtLocation() && FactionsPlugin.factionsFlight) {
-                context.fPlayer.setFFlying(false, false);
-            }
         }
     }
 

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

@@ -26,8 +26,8 @@ public class CmdFly extends FCommand {
 
     public static ConcurrentHashMap<String, Boolean> flyMap = new ConcurrentHashMap<>();
     public static BukkitTask particleTask = null;
-    public static BukkitTask flyTask = null;
-    public static boolean autoenable = FactionsPlugin.instance.getConfig().getBoolean("ffly.AutoEnable");
+
+    public static final boolean fly = FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight");
 
 
     public CmdFly() {
@@ -42,15 +42,12 @@ public class CmdFly extends FCommand {
     }
 
     public static void startParticles() {
-
         particleTask = Bukkit.getScheduler().runTaskTimerAsynchronously(FactionsPlugin.instance, () -> {
             for (String name : flyMap.keySet()) {
                 Player player = Bukkit.getPlayer(name);
                 if (player == null) continue;
                 if (!player.isFlying()) continue;
-                if (!FactionsPlugin.getInstance().mc17) {
-                    if (player.getGameMode() == GameMode.SPECTATOR) continue;
-                }
+                if (!FactionsPlugin.getInstance().mc17 && player.getGameMode() == GameMode.SPECTATOR) continue;
 
                 FPlayer fplayer = FPlayers.getInstance().getByPlayer(player);
                 fplayer.isVanished();
@@ -62,75 +59,44 @@ public class CmdFly extends FCommand {
         }, 10L, 3L);
     }
 
-    public static void startFlyCheck() {
-        flyTask = Bukkit.getScheduler().runTaskTimerAsynchronously(FactionsPlugin.instance, () -> {
-            checkTaskState();
-            if (flyMap.keySet().size() != 0) {
-                for (String name : flyMap.keySet()) {
-                    if (name == null) {
-                        continue;
-                    }
-                    Player player = Bukkit.getPlayer(name);
-                    if (player == null
-                            || !player.isFlying()
-                            || player.getGameMode() == GameMode.CREATIVE
-                            || !FactionsPlugin.getInstance().mc17 && player.getGameMode() == GameMode.SPECTATOR) {
-                        continue;
-                    }
-                    FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
-                    if (fPlayer.isAdminBypassing()) continue;
-                    if (!player.hasPermission("factions.fly.bypassnearbyenemycheck")) {
-                        if (fPlayer.hasEnemiesNearby()) {
-                            disableFlightSync(fPlayer);
-                            continue;
-                        }
-                        checkEnemiesSync(fPlayer);
-                    }
-                    FLocation myFloc = new FLocation(player.getLocation());
-                    if (!checkFly(fPlayer, player, Board.getInstance().getFactionAt(myFloc))) {
-                        disableFlightSync(fPlayer);
-                    }
+    public static boolean checkBypassPerms(FPlayer fme, Player me, Faction toFac, boolean sendMessage) {
+        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_WILDERNESS.node) && toFac.isWilderness() || !me.hasPermission(Permission.FLY_SAFEZONE.node) && toFac.isSafeZone() || !me.hasPermission(Permission.FLY_WARZONE.node) && toFac.isWarZone()) {
+                if(sendMessage) 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) {
+                if(sendMessage) 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) {
+                if(sendMessage) 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) {
+                if(sendMessage) fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
+                return false;
             }
 
-        }, 20L, 15L);
-    }
-
-    public static boolean checkFly(FPlayer fme, Player me, Faction toFac) {
-        if ((Conf.denyFlightIfInNoClaimingWorld && !Conf.worldsNoClaiming.isEmpty() && Conf.worldsNoClaiming.stream().anyMatch(me.getWorld().getName()::equalsIgnoreCase)) || !me.hasPermission(Permission.FLY_FLY.node))
-            return false;
-        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;
-    }
-
-
-    public static void checkTaskState() {
-        if (flyMap.isEmpty()) {
-            flyTask.cancel();
-            flyTask = null;
+            if (!(me.hasPermission(Permission.FLY_NEUTRAL.node) || access == Access.ALLOW) && toFac.getRelationTo(fme.getFaction()) == Relation.NEUTRAL && !toFac.isSystemFaction()) {
+                if(sendMessage) fme.msg(TL.COMMAND_FLY_NO_ACCESS, toFac.getTag(fme));
+                return false;
+            }
+            return me.hasPermission(Permission.FLY_FLY.node) && (access != Access.DENY || toFac.isSystemFaction());
         }
+        return true;
     }
 
+
     public static void disableFlight(final FPlayer fme) {
         fme.setFlying(false);
         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());
@@ -155,7 +121,7 @@ public class CmdFly extends FCommand {
 
             FLocation myfloc = new FLocation(context.player.getLocation());
             Faction toFac = Board.getInstance().getFactionAt(myfloc);
-            if (!checkFly(context.fPlayer, context.player, toFac)) {
+            if (!checkBypassPerms(context.fPlayer, context.player, toFac, false)) {
                 context.fPlayer.sendMessage(TL.COMMAND_FLY_NO_ACCESS.format(toFac.getTag()));
                 return;
             }
@@ -175,17 +141,15 @@ 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 (flyTask == null) {
-                startFlyCheck();
-            }
-        }, FactionsPlugin.getInstance().getConfig().getLong("warmups.f-fly", 0));
+        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();
+            }, FactionsPlugin.getInstance().getConfig().getLong("warmups.f-fly", 0));
+        } else {
+            fme.msg(TL.COMMAND_FLY_NO_ACCESS, Board.getInstance().getFactionAt(fme.getLastStoodAt()).getTag());
+        }
     }
 
     @Override

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

@@ -88,11 +88,7 @@ public class CmdHome extends FCommand {
         final Location loc = context.player.getLocation().clone();
 
         // if player is not in a safe zone or their own faction territory, only allow teleport if no enemies are nearby
-        if (Conf.homesTeleportAllowedEnemyDistance > 0
-                && !faction.isSafeZone()
-                && (!context.fPlayer.isInOwnTerritory()
-                || (context.fPlayer.isInOwnTerritory()
-                && !Conf.homesTeleportIgnoreEnemiesIfInOwnTerritory))) {
+        if (Conf.homesTeleportAllowedEnemyDistance > 0 && !faction.isSafeZone() && (!context.fPlayer.isInOwnTerritory() || !Conf.homesTeleportIgnoreEnemiesIfInOwnTerritory)) {
 
             World w = loc.getWorld();
             double x = loc.getX();

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

@@ -49,6 +49,7 @@ public class CmdInventorySee extends FCommand {
 
         FPlayer targetInv = context.argAsFPlayer(0);
         if (targetInv == null || !fplayers.contains(targetInv.getPlayer())) {
+            assert targetInv != null;
             context.msg(TL.PLAYER_NOT_FOUND, Objects.requireNonNull(targetInv.getName()));
             return;
         }

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

@@ -63,7 +63,7 @@ public class CmdInvite extends FCommand {
             FancyMessage message = new FancyMessage(TL.COMMAND_INVITE_INVITEDYOU.toString()
                         .replace("%1$s", context.fPlayer.describeTo(target, true))
                         .replace("%2$s", context.faction.getTag())
-                        .replaceAll("&", "§"))
+                        .replace("&", "§"))
                     .tooltip(TL.COMMAND_INVITE_CLICKTOJOIN.toString())
                     .command("/" + Conf.baseCommandAliases.get(0) + " join " + context.faction.getTag());
             message.send(target.getPlayer());

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

@@ -16,10 +16,6 @@ import java.util.Objects;
 
 public class CmdJoin extends FCommand {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     public CmdJoin() {
         super();
         this.aliases.addAll(Aliases.join);
@@ -127,28 +123,13 @@ public class CmdJoin extends FCommand {
         }
 
         faction.deinvite(fplayer);
-
-        try {
-            context.fPlayer.setRole(faction.getDefaultRole());
-            FactionsPlugin.instance.logFactionEvent(faction, FLogType.INVITES, context.fPlayer.getName(), CC.Green + "joined", "the faction");
-            if (Discord.useDiscord && context.fPlayer.discordSetup() && Discord.isInMainGuild(context.fPlayer.discordUser()) && Discord.mainGuild != null) {
-                Member m = Discord.mainGuild.getMember(context.fPlayer.discordUser());
-                if (Conf.factionRoles) {
-                    Discord.mainGuild.getController().addSingleRoleToMember(m, Objects.requireNonNull(Discord.createFactionRole(faction.getTag()))).queue();
-                }
-                if (Conf.factionDiscordTags) {
-                    Discord.mainGuild.getController().setNickname(m, Discord.getNicknameString(context.fPlayer)).queue();
-                }
-            }
-        } catch (HierarchyException e) {
-            System.out.print(e.getMessage());
-        }
+        context.fPlayer.setRole(faction.getDefaultRole());
 
         if (Conf.logFactionJoin) {
             if (samePlayer) {
-                FactionsPlugin.getInstance().log(TL.COMMAND_JOIN_JOINEDLOG.toString(), fplayer.getName(), faction.getTag());
+                FactionsPlugin.instance.log(TL.COMMAND_JOIN_JOINEDLOG.toString(), fplayer.getName(), faction.getTag());
             } else {
-                FactionsPlugin.getInstance().log(TL.COMMAND_JOIN_MOVEDLOG.toString(), context.fPlayer.getName(), fplayer.getName(), faction.getTag());
+                FactionsPlugin.instance.log(TL.COMMAND_JOIN_MOVEDLOG.toString(), context.fPlayer.getName(), fplayer.getName(), faction.getTag());
             }
         }
     }

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

@@ -1,9 +1,6 @@
 package com.massivecraft.factions.cmd;
 
-import com.massivecraft.factions.Conf;
-import com.massivecraft.factions.FPlayer;
-import com.massivecraft.factions.Faction;
-import com.massivecraft.factions.FactionsPlugin;
+import com.massivecraft.factions.*;
 import com.massivecraft.factions.cmd.audit.FLogType;
 import com.massivecraft.factions.event.FPlayerLeaveEvent;
 import com.massivecraft.factions.struct.Permission;
@@ -115,6 +112,7 @@ public class CmdKick extends FCommand {
         toKickFaction.msg(TL.COMMAND_KICK_FACTION, context.fPlayer.describeTo(toKickFaction, true), toKick.describeTo(toKickFaction, true));
 
         toKick.msg(TL.COMMAND_KICK_KICKED, context.fPlayer.describeTo(toKick, true), toKickFaction.describeTo(toKick));
+
         if (toKickFaction != context.faction) {
             context.fPlayer.msg(TL.COMMAND_KICK_KICKS, toKick.describeTo(context.fPlayer), toKickFaction.describeTo(context.fPlayer));
         }
@@ -127,6 +125,9 @@ public class CmdKick extends FCommand {
         FactionsPlugin.instance.logFactionEvent(toKickFaction, FLogType.INVITES, context.fPlayer.getName(), CC.Red + "kicked", toKick.getName());
         toKickFaction.deinvite(toKick);
         toKick.resetFactionData();
+        if(!CmdFly.checkBypassPerms(toKick, toKick.getPlayer(), toKickFaction, false)){
+            CmdFly.disableFlight(toKick);
+        }
     }
 
     @Override

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

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

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

@@ -50,6 +50,10 @@ public class CmdMod extends FCommand {
             return;
         }
 
+        if(you.isAlt()){
+            return;
+        }
+
         if (context.fPlayer != null && context.fPlayer.getRole() != Role.LEADER && !permAny) {
             context.msg(TL.COMMAND_MOD_NOTADMIN);
             return;

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

@@ -30,10 +30,6 @@ public class CmdReload extends FCommand {
         FactionsPlugin.getInstance().loadLang();
 
 
-        if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight", false)) {
-            FactionsPlugin.factionsFlight = true;
-        }
-
         if (!FactionsPlugin.getInstance().mc17) {
             FactionsPlayerListener.loadCorners();
         }

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

@@ -66,18 +66,16 @@ public class CmdRules extends FCommand {
                 String message = "";
                 StringBuilder string = new StringBuilder(message);
                 for (int i = 1; i <= context.args.size() - 1; i++) {
-                    string.append(" " + context.args.get(i));
+                    string.append(" ").append(context.args.get(i));
                 }
                 context.faction.addRule(string.toString());
                 context.msg(TL.COMMAND_RULES_ADD_SUCCESS);
             }
 
-            if (context.args.size() == 2) {
-                if (context.args.get(0).equalsIgnoreCase("remove")) {
+            if (context.args.size() == 2 && context.args.get(0).equalsIgnoreCase("remove")) {
                     int index = context.argAsInt(1);
                     context.faction.removeRule(index - 1);
                     context.msg(TL.COMMAND_RULES_REMOVE_SUCCESS);
-                }
             }
 
         }

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

@@ -24,17 +24,21 @@ public class CmdShow extends FCommand {
         this.aliases.addAll(Aliases.show_show);
 
         // add defaults to /f show in case config doesnt have it
-        defaults.add("{header}");
-        defaults.add("<a>Description: <i>{description}");
-        defaults.add("<a>Joining: <i>{joining}    {peaceful}");
-        defaults.add("<a>Land / Power / Maxpower: <i> {chunks} / {power} / {maxPower}");
-        defaults.add("<a>Founded: <i>{create-date}");
-        defaults.add("<a>This faction is permanent, remaining even with no members.");
-        defaults.add("<a>Land value: <i>{land-value} {land-refund}");
-        defaults.add("<a>Balance: <i>{faction-balance}");
-        defaults.add("<a>Allies(<i>{allies}<a>/<i>{max-allies}<a>): {allies-list}");
-        defaults.add("<a>Online: (<i>{online}<a>/<i>{members}<a>): {online-list}");
-        defaults.add("<a>Offline: (<i>{offline}<a>/<i>{members}<a>): {offline-list}");
+        defaults.add("&8&m--------------&7 &8<&e{faction}&8> &8&m--------------");
+        defaults.add("&4* &cOwner: &f{leader}");
+        defaults.add("&4* &cDescription: &f{description}");
+        defaults.add("&4* &cLand / Power / Max Power: &f{chunks} &8/ &f{power} &8/ &f{maxPower}");
+        defaults.add("&4* &cFaction Strikes: &f{strikes}");
+        defaults.add("&4* &cFaction Points: &f{faction-points}");
+        defaults.add("&4* &cFounded: &f{create-date}");
+        defaults.add("&4* &cBalance: &f{faction-balance}");
+        defaults.add("&4* &cAllies: &a{allies-list}");
+        defaults.add("&4* &cEnemies: &4{enemies-list}");
+        defaults.add("&4* &cOnline Members: &8[&f{online}/{members}&8] &a{online-list}");
+        defaults.add("&4* &cOffline Members: &8[&f{offline}/{members}&8] &a{offline-list}");
+        defaults.add("&4* &cAlts: &f{alts}");
+        defaults.add("&4* &cBans: &f{faction-bancount}");
+        defaults.add("&8&m----------------------------------------");
 
         // this.requiredArgs.add("");
         this.optionalArgs.put("faction tag", "yours");
@@ -45,6 +49,7 @@ public class CmdShow extends FCommand {
     @Override
     public void perform(CommandContext context) {
         Faction faction = context.faction;
+        FactionsPlugin instance = FactionsPlugin.getInstance();
         if (context.argIsSet(0))
             faction = context.argAsFaction(0);
 
@@ -52,7 +57,7 @@ public class CmdShow extends FCommand {
             return;
 
         if (context.fPlayer != null && !context.player.getPlayer().hasPermission("factions.show.bypassexempt")
-                && FactionsPlugin.getInstance().getConfig().getStringList("show-exempt").contains(faction.getTag())) {
+                && instance.getConfig().getStringList("show-exempt").contains(faction.getTag())) {
             context.msg(TL.COMMAND_SHOW_EXEMPT);
             return;
         }
@@ -62,7 +67,7 @@ public class CmdShow extends FCommand {
             return;
         }
 
-        List<String> show = FactionsPlugin.getInstance().getConfig().getStringList("show");
+        List<String> show = instance.getConfig().getStringList("show");
         if (show == null || show.isEmpty())
             show = defaults;
 
@@ -71,41 +76,49 @@ public class CmdShow extends FCommand {
             // send header and that's all
             String header = show.get(0);
             if (TagReplacer.HEADER.contains(header)) {
-                context.msg(FactionsPlugin.getInstance().txt.titleize(tag));
+                context.msg(instance.txt.titleize(tag));
             } else {
-                context.msg(FactionsPlugin.getInstance().txt.parse(TagReplacer.FACTION.replace(header, tag)));
+                context.msg(instance.txt.parse(TagReplacer.FACTION.replace(header, tag)));
             }
             return; // we only show header for non-normal factions
         }
 
-        for (String raw : show) {
-            String parsed = TagUtil.parsePlain(faction, context.fPlayer, raw); // use relations
-            if (parsed == null) {
-                continue; // Due to minimal f show.
-            }
-
-            if (context.fPlayer != null) {
-                parsed = TagUtil.parsePlaceholders(context.fPlayer.getPlayer(), parsed);
-            }
-
-            if (TagUtil.hasFancy(parsed)) {
-                List<FancyMessage> fancy = TagUtil.parseFancy(faction, context.fPlayer, parsed);
-                if (fancy != null)
-                    context.sendFancyMessage(fancy);
-
-                continue;
-            }
-            if (!parsed.contains("{notFrozen}") && !parsed.contains("{notPermanent}")) {
-                if (parsed.contains("{ig}")) {
-                    // replaces all variables with no home TL
-                    parsed = parsed.substring(0, parsed.indexOf("{ig}")) + TL.COMMAND_SHOW_NOHOME.toString();
+        List<FancyMessage> fancy = new ArrayList<>();
+        List<String> finalShow = show;
+        Faction finalFaction = faction;
+        instance.getServer().getScheduler().runTaskAsynchronously(instance, () -> {
+            for (String raw : finalShow) {
+                String parsed = TagUtil.parsePlain(finalFaction, context.fPlayer, raw); // use relations
+                if (parsed == null) {
+                    continue; // Due to minimal f show.
                 }
-                if (parsed.contains("%")) {
-                    parsed = parsed.replaceAll("%", ""); // Just in case it got in there before we disallowed it.
+
+                if (context.fPlayer != null) {
+                    parsed = TagUtil.parsePlaceholders(context.fPlayer.getPlayer(), parsed);
+                }
+
+                if (TagUtil.hasFancy(parsed)) {
+                    List<FancyMessage> localFancy = TagUtil.parseFancy(finalFaction, context.fPlayer, parsed);
+                    if (localFancy != null)
+                        fancy.addAll(localFancy);
+
+                    continue;
+                }
+                if (!parsed.contains("{notFrozen}") && !parsed.contains("{notPermanent}")) {
+                    if (parsed.contains("{ig}")) {
+                        // replaces all variables with no home TL
+                        parsed = parsed.substring(0, parsed.indexOf("{ig}")) + TL.COMMAND_SHOW_NOHOME.toString();
+                    }
+                    if (parsed.contains("%")) {
+                        parsed = parsed.replace("%", ""); // Just in case it got in there before we disallowed it.
+                    }
+                    parsed = FactionsPlugin.getInstance().txt.parse(parsed);
+                    FancyMessage localFancy = instance.txt.parseFancy(parsed);
+                    fancy.add(localFancy);
                 }
-                context.msg(FactionsPlugin.getInstance().txt.parse(parsed));
             }
-        }
+            instance.getServer().getScheduler().runTask(instance, () -> context.sendFancyMessage(fancy));
+        });
     }
 
     @Override

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

@@ -30,9 +30,7 @@ public class CmdTpBanner extends FCommand {
 
         if (FactionsBlockListener.bannerLocations.containsKey(context.fPlayer.getTag())) {
             context.msg(TL.COMMAND_TPBANNER_SUCCESS);
-            context.doWarmUp(WarmUpUtil.Warmup.BANNER, TL.WARMUPS_NOTIFY_TELEPORT, "Banner", () -> {
-                context.player.teleport(FactionsBlockListener.bannerLocations.get(context.fPlayer.getTag()));
-            }, FactionsPlugin.getInstance().getConfig().getLong("warmups.f-banner", 0));
+            context.doWarmUp(WarmUpUtil.Warmup.BANNER, TL.WARMUPS_NOTIFY_TELEPORT, "Banner", () -> context.player.teleport(FactionsBlockListener.bannerLocations.get(context.fPlayer.getTag())), FactionsPlugin.getInstance().getConfig().getLong("warmups.f-banner", 0));
         } else {
             context.msg(TL.COMMAND_TPBANNER_NOTSET);
         }

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

@@ -33,12 +33,8 @@ public class CmdUnban extends FCommand {
             return; // the above method sends a message if fails to find someone.
         }
 
-        if (target.getFaction() != context.fPlayer.getFaction()) {
-            if (target.getFaction().getAccess(context.fPlayer, PermissableAction.BAN) != Access.ALLOW) {
-                if (!context.fPlayer.isAdminBypassing()) {
+        if (target.getFaction() != context.fPlayer.getFaction() && target.getFaction().getAccess(context.fPlayer, PermissableAction.BAN) != Access.ALLOW && !context.fPlayer.isAdminBypassing()) {
                     context.fPlayer.msg(TL.COMMAND_UNBAN_TARGET_IN_OTHER_FACTION, target.getName());
-                }
-            }
         }
 
         if (!context.faction.isBanned(target)) {

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

@@ -70,13 +70,9 @@ public class CommandRequirements {
                     return false;
                 }
 
-                if (access != Access.ALLOW) {
-                    // They have undefined assert their role
-                    if (role != null && !context.fPlayer.getRole().isAtLeast(role)) {
-                        // They do not fullfill the role
-                        if (informIfNot) context.msg(TL.GENERIC_YOUMUSTBE, role.translation);
-                        return false;
-                    }
+                if (access != Access.ALLOW && role != null && !context.fPlayer.getRole().isAtLeast(role)) {
+                    if (informIfNot) context.msg(TL.GENERIC_YOUMUSTBE, role.translation);
+                    return false;
                 }
                 // They have been explicitly allowed
                 return true;

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

@@ -399,11 +399,9 @@ public class FCmdRoot extends FCommand implements CommandExecutor {
             addSubCommand(this.cmdFocus);
             fFocusEnabled = true;
         }
-        if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight", false) && !fFlyEnabled) {
+        if (FactionsPlugin.getInstance().getConfig().getBoolean("enable-faction-flight", true) && !fFlyEnabled) {
             this.addSubCommand(this.cmdFly);
             fFlyEnabled = true;
-            CmdFly.startFlyCheck();
-            CmdFly.startParticles();
         }
     }
 

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

@@ -44,7 +44,7 @@ public class CmdAltsList extends FCommand {
             return;
         }
 
-        if (faction.getAltPlayers().size() == 0) {
+        if (faction.getAltPlayers().isEmpty()) {
             context.msg(TL.COMMAND_ALTS_LIST_NOALTS, faction.getTag());
             return;
         }

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

@@ -114,7 +114,7 @@ public class FAuditMenu extends GUIMenu {
                         }
                         lore.add("");
                         lore.add(CC.Gray + "Click to toggle timestamp");
-                        setItem(slot++, (new ClickableItemStack((new ItemBuilder(Material.PAPER)).name(CC.GreenB + "Log #" + page).lore(lore).build())).setClickCallback((e) -> {
+                        setItem(slot++, (new ClickableItemStack((new ItemBuilder(Material.PAPER)).name(CC.GreenB + "Log #" + page).lore(lore).build())).setClickCallback(e -> {
                             e.setCancelled(true);
                             timeStamp = !timeStamp;
                             drawItems();
@@ -122,7 +122,7 @@ public class FAuditMenu extends GUIMenu {
                     }
                 }
             }
-            setItem(getSize() - 1, (new ClickableItemStack((new ItemBuilder(Material.ARROW)).name(CC.Green + "Previous Page").lore("", CC.Gray + "Click to view previous page!").build())).setClickCallback((event) -> {
+            setItem(getSize() - 1, (new ClickableItemStack((new ItemBuilder(Material.ARROW)).name(CC.Green + "Previous Page").lore("", CC.Gray + "Click to view previous page!").build())).setClickCallback(event -> {
                 event.setCancelled(true);
                 Bukkit.getScheduler().scheduleSyncDelayedTask(FactionsPlugin.instance, () -> (new FAuditMenu(player, faction)).open(player));
             }));

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

@@ -25,8 +25,6 @@ public class FLogManager {
     private Map<UUID, LogTimer> logTimers = new ConcurrentHashMap<>();
     private boolean saving = false;
 
-    public FLogManager() {
-    }
 
     public void log(Faction faction, FLogType type, String... arguments) {
         FactionLogs logs = factionLogMap.computeIfAbsent(faction.getId(), (n) -> new FactionLogs());
@@ -90,8 +88,7 @@ public class FLogManager {
         Faction faction = null;
 
         for (Map.Entry<UUID, LogTimer> uuidLogTimerEntry : getLogTimers().entrySet()) {
-            Map.Entry<UUID, LogTimer> timer = uuidLogTimerEntry;
-            LogTimer logTimer = timer.getValue();
+            LogTimer logTimer = uuidLogTimerEntry.getValue();
             if (faction == null) {
                 faction = Factions.getInstance().getFactionById(logTimer.getFactionId());
             }

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

@@ -65,11 +65,11 @@ public class FactionLogs {
                         }
                     }
                 }
-                if (logs.size() <= 0)
+                if (logs.isEmpty())
                     toRemove.add(logType);
             }
         });
-        toRemove.forEach((rem) -> mostRecentLogs.remove(rem));
+        toRemove.forEach(rem -> mostRecentLogs.remove(rem));
     }
 
     public Map<FLogType, LinkedList<FactionLog>> getMostRecentLogs() {

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

@@ -26,11 +26,11 @@ public class LogTimer extends ConcurrentHashMap<LogTimer.TimerType, Map<LogTimer
     }
 
     public Map<LogTimer.TimerSubType, LogTimer.Timer> getCurrentTimersOrCreate(LogTimer.TimerType type) {
-        return this.computeIfAbsent(type, (m) -> new ConcurrentHashMap<>());
+        return this.computeIfAbsent(type, m -> new ConcurrentHashMap<>());
     }
 
     public LogTimer.Timer attemptLog(LogTimer.TimerType type, LogTimer.TimerSubType subType, long increment) {
-        return this.getCurrentTimersOrCreate(type).computeIfAbsent(subType, (e) -> new Timer(System.currentTimeMillis(), 0L, null)).increment(increment);
+        return this.getCurrentTimersOrCreate(type).computeIfAbsent(subType, e -> new Timer(System.currentTimeMillis(), 0L, null)).increment(increment);
     }
 
     public void pushLogs(Faction faction, LogTimer.TimerType type) {

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

@@ -13,24 +13,19 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
 import org.bukkit.material.MaterialData;
+import org.jetbrains.annotations.NotNull;
 
 import java.text.SimpleDateFormat;
 import java.util.*;
 
 public class CheckHistoryFrame implements FactionGUI {
 
-    /**
-     * @author Driftay
-     */
-
-    private FactionsPlugin plugin;
     private Faction faction;
     private Inventory inventory;
     private SimpleDateFormat simpleDateFormat;
 
     public CheckHistoryFrame(FactionsPlugin plugin, Faction faction) {
         this.simpleDateFormat = new SimpleDateFormat(Conf.dateFormat);
-        this.plugin = plugin;
         this.faction = faction;
         this.inventory = plugin.getServer().createInventory(this, 54, TL.CHECK_HISTORY_GUI_TITLE.toString());
     }
@@ -88,6 +83,7 @@ public class CheckHistoryFrame implements FactionGUI {
         }
     }
 
+    @NotNull
     public Inventory getInventory() {
         return inventory;
     }

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

@@ -12,6 +12,7 @@ import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
+import org.jetbrains.annotations.NotNull;
 
 import java.util.Collections;
 
@@ -71,6 +72,7 @@ public class CheckSettingsFrame implements InventoryHolder, FactionGUI {
         inventory.setItem(FactionsPlugin.getInstance().getConfig().getInt("f-check.history.slot"), historyStack);
     }
 
+    @NotNull
     public Inventory getInventory() {
         return this.inventory;
     }
@@ -92,9 +94,6 @@ public class CheckSettingsFrame implements InventoryHolder, FactionGUI {
             case 15: {
                 return 30;
             }
-            case 30: {
-                return 0;
-            }
             default: {
                 return 0;
             }

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

@@ -11,14 +11,7 @@ import net.dv8tion.jda.core.entities.TextChannel;
 
 public class WeeWooTask implements Runnable {
 
-    /**
-     * @author Driftay
-     */
-
-    private FactionsPlugin plugin;
-
     public WeeWooTask(FactionsPlugin plugin) {
-        this.plugin = plugin;
     }
 
     @Override

src/main/java/com/massivecraft/factions/cmd/chest/AntiChestListener.java

@@ -27,22 +27,27 @@ public class AntiChestListener implements Listener {
         if (e.isCancelled()) return;
 
         Inventory clicked = e.getClickedInventory();
+        Inventory clicker = e.getWhoClicked().getInventory();
 
-        if (e.getClick().isShiftClick()) {
-            if (clicked == e.getWhoClicked().getInventory()) {
-                ItemStack clickedOn = e.getCurrentItem();
-                if (clickedOn != null && FactionsPlugin.getInstance().itemList.contains(clickedOn.getType().toString())) {
-                    fPlayer.msg(TL.CHEST_ITEM_DENIED_TRANSFER, clickedOn.getType().toString());
-                    e.setCancelled(true);
-                }
+        if (e.getClick().isShiftClick() && clicked == clicker) {
+            ItemStack clickedOn = e.getCurrentItem();
+            if (clickedOn != null && FactionsPlugin.getInstance().itemList.contains(clickedOn.getType().toString())) {
+                fPlayer.msg(TL.CHEST_ITEM_DENIED_TRANSFER, clickedOn.getType().toString());
+                e.setCancelled(true);
             }
         }
 
-        if (clicked != e.getWhoClicked().getInventory()) {
+        if (clicked != clicker) {
             ItemStack onCursor = e.getCursor();
             if (onCursor != null && FactionsPlugin.getInstance().itemList.contains(onCursor.getType().toString())) {
                 fPlayer.msg(TL.CHEST_ITEM_DENIED_TRANSFER, onCursor.getType().toString());
                 e.setCancelled(true);
+            } else if (e.getClick().isKeyboardClick()) {
+                ItemStack item = clicker.getItem(e.getHotbarButton());
+                if (item != null && FactionsPlugin.getInstance().itemList.contains(item.getType().toString())) {
+                    fPlayer.msg(TL.CHEST_ITEM_DENIED_TRANSFER, item.getType().toString());
+                    e.setCancelled(true);
+                }
             }
         }
     }

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

@@ -1,5 +1,6 @@
 package com.massivecraft.factions.cmd.claim;
 
+import com.massivecraft.factions.Board;
 import com.massivecraft.factions.FLocation;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FactionsPlugin;
@@ -25,7 +26,6 @@ public class CmdAutoClaim extends FCommand {
         super();
         this.aliases.addAll(Aliases.claim_auto);
 
-        //this.requiredArgs.add("");
         this.optionalArgs.put("faction", "your");
 
         this.requirements = new CommandRequirements.Builder(Permission.AUTOCLAIM)
@@ -38,13 +38,9 @@ public class CmdAutoClaim extends FCommand {
     public void perform(CommandContext context) {
         Faction forFaction = context.argAsFaction(0, context.faction);
 
-        if (forFaction != context.fPlayer.getFaction()) {
-            if (!context.fPlayer.isAdminBypassing()) {
-                if (forFaction.getAccess(context.fPlayer, PermissableAction.TERRITORY) != Access.ALLOW) {
-                    context.msg(TL.COMMAND_CLAIM_DENIED);
-                    return;
-                }
-            }
+        if (forFaction != context.fPlayer.getFaction() && !context.fPlayer.isAdminBypassing() && forFaction.getAccess(context.fPlayer, PermissableAction.TERRITORY) != Access.ALLOW) {
+            context.msg(TL.COMMAND_CLAIM_DENIED);
+            return;
         }
 
         if (forFaction == null || forFaction == context.fPlayer.getAutoClaimFor()) {
@@ -62,11 +58,15 @@ public class CmdAutoClaim extends FCommand {
 
             return;
         }
-
+        Faction at = Board.getInstance().getFactionAt(new FLocation(context.fPlayer.getPlayer().getLocation()));
         context.fPlayer.setAutoClaimFor(forFaction);
         FactionsPlugin.instance.logFactionEvent(forFaction, FLogType.CHUNK_CLAIMS, context.fPlayer.getName(), CC.GreenB + "CLAIMED", "1", new FLocation(context.fPlayer.getPlayer().getLocation()).formatXAndZ(","));
         context.msg(TL.COMMAND_AUTOCLAIM_ENABLED, forFaction.describeTo(context.fPlayer));
-        context.fPlayer.attemptClaim(forFaction, context.fPlayer.getPlayer().getLocation(), true);
+        if (FactionsPlugin.cachedRadiusClaim && context.fPlayer.attemptClaim(forFaction, context.player.getLocation(), true)) {
+            context.fPlayer.getFaction().getFPlayersWhereOnline(true).forEach(f -> f.msg(TL.CLAIM_CLAIMED, context.fPlayer.describeTo(f, true), context.fPlayer.getFaction().describeTo(f), at.describeTo(f)));
+        } else {
+            context.fPlayer.attemptClaim(forFaction, context.fPlayer.getPlayer().getLocation(), true);
+        }
     }
 
     @Override

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

@@ -1,9 +1,6 @@
 package com.massivecraft.factions.cmd.claim;
 
-import com.massivecraft.factions.Conf;
-import com.massivecraft.factions.FLocation;
-import com.massivecraft.factions.Faction;
-import com.massivecraft.factions.FactionsPlugin;
+import com.massivecraft.factions.*;
 import com.massivecraft.factions.cmd.Aliases;
 import com.massivecraft.factions.cmd.CommandContext;
 import com.massivecraft.factions.cmd.CommandRequirements;
@@ -44,13 +41,9 @@ public class CmdClaim extends FCommand {
         int radius = context.argAsInt(0, 1); // Default to 1
         final Faction forFaction = context.argAsFaction(1, context.faction); // Default to own
 
-        if (!context.fPlayer.isAdminBypassing()) {
-            if (!(context.fPlayer.getFaction().equals(forFaction) && context.fPlayer.getRole() == Role.LEADER)) {
-                if (forFaction.getAccess(context.fPlayer, PermissableAction.TERRITORY) != Access.ALLOW) {
-                    context.msg(TL.COMMAND_CLAIM_DENIED);
-                    return;
-                }
-            }
+        if (!context.fPlayer.isAdminBypassing() && !(context.fPlayer.getFaction().equals(forFaction) && context.fPlayer.getRole() == Role.LEADER) && forFaction.getAccess(context.fPlayer, PermissableAction.TERRITORY) != Access.ALLOW) {
+            context.msg(TL.COMMAND_CLAIM_DENIED);
+            return;
         }
 
 
@@ -59,8 +52,14 @@ public class CmdClaim extends FCommand {
             return;
         }
 
+        Faction at = Board.getInstance().getFactionAt(new FLocation(context.fPlayer.getPlayer().getLocation()));
+
         if (radius < 2) {
-            // single chunk
+            if (FactionsPlugin.cachedRadiusClaim && context.fPlayer.attemptClaim(forFaction, context.player.getLocation(), false)) {
+                context.fPlayer.getFaction().getFPlayersWhereOnline(true).forEach(f -> f.msg(TL.CLAIM_CLAIMED, context.fPlayer.describeTo(f, true), context.fPlayer.getFaction().describeTo(f), at.describeTo(f)));
+                FactionsPlugin.instance.logFactionEvent(forFaction, FLogType.CHUNK_CLAIMS, context.fPlayer.getName(), CC.GreenB + "CLAIMED", "1", (new FLocation(context.fPlayer.getPlayer().getLocation())).formatXAndZ(","));
+                return;
+            }
             context.fPlayer.attemptClaim(forFaction, context.player.getLocation(), true);
             FactionsPlugin.instance.logFactionEvent(forFaction, FLogType.CHUNK_CLAIMS, context.fPlayer.getName(), CC.GreenB + "CLAIMED", "1", (new FLocation(context.fPlayer.getPlayer().getLocation())).formatXAndZ(","));
         } else {
@@ -68,16 +67,17 @@ public class CmdClaim extends FCommand {
             if (!Permission.CLAIM_RADIUS.has(context.sender, true)) {
                 return;
             }
-
             new SpiralTask(new FLocation(context.player), radius) {
                 private final int limit = Conf.radiusClaimFailureLimit - 1;
                 private int failCount = 0;
+                private int successfulClaims = 0;
 
                 @Override
                 public boolean work() {
                     boolean success = context.fPlayer.attemptClaim(forFaction, this.currentLocation(), true);
                     if (success) {
                         failCount = 0;
+                        successfulClaims++;
                         FactionsPlugin.instance.logFactionEvent(forFaction, FLogType.CHUNK_CLAIMS, context.fPlayer.getName(), CC.GreenB + "CLAIMED", "1", (new FLocation(context.fPlayer.getPlayer().getLocation())).formatXAndZ(","));
                     } else if (failCount++ >= limit) {
                         this.stop();
@@ -85,6 +85,14 @@ public class CmdClaim extends FCommand {
                     }
                     return true;
                 }
+
+                @Override
+                public void finish() {
+                    if (FactionsPlugin.cachedRadiusClaim && successfulClaims > 0) {
+                        context.fPlayer.getFaction().getFPlayersWhereOnline(true).forEach(f -> f.msg(TL.CLAIM_RADIUS_CLAIM, context.fPlayer.describeTo(f, true), String.valueOf(successfulClaims), context.fPlayer.getPlayer().getLocation().getChunk().getX(), context.fPlayer.getPlayer().getLocation().getChunk().getZ()));
+                        stop();
+                    }
+                }
             };
         }
     }

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

@@ -2,6 +2,7 @@ package com.massivecraft.factions.cmd.claim;
 
 import com.massivecraft.factions.Board;
 import com.massivecraft.factions.FLocation;
+import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.cmd.Aliases;
 import com.massivecraft.factions.cmd.CommandContext;
@@ -39,6 +40,15 @@ public class CmdClaimAt extends FCommand {
         int x = context.argAsInt(1);
         int z = context.argAsInt(2);
         FLocation location = new FLocation(context.argAsString(0), x, z);
+
+        Faction at = Board.getInstance().getFactionAt(new FLocation(context.fPlayer.getPlayer().getLocation()));
+
+        if (FactionsPlugin.cachedRadiusClaim && context.fPlayer.attemptClaim(context.fPlayer.getFaction(), context.player.getLocation(), true)) {
+            context.fPlayer.getFaction().getFPlayersWhereOnline(true).forEach(f -> f.msg(TL.CLAIM_CLAIMED, context.fPlayer.describeTo(f, true), context.fPlayer.getFaction().describeTo(f), at.describeTo(f)));
+            FactionsPlugin.instance.logFactionEvent(context.fPlayer.getFaction(), FLogType.CHUNK_CLAIMS, context.fPlayer.getName(), CC.GreenB + "CLAIMED", "1", (new FLocation(context.fPlayer.getPlayer().getLocation())).formatXAndZ(","));
+            showMap(context);
+            return;
+        }
         context.fPlayer.attemptClaim(context.faction, location, true);
         FactionsPlugin.instance.logFactionEvent(context.fPlayer.getFaction(), FLogType.CHUNK_CLAIMS, context.fPlayer.getName(), CC.GreenB + "CLAIMED", "1", (location).formatXAndZ(","));
         showMap(context);

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

@@ -1,9 +1,6 @@
 package com.massivecraft.factions.cmd.claim;
 
-import com.massivecraft.factions.Conf;
-import com.massivecraft.factions.FLocation;
-import com.massivecraft.factions.Faction;
-import com.massivecraft.factions.FactionsPlugin;
+import com.massivecraft.factions.*;
 import com.massivecraft.factions.cmd.Aliases;
 import com.massivecraft.factions.cmd.CommandContext;
 import com.massivecraft.factions.cmd.CommandRequirements;
@@ -72,23 +69,26 @@ public class CmdClaimLine extends FCommand {
 
         final Faction forFaction = context.argAsFaction(2, context.faction);
 
-        if (forFaction != context.fPlayer.getFaction()) {
-            if (!context.fPlayer.isAdminBypassing()) {
-                if (forFaction.getAccess(context.fPlayer, PermissableAction.TERRITORY) != Access.ALLOW) {
+        if (forFaction != context.fPlayer.getFaction() && !context.fPlayer.isAdminBypassing() && forFaction.getAccess(context.fPlayer, PermissableAction.TERRITORY) != Access.ALLOW) {
                     context.msg(TL.COMMAND_CLAIM_DENIED);
                     return;
-                }
-            }
         }
 
         Location location = context.player.getLocation();
 
         // TODO: make this a task like claiming a radius?
+        int claims = 0;
+
         for (int i = 0; i < amount; i++) {
-            context.fPlayer.attemptClaim(forFaction, location, true);
-            location = location.add(blockFace.getModX() * 16, 0, blockFace.getModZ() * 16);
+            if (!FactionsPlugin.cachedRadiusClaim || !context.fPlayer.attemptClaim(forFaction, context.player.getLocation(), false)) {
+                context.fPlayer.attemptClaim(forFaction, location, true);
+            }
+            claims++;
+            location = location.add(blockFace.getModX() * 16D, 0, blockFace.getModZ() * 16D);
             FactionsPlugin.instance.logFactionEvent(forFaction, FLogType.CHUNK_CLAIMS, context.fPlayer.getName(), CC.GreenB + "CLAIMED", String.valueOf(i), new FLocation(context.player.getLocation()).formatXAndZ(","));
         }
+        int cachedClaims = claims;
+        context.fPlayer.getFaction().getFPlayersWhereOnline(true).forEach(f -> f.msg(TL.CLAIM_RADIUS_CLAIM, context.fPlayer.describeTo(f, true), String.valueOf(cachedClaims), context.fPlayer.getPlayer().getLocation().getChunk().getX(), context.fPlayer.getPlayer().getLocation().getChunk().getZ()));
     }
 
     @Override

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

@@ -8,7 +8,6 @@ import com.massivecraft.factions.cmd.CommandContext;
 import com.massivecraft.factions.cmd.CommandRequirements;
 import com.massivecraft.factions.cmd.FCommand;
 import com.massivecraft.factions.cmd.audit.FLogType;
-import com.massivecraft.factions.iface.EconomyParticipator;
 import com.massivecraft.factions.integration.Econ;
 import com.massivecraft.factions.struct.Permission;
 import com.massivecraft.factions.struct.Role;
@@ -44,23 +43,21 @@ public class CmdMoneyWithdraw extends FCommand {
             return;
         }
 
-        EconomyParticipator faction = context.argAsFaction(1, context.faction);
+        Faction faction = context.argAsFaction(1, context.faction);
         if (faction == null) {
             return;
         }
 
         Access access = context.faction.getAccess(context.fPlayer, PermissableAction.WITHDRAW);
-        if (context.fPlayer.getRole() != Role.LEADER) {
-            if (access == Access.DENY) {
-                context.msg(TL.GENERIC_NOPERMISSION, "withdraw", "withdraw money from the bank");
-                return;
-            }
+        if (context.fPlayer.getRole() != Role.LEADER && access == Access.DENY) {
+            context.msg(TL.GENERIC_NOPERMISSION, "withdraw", "withdraw money from the bank");
+            return;
         }
         boolean success = Econ.transferMoney(context.fPlayer, faction, context.fPlayer, amount);
 
         if (success && Conf.logMoneyTransactions) {
             FactionsPlugin.getInstance().log(ChatColor.stripColor(FactionsPlugin.getInstance().txt.parse(TL.COMMAND_MONEYWITHDRAW_WITHDRAW.toString(), context.fPlayer.getName(), Econ.moneyString(amount), faction.describeTo(null))));
-            FactionsPlugin.instance.logFactionEvent((Faction) faction, FLogType.BANK_EDIT, context.fPlayer.getName(), CC.RedB + "WITHDREW", amount + "");
+            FactionsPlugin.instance.logFactionEvent(faction, FLogType.BANK_EDIT, context.fPlayer.getName(), CC.RedB + "WITHDREW", amount + "");
         }
     }
 

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

@@ -37,31 +37,29 @@ public class CmdGrace extends FCommand {
             return;
         }
 
-        if(context.args.size() == 1) {
-            if (context.sender.hasPermission(String.valueOf(Permission.GRACETOGGLE))) {
-                if (context.argAsString(0).equalsIgnoreCase("on") || context.argAsString(0).equalsIgnoreCase("start")) {
-                    FactionsPlugin.getInstance().getTimerManager().graceTimer.setPaused(false);
-                    FactionsPlugin.getInstance().getTimerManager().graceTimer.setRemaining(TimeUnit.DAYS.toMillis(Conf.gracePeriodTimeDays), true);
-                    if (Conf.broadcastGraceToggles) {
-                        for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers())
-                            follower.msg(TL.COMMAND_GRACE_ENABLED_FORMAT, String.valueOf(TimerManager.getRemaining(FactionsPlugin.getInstance().getTimerManager().graceTimer.getRemaining(), true)));
-                    }
-                    return;
+        if (context.args.size() == 1 && context.sender.hasPermission(String.valueOf(Permission.GRACETOGGLE))) {
+            if (context.argAsString(0).equalsIgnoreCase("on") || context.argAsString(0).equalsIgnoreCase("start")) {
+                FactionsPlugin.getInstance().getTimerManager().graceTimer.setPaused(false);
+                FactionsPlugin.getInstance().getTimerManager().graceTimer.setRemaining(TimeUnit.DAYS.toMillis(Conf.gracePeriodTimeDays), true);
+                if (Conf.broadcastGraceToggles) {
+                    for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers())
+                        follower.msg(TL.COMMAND_GRACE_ENABLED_FORMAT, String.valueOf(TimerManager.getRemaining(FactionsPlugin.getInstance().getTimerManager().graceTimer.getRemaining(), true)));
                 }
+                return;
+            }
 
-                if (context.argAsString(0).equalsIgnoreCase("off") || context.argAsString(0).equalsIgnoreCase("stop")) {
-                    FactionsPlugin.getInstance().getTimerManager().graceTimer.setRemaining(TimeUnit.SECONDS.toMillis(0L), true);
-                    FactionsPlugin.getInstance().getTimerManager().graceTimer.setPaused(false);
-                    if (Conf.broadcastGraceToggles) {
-                        for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers())
-                            follower.msg(TL.COMMAND_GRACE_DISABLED_FORMAT);
-                    }
-                    return;
+            if (context.argAsString(0).equalsIgnoreCase("off") || context.argAsString(0).equalsIgnoreCase("stop")) {
+                FactionsPlugin.getInstance().getTimerManager().graceTimer.setRemaining(TimeUnit.SECONDS.toMillis(0L), true);
+                FactionsPlugin.getInstance().getTimerManager().graceTimer.setPaused(false);
+                if (Conf.broadcastGraceToggles) {
+                    for (FPlayer follower : FPlayers.getInstance().getOnlinePlayers())
+                        follower.msg(TL.COMMAND_GRACE_DISABLED_FORMAT);
                 }
+                return;
             }
         }
 
-        if(FactionsPlugin.getInstance().getTimerManager().graceTimer.getRemaining() <= 0L) {
+        if (FactionsPlugin.getInstance().getTimerManager().graceTimer.getRemaining() <= 0L) {
             context.fPlayer.msg(TL.COMMAND_GRACE_DISABLED_NO_FORMAT.toString());
         } else {
             context.fPlayer.msg(TL.COMMAND_GRACE_TIME_REMAINING, String.valueOf(TimerManager.getRemaining(FactionsPlugin.getInstance().getTimerManager().graceTimer.getRemaining(), true)));

src/main/java/com/massivecraft/factions/cmd/logout/LogoutHandler.java

@@ -15,10 +15,8 @@ public class LogoutHandler {
 
     public static Map<String, LogoutHandler> factionDatas = new HashMap<>();
     private Map<UUID, Long> logoutCooldown = new HashMap<>();
-    private String name;
 
     public LogoutHandler(String name) {
-        this.name = name;
         factionDatas.put(name, this);
     }
 

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

@@ -39,9 +39,9 @@ public abstract class FRelationCommand extends FCommand {
     @Override
     public void perform(CommandContext context) {
         Faction them = context.argAsFaction(0);
-        if (them == null) {
-            return;
-        }
+        if (them == null) return;
+
+        if (!context.faction.isNormal()) return;
 
         if (!them.isNormal()) {
             context.msg(TL.COMMAND_RELATIONS_ALLTHENOPE);
@@ -112,16 +112,14 @@ public abstract class FRelationCommand extends FCommand {
 
     private boolean hasMaxRelations(Faction us, Faction them, Relation targetRelation) {
         int max = FactionsPlugin.getInstance().getConfig().getInt("max-relations." + targetRelation.toString(), -1);
-        if (FactionsPlugin.getInstance().getConfig().getBoolean("max-relations.enabled", false)) {
-            if (max != -1) {
-                if (us.getRelationCount(targetRelation) >= max) {
-                    us.msg(TL.COMMAND_RELATIONS_EXCEEDS_ME, max, targetRelation.getPluralTranslation());
-                    return true;
-                }
-                if (them.getRelationCount(targetRelation) >= max) {
-                    them.msg(TL.COMMAND_RELATIONS_EXCEEDS_THEY, max, targetRelation.getPluralTranslation());
-                    return true;
-                }
+        if (FactionsPlugin.getInstance().getConfig().getBoolean("max-relations.enabled", false) && max != -1) {
+            if (us.getRelationCount(targetRelation) >= max) {
+                us.msg(TL.COMMAND_RELATIONS_EXCEEDS_ME, max, targetRelation.getPluralTranslation());
+                return true;
+            }
+            if (them.getRelationCount(targetRelation) >= max) {
+                them.msg(TL.COMMAND_RELATIONS_EXCEEDS_THEY, max, targetRelation.getPluralTranslation());
+                return true;
             }
         }
         return false;

src/main/java/com/massivecraft/factions/cmd/roles/FPromoteCommand.java

@@ -57,6 +57,16 @@ public class FPromoteCommand extends FCommand {
                 context.msg(TL.COMMAND_PROMOTE_NOT_SAME);
                 return;
             }
+            // Don't allow people to promote people with same or higher rank than their.
+            if (context.fPlayer.getRole().value <= target.getRole().value) {
+                context.msg(TL.COMMAND_PROMOTE_HIGHER_RANK, target.getName());
+                return;
+            }
+            // Don't allow people to demote people who already have the lowest rank.
+            if (current.value == 0 && relative <= 0) {
+                context.msg(TL.COMMAND_PROMOTE_LOWEST_RANK, target.getName());
+                return;
+            }
             // Don't allow people to promote people to their same or higher rank.
             if (context.fPlayer.getRole().value <= promotion.value) {
                 context.msg(TL.COMMAND_PROMOTE_NOT_ALLOWED);
@@ -64,11 +74,20 @@ public class FPromoteCommand extends FCommand {
             }
         }
 
-        if (promotion == null) {
-            context.msg(TL.COMMAND_PROMOTE_NOTTHATPLAYER);
+        if(target.isAlt()){
             return;
         }
 
+        // Don't allow people to demote people who already have the lowest rank.
+        if (current.value == 0 && relative <= 0) {
+            context.msg(TL.COMMAND_PROMOTE_LOWEST_RANK, target.getName());
+            return;
+        }
+        // Don't allow people to promote people who already have the highest rank.
+        if (current.value == 4 && relative > 0) {
+            context.msg(TL.COMMAND_PROMOTE_HIGHEST_RANK, target.getName());
+            return;
+        }
         // Don't allow people to promote people to their same or higher rnak.
         if (context.fPlayer.getRole().value <= promotion.value) {
             context.msg(TL.COMMAND_PROMOTE_NOT_ALLOWED);

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

@@ -11,7 +11,6 @@ import com.massivecraft.factions.util.wait.WaitedTask;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
-import org.bukkit.World;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent;
@@ -20,16 +19,16 @@ import org.bukkit.potion.PotionEffectType;
 
 import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Objects;
 import java.util.Random;
 
 /**
  * @author DroppingAnvil
  */
 public class CmdWild extends FCommand implements WaitedTask {
-    public static HashMap<Player, String> teleportRange;
-    public static HashSet<Player> teleporting;
+    public static HashMap<Player, String> teleportRange = new HashMap<>();
+    public static HashSet<Player> teleporting = new HashSet<>();
     public static CmdWild instance;
-    public static final String tpWorld = FactionsPlugin.getInstance().getConfig().getString("Wild.World", "World");
 
     public CmdWild() {
         super();
@@ -38,16 +37,12 @@ public class CmdWild extends FCommand implements WaitedTask {
         this.requirements = new CommandRequirements.Builder(Permission.WILD)
                 .playerOnly()
                 .build();
-        teleporting = new HashSet<>();
-        teleportRange = new HashMap<>();
-    }
+      }
 
     @Override
     public void perform(CommandContext context) {
         if (!teleportRange.containsKey(context.player)) {
             context.player.openInventory(new WildGUI(context.player, context.fPlayer).getInventory());
-        } else {
-            context.fPlayer.msg(TL.COMMAND_WILD_WAIT);
         }
     }
 
@@ -57,11 +52,12 @@ public class CmdWild extends FCommand implements WaitedTask {
         int tries = 0;
         ConfigurationSection c = FactionsPlugin.getInstance().getConfig().getConfigurationSection("Wild.Zones." + teleportRange.get(p));
         while (tries < 5) {
+            assert c != null;
             int x = new Random().nextInt((c.getInt("Range.MaxX") - c.getInt("Range.MinX")) + 1) + c.getInt("Range.MinX");
             int z = new Random().nextInt((c.getInt("Range.MaxZ") - c.getInt("Range.MinZ")) + 1) + c.getInt("Range.MinZ");
             if (Board.getInstance().getFactionAt(new FLocation(p.getWorld().getName(), x, z)).isWilderness()) {
                 success = true;
-                FLocation loc = new FLocation(tpWorld, x, z);
+                FLocation loc = new FLocation(Objects.requireNonNull(c.getString("World", "World")), x, z);
                 teleportRange.remove(p);
                 if (!FPlayers.getInstance().getByPlayer(p).takeMoney(c.getInt("Cost"))) {
                     p.sendMessage(TL.GENERIC_NOTENOUGHMONEY.toString());
@@ -75,15 +71,16 @@ public class CmdWild extends FCommand implements WaitedTask {
         }
         if (!success) {
             p.sendMessage(TL.COMMAND_WILD_FAILED.toString());
+            teleportRange.remove(p);
         }
     }
 
     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());
+            finalLoc = new Location(loc.getWorld(), loc.getX(), loc.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());
+            finalLoc = new Location(loc.getWorld(), loc.getX(), loc.getWorld().getHighestBlockYAt(Math.round(loc.getX()), Math.round(loc.getZ())), loc.getZ());
         }
         p.teleport(finalLoc, PlayerTeleportEvent.TeleportCause.PLUGIN);
         setTeleporting(p);
@@ -92,7 +89,7 @@ public class CmdWild extends FCommand implements WaitedTask {
 
     public void applyEffects(Player p) {
         for (String s : FactionsPlugin.getInstance().getConfig().getStringList("Wild.Arrival.Effects")) {
-            p.addPotionEffect(new PotionEffect(PotionEffectType.getByName(s), 40, 1));
+            p.addPotionEffect(new PotionEffect(Objects.requireNonNull(PotionEffectType.getByName(s)), 40, 1));
         }
     }
 
@@ -114,6 +111,6 @@ public class CmdWild extends FCommand implements WaitedTask {
     @Override
     public void handleFailure(Player player) {
         player.sendMessage(TL.COMMAND_WILD_INTERUPTED.toString());
+        teleportRange.remove(player);
     }
-
-}
+}

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

@@ -60,7 +60,8 @@ public class WildGUI implements FactionGUI {
             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")).get().parseItem();
+            ItemStack zoneItem = XMaterial.matchXMaterial(Objects.requireNonNull(FactionsPlugin.getInstance().getConfig().getString("Wild.Zones." + key + ".Material"))).get().parseItem();
+            assert zoneItem != null;
             ItemMeta zoneMeta = zoneItem.getItemMeta();
             if (zoneMeta == null) return;
             List<String> lore = new ArrayList<>();

src/main/java/com/massivecraft/factions/discord/CmdSetGuild.java

@@ -60,17 +60,17 @@ public class CmdSetGuild extends FCommand {
 
                 if (guild == null) {
                     context.msg(TL.SET_GUILD_ID_INVALID_ID);
-                } else if (Factions.getInstance().getAllFactions().stream().anyMatch((f) -> guildId.equals(f.getGuildId()))) {
+                } else if (Factions.getInstance().getAllFactions().stream().anyMatch(f -> guildId.equals(f.getGuildId()))) {
                     context.msg(TL.SET_GUILD_ID_GUILD_ALREADY_LINKED);
                 } else {
                     context.msg(TL.SET_GUILD_ID_PMING_OWNER);
                     User user = guild.getOwner().getUser();
                     Guild finalGuild = guild;
                     Guild finalGuild1 = guild;
-                    user.openPrivateChannel().queue((privateChannel) -> privateChannel.sendMessage("Link guild **" + finalGuild1.getName() + "** to faction **" + ChatColor.stripColor(faction.getTag()) + "**?").queue((message) -> {
+                    user.openPrivateChannel().queue(privateChannel -> privateChannel.sendMessage("Link guild **" + finalGuild1.getName() + "** to faction **" + ChatColor.stripColor(faction.getTag()) + "**?").queue(message -> {
                         String checkMark = "✅";
                         message.addReaction(checkMark).queue();
-                        this.eventWaiter.waitForEvent(PrivateMessageReactionAddEvent.class, (event) -> event.getReactionEmote().getName().equals(checkMark) && event.getUser().getId().equals(user.getId()) && event.getMessageId().equals(message.getId()), (event) -> {
+                        this.eventWaiter.waitForEvent(PrivateMessageReactionAddEvent.class, event -> event.getReactionEmote().getName().equals(checkMark) && event.getUser().getId().equals(user.getId()) && event.getMessageId().equals(message.getId()), event -> {
                             faction.setGuildId(context.argAsString(0));
                             context.msg(TL.SET_GUILD_ID_SUCCESS);
                             privateChannel.sendMessage("Successfully linked **" + finalGuild.getName() + " & " + ChatColor.stripColor(faction.getTag()) + "**").queue();
@@ -78,9 +78,7 @@ public class CmdSetGuild extends FCommand {
                             privateChannel.sendMessage(TL.SET_GUILD_ID_TIMED_OUT_DISCORD.toString()).queue();
                             context.msg(TL.SET_GUILD_ID_TIMED_OUT_MINECRAFT);
                         });
-                    }, (t) -> {
-                        context.msg(TL.SET_GUILD_ID_UNABLE_TO_MESSAGE_GUILD_OWNER);
-                    }), (t) -> context.msg(TL.SET_GUILD_ID_UNABLE_TO_MESSAGE_GUILD_OWNER));
+                    }, t -> context.msg(TL.SET_GUILD_ID_UNABLE_TO_MESSAGE_GUILD_OWNER)), t -> context.msg(TL.SET_GUILD_ID_UNABLE_TO_MESSAGE_GUILD_OWNER));
                 }
             } else {
                 faction.setGuildId(null);

src/main/java/com/massivecraft/factions/discord/Discord.java

@@ -31,7 +31,7 @@ public class Discord {
     public static Boolean confUseDiscord;
     public static String botToken;
     public static String mainGuildID;
-    public static Boolean useDiscord;
+    public static boolean useDiscord;
     public static java.awt.Color roleColor;
     public static Guild mainGuild;
     public static Role leader;
@@ -53,13 +53,11 @@ public class Discord {
      * Called to reload variables and if needed start JDA
      */
     public static void setupDiscord() {
-        if (jda == null) {
-            if (startBot()) {
-                varSetup();
-                jda.addEventListener(new FactionChatHandler(plugin));
-                jda.addEventListener(new DiscordListener(plugin));
-                return;
-            }
+        if (jda == null && startBot()) {
+            varSetup();
+            jda.addEventListener(new FactionChatHandler(plugin));
+            jda.addEventListener(new DiscordListener(plugin));
+            return;
         }
         varSetup();
     }
@@ -84,6 +82,7 @@ public class Discord {
             confUseDiscord = Conf.useDiscordSystem;
             botToken = Conf.discordBotToken;
             if (jda != null && Conf.leaderRoles || Conf.factionDiscordTags) {
+                assert jda != null;
                 mainGuild = jda.getGuildById(Conf.mainGuildID);
             } else {
                 mainGuild = null;
@@ -151,12 +150,9 @@ public class Discord {
      * @param s String target Faction tag
      * @return
      */
-    public static Boolean doesFactionRoleExist(String s) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(Conf.factionRolePrefix);
-        sb.append(s);
-        sb.append(Conf.factionRoleSuffix);
-        return getRoleFromName(sb.toString()) != null;
+    public static boolean doesFactionRoleExist(String s) {
+        String sb = Conf.factionRolePrefix + s + Conf.factionRoleSuffix;
+        return getRoleFromName(sb) != null;
     }
 
     public static Role getRoleFromName(String s) {
@@ -189,7 +185,8 @@ public class Discord {
         sb.append(Conf.factionRoleSuffix);
         if (!doesFactionRoleExist(sb.toString())) {
             try {
-                Role newRole = mainGuild.getController().createRole()
+                Role newRole;
+                newRole = mainGuild.getController().createRole()
                         .setName(sb.toString())
                         .setColor(roleColor)
                         .setPermissions(Permission.EMPTY_PERMISSIONS)
@@ -211,11 +208,7 @@ public class Discord {
      * @return Name of would be Role
      */
     public static String getFactionRoleName(String tag) {
-        StringBuilder sb = new StringBuilder();
-        sb.append(Conf.factionRolePrefix);
-        sb.append(tag);
-        sb.append(Conf.factionRoleSuffix);
-        return sb.toString();
+        return Conf.factionRolePrefix + tag + Conf.factionRoleSuffix;
     }
 
     /**
@@ -224,7 +217,7 @@ public class Discord {
      * @param u User
      * @return Boolean
      */
-    public static Boolean isInMainGuild(User u) {
+    public static boolean isInMainGuild(User u) {
         if (mainGuild == null) return false;
         return mainGuild.getMember(u) == null ? Boolean.FALSE : Boolean.TRUE;
     }
@@ -252,10 +245,12 @@ public class Discord {
             if (fp.discordSetup() && isInMainGuild(fp.discordUser())) {
                 try {
                     Member m = mainGuild.getMember(fp.discordUser());
-                    if (Conf.factionDiscordTags) {
+                    boolean discordTags = Conf.factionDiscordTags;
+                    boolean factionRoles = Conf.factionRoles;
+                    if (discordTags) {
                         mainGuild.getController().setNickname(m, Discord.getNicknameString(fp)).queue();
                     }
-                    if (Conf.factionRoles) {
+                    if (factionRoles) {
                         mainGuild.getController().removeSingleRoleFromMember(m, Objects.requireNonNull(getRoleFromName(oldTag))).queue();
                         mainGuild.getController().addSingleRoleToMember(m, Objects.requireNonNull(createFactionRole(f.getTag()))).queue();
                     }

src/main/java/com/massivecraft/factions/discord/DiscordListener.java

@@ -37,7 +37,7 @@ public class DiscordListener extends ListenerAdapter {
         this.decimalFormat = new DecimalFormat("$#,###.##");
         this.plugin = plugin;
         int minute = 3600;
-        plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, DiscordListener::saveGuilds, minute * 15, minute * 15);
+        plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, DiscordListener::saveGuilds, minute * 15L, minute * 15L);
     }
 
     private static JSONGuilds loadGuilds() {
@@ -64,6 +64,7 @@ public class DiscordListener extends ListenerAdapter {
         }
     }
 
+    @Override
     public void onPrivateMessageReceived(PrivateMessageReceivedEvent e) {
         Integer i;
         if (e.getAuthor().isBot()) return;
@@ -85,6 +86,7 @@ public class DiscordListener extends ListenerAdapter {
         }
     }
 
+    @Override
     public void onGuildMessageReceived(GuildMessageReceivedEvent event) {
         try {
             if (event.getMessage().isWebhookMessage() || event.getAuthor().isBot()) return;

src/main/java/com/massivecraft/factions/discord/DiscordSetupAttempt.java

@@ -109,7 +109,7 @@ public class DiscordSetupAttempt {
         sb.append(inProcessTime);
         //Just a separator for looks
         sb.append(" ");
-        String s = "";
+        String s;
         switch (timeIndex) {
             case 0:
                 s = "MS";
@@ -129,6 +129,8 @@ public class DiscordSetupAttempt {
             case 5:
                 s = "Years";
                 break;
+            default:
+                throw new IllegalStateException("Unexpected value: " + timeIndex);
         }
         sb.append(s);
         sb.append(" ago");

src/main/java/com/massivecraft/factions/discord/FactionChatHandler.java

@@ -35,7 +35,7 @@ public class FactionChatHandler extends ListenerAdapter {
         this.plugin = plugin;
     }
 
-    public static void sendMessage(FactionsPlugin plugin, Faction faction, UUID uuid, String username, String message) {
+    public static void sendMessage(Faction faction, UUID uuid, String username, String message) {
         String factionsChatChannelId = faction.getFactionChatChannelId();
         String messageWithMentions = null;
         if (factionsChatChannelId == null || factionsChatChannelId.isEmpty()) return;

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

@@ -1,6 +1,5 @@
 package com.massivecraft.factions.event;
 
-import com.massivecraft.factions.Conf;
 import com.massivecraft.factions.FPlayer;
 import com.massivecraft.factions.Faction;
 import org.bukkit.event.Cancellable;
@@ -10,51 +9,20 @@ import org.bukkit.event.Cancellable;
  */
 public class PowerRegenEvent extends FactionPlayerEvent implements Cancellable {
 
-    /**
-     * @author Illyria Team
-     */
-
     private boolean cancelled = false;
-    private double modified = 0;
+    private double delta;
 
-    public PowerRegenEvent(Faction f, FPlayer p) {
+    public PowerRegenEvent(Faction f, FPlayer p, double delta) {
         super(f, p);
+        this.delta = delta;
     }
 
-    /**
-     * Get the amount of power this player will regen by default
-     *
-     * @return power amount gained as a Double.
-     */
-    public double getDefaultPowerGained() {
-        return fPlayer.getMillisPassed() * Conf.powerPerMinute / 60000;
+    public double getDelta() {
+        return delta;
     }
 
-    /**
-     * Get the amount of custom power this player will gain. Ignored if less than or equal to 0.
-     *
-     * @return Custom power as a double
-     */
-    public double getCustomPower() {
-        return modified;
-    }
-
-    /**
-     * Set the custom power gain for this event.
-     *
-     * @param gain Amount of power to be added to player.
-     */
-    public void setCustomPower(Double gain) {
-        modified = gain;
-    }
-
-    /**
-     * Get if we will be using the custom power gain instead of default.
-     *
-     * @return If we will process the event custom returned as a Boolean.
-     */
-    public boolean usingCustomPower() {
-        return modified > 0;
+    public void setDelta(double delta) {
+        this.delta = delta;
     }
 
     @Override
@@ -67,4 +35,4 @@ public class PowerRegenEvent extends FactionPlayerEvent implements Cancellable {
         this.cancelled = c;
     }
 
-}
+}

src/main/java/com/massivecraft/factions/integration/Econ.java

@@ -32,9 +32,8 @@ public class Econ {
     private static Economy econ = null;
 
     public static void setup() {
-        if (isSetup()) {
-            return;
-        }
+        if (isSetup()) return;
+
 
         String integrationFail = "Economy integration is " + (Conf.econEnabled ? "enabled, but" : "disabled, and") + " the plugin \"Vault\" ";
 
@@ -42,21 +41,14 @@ public class Econ {
             FactionsPlugin.getInstance().log(integrationFail + "is not installed.");
             return;
         }
-
         RegisteredServiceProvider<Economy> rsp = Bukkit.getServer().getServicesManager().getRegistration(Economy.class);
         if (rsp == null) {
             FactionsPlugin.getInstance().log(integrationFail + "is not hooked into an economy plugin.");
             return;
         }
         econ = rsp.getProvider();
-
         FactionsPlugin.getInstance().log("Economy integration through Vault plugin successful.");
-
-        if (!Conf.econEnabled) {
-            FactionsPlugin.getInstance().log("NOTE: Economy is disabled. You can enable it with the command: f config econEnabled true");
-        }
-
-        //FactionsPlugin.getInstance().cmdBase.cmdHelp.updateHelp();
+        if (!Conf.econEnabled) FactionsPlugin.getInstance().log("NOTE: Economy is disabled. You can enable it with the command: f config econEnabled true");
     }
 
     public static boolean shouldBeUsed() {
@@ -68,26 +60,24 @@ public class Econ {
     }
 
     public static void modifyUniverseMoney(double delta) {
-        if (!shouldBeUsed()) {
-            return;
-        }
-
-        if (Conf.econUniverseAccount == null) {
-            return;
-        }
-        if (Conf.econUniverseAccount.length() == 0) {
-            return;
-        }
-        if (!econ.hasAccount(Conf.econUniverseAccount)) {
-            return;
-        }
-
+        if (!shouldBeUsed()) return;
+        if (Conf.econUniverseAccount == null) return;
+        if (Conf.econUniverseAccount.length() == 0) return;
+        if (!econ.hasAccount(Conf.econUniverseAccount)) return;
         modifyBalance(Conf.econUniverseAccount, delta);
     }
 
+    public static void sendBalanceInfo(FPlayer to, EconomyParticipator about) {
+        if (!shouldBeUsed()) {
+            FactionsPlugin.instance.log(Level.WARNING, "Vault does not appear to be hooked into an economy plugin.");
+            return;
+        }
+        to.msg(TL.ECON_PLAYERBALANCE, about.describeTo(to, true), Econ.moneyString(econ.getBalance(about.getAccountId())));
+    }
+
     public static void sendBalanceInfo(CommandSender to, Faction about) {
         if (!shouldBeUsed()) {
-            FactionsPlugin.getInstance().log(Level.WARNING, "Vault does not appear to be hooked into an economy plugin.");
+            FactionsPlugin.instance.log(Level.WARNING, "Vault does not appear to be hooked into an economy plugin.");
             return;
         }
         to.sendMessage(String.format(TL.ECON_PLAYERBALANCE.toString(), about.getTag(), Econ.moneyString(econ.getBalance(about.getAccountId()))));
@@ -98,38 +88,20 @@ public class Econ {
         Faction fYou = RelationUtil.getFaction(you);
 
         // This is a system invoker. Accept it.
-        if (fI == null) {
-            return true;
-        }
-
+        if (fI == null) return true;
         // Bypassing players can do any kind of transaction
-        if (i instanceof FPlayer && ((FPlayer) i).isAdminBypassing()) {
-            return true;
-        }
-
+        if (i instanceof FPlayer && ((FPlayer) i).isAdminBypassing()) return true;
         // Players with the any withdraw can do.
-        if (i instanceof FPlayer && Permission.MONEY_WITHDRAW_ANY.has(((FPlayer) i).getPlayer())) {
-            return true;
-        }
-
+        if (i instanceof FPlayer && Permission.MONEY_WITHDRAW_ANY.has(((FPlayer) i).getPlayer())) return true;
         // You can deposit to anywhere you feel like. It's your loss if you can't withdraw it again.
-        if (i == you) {
-            return true;
-        }
-
+        if (i == you) return true;
         // A faction can always transfer away the money of it's members and its own money...
         // This will however probably never happen as a faction does not have free will.
         // Ohh by the way... Yes it could. For daily rent to the faction.
-        if (i == fI && fI == fYou) {
-            return true;
-        }
-
+        if (i == fI && fI == fYou) return true;
         // Factions can be controlled by members that are moderators... or any member if any member can withdraw.
-        if (i instanceof FPlayer && you instanceof Faction && fI == fYou && (Conf.bankMembersCanWithdraw || ((FPlayer) i).getRole().value >= Role.MODERATOR.value)) {
+        if (you instanceof Faction && fI == fYou && (Conf.bankMembersCanWithdraw || (i instanceof FPlayer && ((FPlayer) i).getRole().value >= Role.MODERATOR.value)))
             return true;
-        }
-
-        // Otherwise you may not!;,,;
         i.msg(TL.ECON_CANTCONTROLMONEY, i.describeTo(i, true), you.describeTo(i));
         return false;
     }
@@ -140,6 +112,7 @@ public class Econ {
 
     public static boolean transferMoney(EconomyParticipator invoker, EconomyParticipator from, EconomyParticipator to, double amount, boolean notify) {
         if (!shouldBeUsed()) {
+            invoker.msg(TL.ECON_DISABLED);
             return false;
         }
 
@@ -153,30 +126,21 @@ public class Econ {
         }
 
         // Check the rights
-        if (!canIControllYou(invoker, from)) {
-            return false;
-        }
+        if (!canIControllYou(invoker, from)) return false;
 
         OfflinePlayer fromAcc;
         OfflinePlayer toAcc;
 
         if (isUUID(from.getAccountId())) {
             fromAcc = Bukkit.getOfflinePlayer(UUID.fromString(from.getAccountId()));
-            if (fromAcc.getName() == null) {
-                return false;
-            }
-        } else {
-            fromAcc = Bukkit.getOfflinePlayer(from.getAccountId());
-        }
+            if (fromAcc.getName() == null) return false;
+        } else fromAcc = Bukkit.getOfflinePlayer(from.getAccountId());
+
 
         if (isUUID(to.getAccountId())) {
             toAcc = Bukkit.getOfflinePlayer(UUID.fromString(to.getAccountId()));
-            if (toAcc.getName() == null) {
-                return false;
-            }
-        } else {
-            toAcc = Bukkit.getOfflinePlayer(to.getAccountId());
-        }
+            if (toAcc.getName() == null) return false;
+        } else toAcc = Bukkit.getOfflinePlayer(to.getAccountId());
 
         // Is there enough money for the transaction to happen?
         if (!econ.has(fromAcc, amount)) {
@@ -184,13 +148,6 @@ public class Econ {
             if (invoker != null && notify) {
                 invoker.msg(TL.COMMAND_MONEYTRANSFERFF_TRANSFERCANTAFFORD, from.describeTo(invoker, true), moneyString(amount), to.describeTo(invoker));
             }
-
-            return false;
-        }
-
-        // Check if the new balance is over Essential's money cap.
-        if (Essentials.isOverBalCap(to, econ.getBalance(toAcc) + amount)) {
-            invoker.msg(TL.ECON_OVER_BAL_CAP, amount);
             return false;
         }
 
@@ -200,21 +157,15 @@ public class Econ {
         if (erw.transactionSuccess()) {
             EconomyResponse erd = econ.depositPlayer(toAcc, amount);
             if (erd.transactionSuccess()) {
-                if (notify) {
-                    sendTransferInfo(invoker, from, to, amount);
-                }
+                if (notify) sendTransferInfo(invoker, from, to, amount);
                 return true;
-            } else {
-                // transaction failed, refund account
-                econ.depositPlayer(fromAcc, amount);
-            }
+            } else econ.depositPlayer(fromAcc, amount);
+
         }
 
         // if we get here something with the transaction failed
-        if (notify) {
+        if (notify)
             invoker.msg(TL.ECON_UNABLETOTRANSFER, moneyString(amount), to.describeTo(invoker), from.describeTo(invoker, true));
-        }
-
         return false;
     }
 
@@ -239,28 +190,22 @@ public class Econ {
         recipients.addAll(getFplayers(to));
 
         if (invoker == null) {
-            for (FPlayer recipient : recipients) {
+            for (FPlayer recipient : recipients)
                 recipient.msg(TL.ECON_MONEYTRASFERREDFROM, moneyString(amount), from.describeTo(recipient), to.describeTo(recipient));
-            }
         } else if (invoker == from) {
-            for (FPlayer recipient : recipients) {
+            for (FPlayer recipient : recipients)
                 recipient.msg(TL.ECON_PERSONGAVEMONEYTO, from.describeTo(recipient, true), moneyString(amount), to.describeTo(recipient));
-            }
         } else if (invoker == to) {
-            for (FPlayer recipient : recipients) {
+            for (FPlayer recipient : recipients)
                 recipient.msg(TL.ECON_PERSONTOOKMONEYFROM, to.describeTo(recipient, true), moneyString(amount), from.describeTo(recipient));
-            }
         } else {
-            for (FPlayer recipient : recipients) {
+            for (FPlayer recipient : recipients)
                 recipient.msg(TL.ECON_MONEYTRASFERREDFROMPERSONTOPERSON, invoker.describeTo(recipient, true), moneyString(amount), from.describeTo(recipient), to.describeTo(recipient));
-            }
         }
     }
 
     public static boolean hasAtLeast(EconomyParticipator ep, double delta, String toDoThis) {
-        if (!shouldBeUsed()) {
-            return true;
-        }
+        if (!shouldBeUsed()) return true;
 
         // going the hard way round as econ.has refuses to work.
         boolean affordable = false;
@@ -268,85 +213,59 @@ public class Econ {
 
         if (isUUID(ep.getAccountId())) {
             OfflinePlayer offline = Bukkit.getOfflinePlayer(UUID.fromString(ep.getAccountId()));
-            if (offline.getName() != null) {
+            if (offline.getName() != null)
                 currentBalance = econ.getBalance(Bukkit.getOfflinePlayer(UUID.fromString(ep.getAccountId())));
-            } else {
-                currentBalance = 0;
-            }
-        } else {
-            currentBalance = econ.getBalance(ep.getAccountId());
-        }
-
-        if (currentBalance >= delta) {
-            affordable = true;
-        }
+            else currentBalance = 0;
+        } else currentBalance = econ.getBalance(ep.getAccountId());
+        if (currentBalance >= delta) affordable = true;
 
         if (!affordable) {
-            if (toDoThis != null && !toDoThis.isEmpty()) {
+            if (toDoThis != null && !toDoThis.isEmpty())
                 ep.msg(TL.COMMAND_MONEY_CANTAFFORD, ep.describeTo(ep, true), moneyString(delta), toDoThis);
-            }
             return false;
         }
         return true;
     }
 
     public static boolean modifyMoney(EconomyParticipator ep, double delta, String toDoThis, String forDoingThis) {
-        if (!shouldBeUsed()) {
-            return false;
-        }
-
+        if (!shouldBeUsed()) return false;
         OfflinePlayer acc;
 
         if (isUUID(ep.getAccountId())) {
             acc = Bukkit.getOfflinePlayer(UUID.fromString(ep.getAccountId()));
-            if (acc.getName() == null) {
-                return false;
-            }
-        } else {
-            acc = Bukkit.getOfflinePlayer(ep.getAccountId());
-        }
+            if (acc.getName() == null) return false;
+        } else acc = Bukkit.getOfflinePlayer(ep.getAccountId());
+        String you = ep.describeTo(ep, true);
 
-        String You = ep.describeTo(ep, true);
-
-        if (delta == 0) {
-            // no money actually transferred?
-//			ep.msg("<h>%s<i> didn't have to pay anything %s.", You, forDoingThis);  // might be for gains, might be for losses
-            return true;
-        }
-
-        if (delta > 0) {
+        if (delta == 0) return true;
+        else if (delta > 0) {
             // The player should gain money
             // The account might not have enough space
             EconomyResponse er = econ.depositPlayer(acc, delta);
             if (er.transactionSuccess()) {
                 modifyUniverseMoney(-delta);
-                if (forDoingThis != null && !forDoingThis.isEmpty()) {
-                    ep.msg(TL.COMMAND_MONEY_GAINED, You, moneyString(delta), forDoingThis);
-                }
+                if (forDoingThis != null && !forDoingThis.isEmpty())
+                    ep.msg(TL.COMMAND_MONEY_GAINED, you, moneyString(delta), forDoingThis);
                 return true;
             } else {
                 // transfer to account failed
-                if (forDoingThis != null && !forDoingThis.isEmpty()) {
-                    ep.msg(TL.ECON_DEPOSITFAILED, You, moneyString(delta), forDoingThis);
-                }
+                if (forDoingThis != null && !forDoingThis.isEmpty())
+                    ep.msg(TL.ECON_DEPOSITFAILED, you, moneyString(delta), forDoingThis);
                 return false;
             }
         } else {
             // The player should loose money
             // The player might not have enough.
-
             if (econ.has(acc, -delta) && econ.withdrawPlayer(acc, -delta).transactionSuccess()) {
                 // There is enough money to pay
                 modifyUniverseMoney(-delta);
-                if (forDoingThis != null && !forDoingThis.isEmpty()) {
-                    ep.msg(TL.ECON_MONEYLOST, You, moneyString(-delta), forDoingThis);
-                }
+                if (forDoingThis != null && !forDoingThis.isEmpty())
+                    ep.msg(TL.ECON_MONEYLOST, you, moneyString(-delta), forDoingThis);
                 return true;
             } else {
                 // There was not enough money to pay
-                if (toDoThis != null && !toDoThis.isEmpty()) {
-                    ep.msg(TL.ECON_CANTAFFORD, You, moneyString(-delta), toDoThis);
-                }
+                if (toDoThis != null && !toDoThis.isEmpty())
+                    ep.msg(TL.ECON_CANTAFFORD, you, moneyString(-delta), toDoThis);
                 return false;
             }
         }
@@ -358,10 +277,7 @@ public class Econ {
 
     // calculate the cost for claiming land
     public static double calculateClaimCost(int ownedLand, boolean takingFromAnotherFaction) {
-        if (!shouldBeUsed()) {
-            return 0d;
-        }
-
+        if (!shouldBeUsed()) return 0d;
         // basic claim cost, plus land inflation cost, minus the potential bonus given for claiming from another faction
         return Conf.econCostClaimWilderness + (Conf.econCostClaimWilderness * Conf.econClaimAdditionalMultiplier * ownedLand) - (takingFromAnotherFaction ? Conf.econCostClaimFromFactionBonus : 0);
     }
@@ -374,9 +290,7 @@ public class Econ {
     // calculate value of all owned land
     public static double calculateTotalLandValue(int ownedLand) {
         double amount = 0;
-        for (int x = 0; x < ownedLand; x++) {
-            amount += calculateClaimCost(x, false);
-        }
+        for (int x = 0; x < ownedLand; x++) amount += calculateClaimCost(x, false);
         return amount;
     }
 
@@ -400,9 +314,7 @@ public class Econ {
 
     public static String getFriendlyBalance(UUID uuid) {
         OfflinePlayer offline = Bukkit.getOfflinePlayer(uuid);
-        if (offline.getName() == null) {
-            return "0";
-        }
+        if (offline.getName() == null) return "0";
         return format.format(econ.getBalance(offline));
     }
 
@@ -412,19 +324,13 @@ public class Econ {
 
     public static boolean setBalance(String account, double amount) {
         double current = econ.getBalance(account);
-        if (current > amount) {
-            return econ.withdrawPlayer(account, current - amount).transactionSuccess();
-        } else {
-            return econ.depositPlayer(account, amount - current).transactionSuccess();
-        }
+        if (current > amount) return econ.withdrawPlayer(account, current - amount).transactionSuccess();
+        else return econ.depositPlayer(account, amount - current).transactionSuccess();
     }
 
     public static boolean modifyBalance(String account, double amount) {
-        if (amount < 0) {
-            return econ.withdrawPlayer(account, -amount).transactionSuccess();
-        } else {
-            return econ.depositPlayer(account, amount).transactionSuccess();
-        }
+        if (amount < 0) return econ.withdrawPlayer(account, -amount).transactionSuccess();
+        else return econ.depositPlayer(account, amount).transactionSuccess();
     }
 
     public static boolean deposit(String account, double amount) {

src/main/java/com/massivecraft/factions/integration/Essentials.java

@@ -4,47 +4,30 @@ import com.earth2me.essentials.Teleport;
 import com.earth2me.essentials.Trade;
 import com.earth2me.essentials.User;
 import com.massivecraft.factions.Conf;
-import com.massivecraft.factions.iface.EconomyParticipator;
 import net.ess3.api.IEssentials;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.player.PlayerTeleportEvent.TeleportCause;
-import org.bukkit.plugin.Plugin;
+import org.bukkit.metadata.MetadataValue;
 
 import java.math.BigDecimal;
 
 public class Essentials {
 
-    /**
-     * @author FactionsUUID Team
-     */
-
     private static IEssentials essentials;
 
     public static void setup() {
-        Plugin ess = Bukkit.getPluginManager().getPlugin("Essentials");
-        if (ess != null) {
-            essentials = (IEssentials) ess;
-        }
-    }
-
-    public static boolean isOverBalCap(EconomyParticipator participator, double amount) {
-        if (essentials == null) {
-            return false;
-        }
-        return amount > essentials.getSettings().getMaxMoney().doubleValue();
+        essentials = (IEssentials) Bukkit.getPluginManager().getPlugin("Essentials");
     }
 
     // return false if feature is disabled or Essentials isn't available
     public static boolean handleTeleport(Player player, Location loc) {
-        if (!Conf.homesTeleportCommandEssentialsIntegration || essentials == null) {
-            return false;
-        }
+        if (!Conf.homesTeleportCommandEssentialsIntegration || essentials == null) return false;
 
         Teleport teleport = essentials.getUser(player).getTeleport();
-        Trade trade = new Trade(new BigDecimal(Conf.econCostHome), essentials);
+        Trade trade = new Trade(BigDecimal.valueOf(Conf.econCostHome), essentials);
         try {
             teleport.teleport(loc, trade, TeleportCause.PLUGIN);
         } catch (Exception e) {
@@ -54,8 +37,21 @@ public class Essentials {
     }
 
     public static boolean isVanished(Player player) {
-        if (essentials == null) return false;
-        User user = essentials.getUser(player);
-        return user != null && user.isVanished();
+        // Edge case handling.
+        if (player == null) return false;
+        boolean vanish = false;
+        if (essentials != null) {
+            User user = essentials.getUser(player);
+            if (user != null && user.isVanished()) return true;
+        }
+        if (player.hasMetadata("vanished"))
+            for (MetadataValue meta : player.getMetadata("vanished")) {
+                if (meta == null) continue;
+                if (meta.asBoolean()) {
+                    vanish = true;
+                    break;
+                }
+            }
+        return vanish;
     }
 }

src/main/java/com/massivecraft/factions/integration/Worldguard.java

@@ -159,7 +159,6 @@ public class Worldguard {
                     FactionsPlugin.getInstance().log("We failed to load Vector Classes from WorldGuard! Support will be removed!");
                     FactionsPlugin.getInstance().log("WorldGuard 7.0.0 support is currently in BETA. Please be careful!");
                     regionContainer = null;
-                    return;
                 }
             }
         }

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

@@ -26,20 +26,17 @@ public class EngineDynmap {
     // CONSTANTS
     // -------------------------------------------- //
 
-    public final static int BLOCKS_PER_CHUNK = 16;
+    public static final int BLOCKS_PER_CHUNK = 16;
 
-    public final static String DYNMAP_INTEGRATION = "\u00A7dDynmap Integration: \u00A7e";
+    public static final String DYNMAP_INTEGRATION = "\u00A7dDynmap Integration: \u00A7e";
 
-    public final static String FACTIONS = "factions";
-    public final static String FACTIONS_ = FACTIONS + "_";
-
-    public final static String FACTIONS_MARKERSET = FACTIONS_ + "markerset";
-
-    public final static String FACTIONS_HOME = FACTIONS_ + "home";
-    public final static String FACTIONS_HOME_ = FACTIONS_HOME + "_";
-
-    public final static String FACTIONS_PLAYERSET = FACTIONS_ + "playerset";
-    public final static String FACTIONS_PLAYERSET_ = FACTIONS_PLAYERSET + "_";
+    public static final String FACTIONS = "factions";
+    public static final String FACTIONS_ = FACTIONS + "_";
+    public static final String FACTIONS_MARKERSET = FACTIONS_ + "markerset";
+    public static final String FACTIONS_HOME = FACTIONS_ + "home";
+    public static final String FACTIONS_HOME_ = FACTIONS_HOME + "_";
+    public static final String FACTIONS_PLAYERSET = FACTIONS_ + "playerset";
+    public static final String FACTIONS_PLAYERSET_ = FACTIONS_PLAYERSET + "_";
 
     // -------------------------------------------- //
     // INSTANCE & CONSTRUCT
@@ -277,13 +274,13 @@ public class EngineDynmap {
             String world = entry.getKey().getWorldName();
             Faction chunkOwner = Factions.getInstance().getFactionById(entry.getValue());
 
-            Map<Faction, Set<FLocation>> factionChunks = worldFactionChunks.get(world);
+            Map<Faction, Set<FLocation>> factionChunks = worldFactionChunks.computeIfAbsent(world, s -> null);
             if (factionChunks == null) {
                 factionChunks = new HashMap<>();
                 worldFactionChunks.put(world, factionChunks);
             }
 
-            Set<FLocation> factionTerritory = factionChunks.get(chunkOwner);
+            Set<FLocation> factionTerritory = factionChunks.computeIfAbsent(chunkOwner, s -> null);
             if (factionTerritory == null) {
                 factionTerritory = new HashSet<>();
                 factionChunks.put(chunkOwner, factionTerritory);
@@ -735,8 +732,7 @@ public class EngineDynmap {
     }
 
     // Find all contiguous blocks, set in target and clear in source
-    private int floodFillTarget(TileFlags source, TileFlags destination, int x, int y) {
-        int cnt = 0;
+    private void floodFillTarget(TileFlags source, TileFlags destination, int x, int y) {
         ArrayDeque<int[]> stack = new ArrayDeque<>();
         stack.push(new int[]{x, y});
 
@@ -747,7 +743,6 @@ public class EngineDynmap {
             if (source.getFlag(x, y)) { // Set in src
                 source.setFlag(x, y, false); // Clear source
                 destination.setFlag(x, y, true); // Set in destination
-                cnt++;
                 if (source.getFlag(x + 1, y)) {
                     stack.push(new int[]{x + 1, y});
                 }
@@ -762,7 +757,6 @@ public class EngineDynmap {
                 }
             }
         }
-        return cnt;
     }
 
     enum Direction {

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

@@ -15,7 +15,7 @@ public class TempMarkerSet {
     public boolean hideByDefault;
 
     public MarkerSet create(MarkerAPI markerApi, String id) {
-        MarkerSet ret = markerApi.createMarkerSet(id, this.label, null, false); // ("null, false" at the end means "all icons allowed, not perisistent")
+        MarkerSet ret = markerApi.createMarkerSet(id, this.label, null, false); // ("null, false" at the end means "all icons allowed, not persistent")
 
         if (ret == null) {
             return null;
@@ -41,10 +41,8 @@ public class TempMarkerSet {
             markerset.setMarkerSetLabel(this.label);
         }
 
-        if (this.minimumZoom > 0) {
-            if (markerset.getMinZoom() != this.minimumZoom) {
+        if (this.minimumZoom > 0 && markerset.getMinZoom() != this.minimumZoom) {
                 markerset.setMinZoom(this.minimumZoom);
-            }
         }
 
         if (markerset.getLayerPriority() != this.priority) {

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

@@ -27,7 +27,6 @@ import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.*;
 import org.bukkit.event.entity.EntityChangeBlockEvent;
-import org.bukkit.event.entity.EntityExplodeEvent;
 import org.bukkit.event.hanging.HangingBreakByEntityEvent;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.meta.ItemMeta;
@@ -48,6 +47,8 @@ public class FactionsBlockListener implements Listener {
     public static HashMap<String, Location> bannerLocations = new HashMap<>();
     private HashMap<String, Boolean> bannerCooldownMap = new HashMap<>();
     private long placeTimer = TimeUnit.SECONDS.toMillis(15L);
+    private static final String varFac = "{faction}";
+    private static final String varAction = "{action}";
 
 
     public static boolean playerCanBuildDestroyBlock(Player player, Location location, String action, boolean justCheck) {
@@ -62,9 +63,8 @@ public class FactionsBlockListener implements Listener {
 
         if (otherFaction.isWilderness()) {
             if (Conf.worldGuardBuildPriority && Worldguard.getInstance().playerCanBuild(player, location)) return true;
-            if (location.getWorld() != null) {
-                if (!Conf.wildernessDenyBuild || Conf.worldsNoWildernessProtection.contains(location.getWorld().getName()))
-                    return true;
+            if (location.getWorld() != null && !Conf.wildernessDenyBuild || Conf.worldsNoWildernessProtection.contains(location.getWorld().getName())) {
+                return true;
             }
             if (!justCheck) me.msg(TL.ACTION_DENIED_WILDERNESS, action);
             return false;
@@ -94,24 +94,27 @@ public class FactionsBlockListener implements Listener {
         boolean landOwned = (myFaction.doesLocationHaveOwnersSet(loc) && !myFaction.getOwnerList(loc).isEmpty());
         if ((landOwned && myFaction.getOwnerListString(loc).contains(player.getName())) || (me.getRole() == Role.LEADER && me.getFactionId().equals(myFaction.getId())))
             return true;
-        else if (landOwned && !myFaction.getOwnerListString(loc).contains(player.getName())) {
-            me.msg(TL.ACTIONS_OWNEDTERRITORYDENY.toString().replace("{owners}", myFaction.getOwnerListString(loc)));
-            if (shouldHurt) {
-                player.damage(Conf.actionDeniedPainAmount);
-                me.msg(TL.ACTIONS_NOPERMISSIONPAIN.toString().replace("{action}", action.toString()).replace("{faction}", Board.getInstance().getFactionAt(loc).getTag(myFaction)));
-            }
-            return false;
-        } else if (!landOwned && access == Access.DENY) { // If land is not owned but access is set to DENY anyway
-            if (shouldHurt) {
-                player.damage(Conf.actionDeniedPainAmount);
-                if ((Board.getInstance().getFactionAt(loc).getTag(myFaction)) != null)
-                    me.msg(TL.ACTIONS_NOPERMISSIONPAIN.toString().replace("{action}", action.toString()).replace("{faction}", Board.getInstance().getFactionAt(loc).getTag(myFaction)));
-            }
-            if (myFaction.getTag(me.getFaction()) != null && action != null)
-                me.msg(TL.ACTIONS_NOPERMISSION.toString().replace("{faction}", myFaction.getTag(me.getFaction())).replace("{action}", action.toString()));
-            return false;
-        } else if (access == Access.ALLOW) return true;
-        me.msg(TL.ACTIONS_NOPERMISSION.toString().replace("{faction}", myFaction.getTag(me.getFaction())).replace("{action}", action.toString()));
+        else {
+            String replace = TL.ACTIONS_NOPERMISSIONPAIN.toString().replace(varAction, action.toString());
+            if (landOwned && !myFaction.getOwnerListString(loc).contains(player.getName())) {
+                me.msg(TL.ACTIONS_OWNEDTERRITORYDENY.toString().replace("{owners}", myFaction.getOwnerListString(loc)));
+                if (shouldHurt) {
+                    player.damage(Conf.actionDeniedPainAmount);
+                    me.msg(replace.replace(varFac, Board.getInstance().getFactionAt(loc).getTag(myFaction)));
+                }
+                return false;
+            } else if (!landOwned && access == Access.DENY) { // If land is not owned but access is set to DENY anyway
+                if (shouldHurt) {
+                    player.damage(Conf.actionDeniedPainAmount);
+                    if ((Board.getInstance().getFactionAt(loc).getTag(myFaction)) != null)
+                        me.msg(replace.replace(varFac, Board.getInstance().getFactionAt(loc).getTag(myFaction)));
+                }
+                if (myFaction.getTag(me.getFaction()) != null && action != null)
+                    me.msg(TL.ACTIONS_NOPERMISSION.toString().replace(varFac, myFaction.getTag(me.getFaction())).replace(varAction, action.toString()));
+                return false;
+            } else if (access == Access.ALLOW) return true;
+        }
+        me.msg(TL.ACTIONS_NOPERMISSION.toString().replace(varFac, myFaction.getTag(me.getFaction())).replace(varAction, action.toString()));
         return false;
     }
 
@@ -119,10 +122,10 @@ public class FactionsBlockListener implements Listener {
         if (Conf.ownedAreasEnabled && target.doesLocationHaveOwnersSet(location) && !target.playerHasOwnershipRights(me, location)) {
             // If pain should be applied
             if (pain && Conf.ownedAreaPainBuild)
-                me.msg(TL.ACTIONS_OWNEDTERRITORYPAINDENY.toString().replace("{action}", action.toString()).replace("{faction}", target.getOwnerListString(location)));
+                me.msg(TL.ACTIONS_OWNEDTERRITORYPAINDENY.toString().replace(varAction, action.toString()).replace(varFac, target.getOwnerListString(location)));
             if (Conf.ownedAreaDenyBuild && pain) return false;
             else if (Conf.ownedAreaDenyBuild) {
-                me.msg(TL.ACTIONS_NOPERMISSION.toString().replace("{faction}", target.getTag(me.getFaction())).replace("{action}", action.toString()));
+                me.msg(TL.ACTIONS_NOPERMISSION.toString().replace(varFac, target.getTag(me.getFaction())).replace(varAction, action.toString()));
                 return false;
             }
         }
@@ -169,11 +172,9 @@ public class FactionsBlockListener implements Listener {
             return;
         }
 
-        if (isSpawner) {
-            if (Conf.spawnerLock) {
-                event.setCancelled(true);
-                event.getPlayer().sendMessage(FactionsPlugin.getInstance().color(TL.COMMAND_SPAWNER_LOCK_CANNOT_PLACE.toString()));
-            }
+        if (isSpawner && Conf.spawnerLock) {
+            event.setCancelled(true);
+            event.getPlayer().sendMessage(FactionsPlugin.getInstance().color(TL.COMMAND_SPAWNER_LOCK_CANNOT_PLACE.toString()));
         }
     }
 
@@ -181,23 +182,21 @@ public class FactionsBlockListener implements Listener {
     public void onBlockFromTo(BlockFromToEvent event) {
         if (!Conf.handleExploitLiquidFlow) return;
 
-        if (event.getBlock().isLiquid()) {
-            if (event.getToBlock().isEmpty()) {
-                Faction from = Board.getInstance().getFactionAt(new FLocation(event.getBlock()));
-                Faction to = Board.getInstance().getFactionAt(new FLocation(event.getToBlock()));
-                if (from == to) return;
-                // from faction != to faction
-                if(to.isSystemFaction()) {
-                    event.setCancelled(true);
+        if (event.getBlock().isLiquid() && event.getToBlock().isEmpty()) {
+            Faction from = Board.getInstance().getFactionAt(new FLocation(event.getBlock()));
+            Faction to = Board.getInstance().getFactionAt(new FLocation(event.getToBlock()));
+            if (from == to) return;
+            // from faction != to faction
+            if (to.isSystemFaction()) {
+                event.setCancelled(true);
+                return;
+            }
+
+            if (to.isNormal()) {
+                if (from.isNormal() && from.getRelationTo(to).isAlly()) {
                     return;
                 }
-
-                if (to.isNormal()) {
-                    if (from.isNormal() && from.getRelationTo(to).isAlly()) {
-                        return;
-                    }
-                    event.setCancelled(true);
-                }
+                event.setCancelled(true);
             }
         }
     }
@@ -218,7 +217,7 @@ public class FactionsBlockListener implements Listener {
         Block targetBlock = event.getBlock().getRelative(event.getDirection(), event.getLength() + 1);
 
         // if potentially pushing into air/water/lava in another territory, we need to check it out
-        if ((targetBlock.isEmpty() || targetBlock.isLiquid()) && !canPistonMoveBlock(pistonFaction, targetBlock.getLocation()))
+        if ((targetBlock.isEmpty() || targetBlock.isLiquid()) && canPistonMoveBlock(pistonFaction, targetBlock.getLocation()))
             event.setCancelled(true);
     }
 
@@ -287,12 +286,10 @@ public class FactionsBlockListener implements Listener {
                         continue;
                     }
 
-                    if (blockLoc.getBlock().getType() == XMaterial.CHEST.parseMaterial()) {
-                        if (factionAt.getVault().equals(blockLoc)) {
-                            e.setCancelled(true);
-                            fme.msg(TL.COMMAND_VAULT_NO_HOPPER);
-                            return;
-                        }
+                    if (blockLoc.getBlock().getType() == XMaterial.CHEST.parseMaterial() && factionAt.getVault().equals(blockLoc)) {
+                        e.setCancelled(true);
+                        fme.msg(TL.COMMAND_VAULT_NO_HOPPER);
+                        return;
                     }
                 }
             }
@@ -317,7 +314,7 @@ public class FactionsBlockListener implements Listener {
         // if potentially retracted block is just air/water/lava, no worries
         if (targetLoc.getBlock().isEmpty() || targetLoc.getBlock().isLiquid()) return;
         Faction pistonFaction = Board.getInstance().getFactionAt(new FLocation(event.getBlock()));
-        if (!canPistonMoveBlock(pistonFaction, targetLoc)) event.setCancelled(true);
+        if (canPistonMoveBlock(pistonFaction, targetLoc)) event.setCancelled(true);
     }
 
     @EventHandler
@@ -327,11 +324,9 @@ public class FactionsBlockListener implements Listener {
             return;
         }
 
-        if (bannerLocations.containsValue(e.getBlock().getLocation())) {
-            if (e.getBlock().getType().name().contains("BANNER")) {
-                e.setCancelled(true);
-                fme.msg(TL.BANNER_CANNOT_BREAK);
-            }
+        if (bannerLocations.containsValue(e.getBlock().getLocation()) && e.getBlock().getType().name().contains("BANNER")) {
+            e.setCancelled(true);
+            fme.msg(TL.BANNER_CANNOT_BREAK);
         }
     }
 
@@ -431,7 +426,8 @@ public class FactionsBlockListener implements Listener {
         if (!justCheck) fPlayer.setLastFrostwalkerMessage();
 
         // Check if they have build permissions here. If not, block this from happening.
-        if (!playerCanBuildDestroyBlock(player, location, PermissableAction.FROST_WALK.toString(), justCheck)) event.setCancelled(true);
+        if (!playerCanBuildDestroyBlock(player, location, PermissableAction.FROST_WALK.toString(), justCheck))
+            event.setCancelled(true);
     }
 
     @EventHandler
@@ -449,15 +445,15 @@ public class FactionsBlockListener implements Listener {
     private boolean canPistonMoveBlock(Faction pistonFaction, Location target) {
         Faction otherFaction = Board.getInstance().getFactionAt(new FLocation(target));
 
-        if (pistonFaction == otherFaction) return true;
+        if (pistonFaction == otherFaction) return false;
 
         if (otherFaction.isWilderness())
-            return !Conf.wildernessDenyBuild || Conf.worldsNoWildernessProtection.contains(target.getWorld().getName());
-        else if (otherFaction.isSafeZone()) return !Conf.safeZoneDenyBuild;
-        else if (otherFaction.isWarZone()) return !Conf.warZoneDenyBuild;
+            return Conf.wildernessDenyBuild && !Conf.worldsNoWildernessProtection.contains(target.getWorld().getName());
+        else if (otherFaction.isSafeZone()) return Conf.safeZoneDenyBuild;
+        else if (otherFaction.isWarZone()) return Conf.warZoneDenyBuild;
 
         Relation rel = pistonFaction.getRelationTo(otherFaction);
-        return !rel.confDenyBuild(otherFaction.hasPlayersOnline());
+        return rel.confDenyBuild(otherFaction.hasPlayersOnline());
     }
 
     @EventHandler(priority = EventPriority.NORMAL, ignoreCancelled = true)
@@ -505,15 +501,12 @@ public class FactionsBlockListener implements Listener {
 
 
     @EventHandler(priority = EventPriority.HIGHEST)
-    public void FrameRemove(HangingBreakByEntityEvent event) {
+    public void frameRemove(HangingBreakByEntityEvent event) {
         if (event.getRemover() == null) return;
-        if ((event.getRemover() instanceof Player)) {
-            if (event.getEntity().getType().equals(EntityType.ITEM_FRAME)) {
-                Player p = (Player) event.getRemover();
-                if (!playerCanBuildDestroyBlock(p, event.getEntity().getLocation(), "destroy", true)) {
-                    event.setCancelled(true);
-                    return;
-                }
+        if ((event.getRemover() instanceof Player) && event.getEntity().getType().equals(EntityType.ITEM_FRAME)) {
+            Player p = (Player) event.getRemover();
+            if (!playerCanBuildDestroyBlock(p, event.getEntity().getLocation(), "destroy", true)) {
+                event.setCancelled(true);
             }
         }
     }

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

@@ -87,7 +87,7 @@ public class FactionsChatListener implements Listener {
                     fplayer.sendMessage("[FCspy] " + myFaction.getTag() + ": " + message);
                 }
             }
-            FactionChatHandler.sendMessage(FactionsPlugin.getInstance(), myFaction, me.getPlayer().getUniqueId(), me.getPlayer().getName(), event.getMessage());
+            FactionChatHandler.sendMessage(myFaction, me.getPlayer().getUniqueId(), me.getPlayer().getName(), event.getMessage());
             event.setCancelled(true);
         } else if (chat == ChatMode.ALLIANCE) {
             Faction myFaction = me.getFaction();

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

@@ -143,7 +143,7 @@ public class FactionsEntityListener implements Listener {
                     } else {
                         // we don't want to let mobs/arrows destroy item frames/armor stands
                         // so we only have to run the check as if there had been an explosion at the damager location
-                        if (!this.checkExplosionForBlock(damager, damagee.getLocation().getBlock()))
+                        if (this.checkExplosionForBlock(damager, damagee.getLocation().getBlock()))
                             event.setCancelled(true);
                     }
                     // we don't need to go after
@@ -216,7 +216,7 @@ public class FactionsEntityListener implements Listener {
         Entity boomer = event.getEntity();
 
         // Before we need to check the location where the block is placed
-        if (!this.checkExplosionForBlock(boomer, event.getLocation().getBlock())) {
+        if (this.checkExplosionForBlock(boomer, event.getLocation().getBlock())) {
             event.setCancelled(true);
             return;
         }
@@ -224,7 +224,7 @@ public class FactionsEntityListener implements Listener {
         // Loop the blocklist to run checks on each aimed block
 
         // The block don't have to explode
-        event.blockList().removeIf(block -> !this.checkExplosionForBlock(boomer, block));
+        event.blockList().removeIf(block -> this.checkExplosionForBlock(boomer, block));
 
         // Cancel the event if no block will explode
         if (!event.blockList().isEmpty() && (boomer instanceof TNTPrimed || boomer instanceof ExplosiveMinecart) && Conf.handleExploitTNTWaterlog) {
@@ -259,7 +259,7 @@ public class FactionsEntityListener implements Listener {
         Faction faction = Board.getInstance().getFactionAt(new FLocation(block.getLocation()));
 
         if (faction.noExplosionsInTerritory() || (faction.isPeaceful() && Conf.peacefulTerritoryDisableBoom))
-            return false;
+            return true;
         // faction is peaceful and has explosions set to disabled
 
         boolean online = faction.hasPlayersOnline();
@@ -269,17 +269,17 @@ public class FactionsEntityListener implements Listener {
                 (faction.isWarZone() && Conf.warZoneBlockCreepers) ||
                 faction.isSafeZone())) {
             // creeper which needs prevention
-            return false;
+            return true;
         } else if (
             // it's a bit crude just using fireball protection for Wither boss too, but I'd rather not add in a whole new set of xxxBlockWitherExplosion or whatever
                 (boomer instanceof Fireball || boomer instanceof Wither) && (faction.isWilderness() && Conf.wildernessBlockFireballs && !Conf.worldsNoWildernessProtection.contains(block.getWorld().getName()) || faction.isNormal() && (online ? Conf.territoryBlockFireballs : Conf.territoryBlockFireballsWhenOffline) || faction.isWarZone() && Conf.warZoneBlockFireballs || faction.isSafeZone())) {
             // ghast fireball which needs prevention
-            return false;
+            return true;
         } else
-            return (!(boomer instanceof TNTPrimed) && !(boomer instanceof ExplosiveMinecart)) || ((!faction.isWilderness() || !Conf.wildernessBlockTNT || Conf.worldsNoWildernessProtection.contains(block.getWorld().getName())) &&
-                    (!faction.isNormal() || (online ? !Conf.territoryBlockTNT : !Conf.territoryBlockTNTWhenOffline)) &&
-                    (!faction.isWarZone() || !Conf.warZoneBlockTNT) &&
-                    (!faction.isSafeZone() || !Conf.safeZoneBlockTNT));
+            return (boomer instanceof TNTPrimed || boomer instanceof ExplosiveMinecart) && ((faction.isWilderness() && Conf.wildernessBlockTNT && !Conf.worldsNoWildernessProtection.contains(block.getWorld().getName())) ||
+                    (faction.isNormal() && (online ? Conf.territoryBlockTNT : Conf.territoryBlockTNTWhenOffline)) ||
+                    (faction.isWarZone() && Conf.warZoneBlockTNT) ||
+                    (faction.isSafeZone() && Conf.safeZoneBlockTNT));
 
         // No condition retained, destroy the block!
     }
@@ -311,7 +311,7 @@ public class FactionsEntityListener implements Listener {
         if (thrower instanceof Player) {
             Player player = (Player) thrower;
             FPlayer fPlayer = FPlayers.getInstance().getByPlayer(player);
-            if (badjuju && fPlayer.getFaction().isPeaceful()) {
+            if (fPlayer.getFaction().isPeaceful()) {
                 event.setCancelled(true);
                 return;
             }
@@ -327,7 +327,6 @@ public class FactionsEntityListener implements Listener {
 
     public boolean isPlayerInSafeZone(Entity damagee) {
         if (!(damagee instanceof Player)) return false;
-
         return Board.getInstance().getFactionAt(new FLocation(damagee.getLocation())).isSafeZone();
     }
 
@@ -338,12 +337,8 @@ public class FactionsEntityListener implements Listener {
     public boolean canDamagerHurtDamagee(EntityDamageByEntityEvent sub, boolean notify) {
         Entity damager = sub.getDamager();
         Entity damagee = sub.getEntity();
-
         if (!(damagee instanceof Player)) return true;
-
         FPlayer defender = FPlayers.getInstance().getByPlayer((Player) damagee);
-
-
         if (damager instanceof Player) {
             FPlayer attacker = FPlayers.getInstance().getByPlayer((Player) damager);
             if (defender == null || defender.getPlayer() == null) return true;
@@ -358,12 +353,8 @@ public class FactionsEntityListener implements Listener {
                 }
             }
         }
-
-
         Location defenderLoc = defender.getPlayer().getLocation();
         Faction defLocFaction = Board.getInstance().getFactionAt(new FLocation(defenderLoc));
-
-
         // for damage caused by projectiles, getDamager() returns the projectile... what we need to know is the source
         if (damager instanceof Projectile) {
             Projectile projectile = (Projectile) damager;
@@ -515,10 +506,8 @@ public class FactionsEntityListener implements Listener {
         if (!(e.getRemover() instanceof Player)) return;
         Player p = (Player) e.getRemover();
 
-        if (e.getEntity().getType() == EntityType.PAINTING || e.getEntity().getType() == EntityType.ITEM_FRAME) {
-            if (!FactionsBlockListener.playerCanBuildDestroyBlock(p, e.getEntity().getLocation(), "destroy", false)) {
-                e.setCancelled(true);
-            }
+        if (e.getEntity().getType() == EntityType.PAINTING || e.getEntity().getType() == EntityType.ITEM_FRAME && !FactionsBlockListener.playerCanBuildDestroyBlock(p, e.getEntity().getLocation(), "destroy", false)) {
+            e.setCancelled(true);
         }
     }
 
@@ -526,11 +515,9 @@ public class FactionsEntityListener implements Listener {
     public void onPaintingPlace(HangingPlaceEvent e) {
         if (e.getPlayer() == null) return;
 
-        if (e.getEntity().getType() == EntityType.PAINTING || e.getEntity().getType() == EntityType.ITEM_FRAME) {
-            if (!FactionsBlockListener.playerCanBuildDestroyBlock(e.getPlayer(), e.getBlock().getLocation(), "build", false)) {
-                e.setCancelled(true);
-                e.getPlayer().updateInventory();
-            }
+        if (e.getEntity().getType() == EntityType.PAINTING || e.getEntity().getType() == EntityType.ITEM_FRAME && !FactionsBlockListener.playerCanBuildDestroyBlock(e.getPlayer(), e.getBlock().getLocation(), "build", false)) {
+            e.setCancelled(true);
+            e.getPlayer().updateInventory();
         }
     }
 
@@ -555,73 +542,37 @@ public class FactionsEntityListener implements Listener {
     }
 
 
-    /*
-    @EventHandler
-    public void onTravel(PlayerPortalEvent event) {
-        if (!FactionsPlugin.getInstance().getConfig().getBoolean("portals.limit", false))
-            return; // Don't do anything if they don't want us to.
-
-
-        TravelAgent agent = event.getPortalTravelAgent();
-
-        // If they aren't able to find a portal, it'll try to create one.
-        if (event.useTravelAgent() && agent.getCanCreatePortal() && agent.findPortal(event.getTo()) == null) {
-            FLocation loc = new FLocation(event.getTo());
-            Faction faction = Board.getInstance().getFactionAt(loc);
-            if (faction.isWilderness()) {
-                return; // We don't care about wilderness.
-            } else if (!faction.isNormal() && !event.getPlayer().isOp()) {
-                // Don't let non ops make portals in safezone or warzone.
-                event.setCancelled(true);
-                return;
-            }
-
-            FPlayer fp = FPlayers.getInstance().getByPlayer(event.getPlayer());
-            String mininumRelation = FactionsPlugin.getInstance().getConfig().getString("portals.minimum-relation", "MEMBER"); // Defaults to Neutral if typed wrong.
-            if (!fp.getFaction().getRelationTo(faction).isAtLeast(Relation.fromString(mininumRelation))) {
-                event.setCancelled(true);
-            }
-        }
-    }
-     */
-
     @EventHandler
     public void onHit(EntityDamageByEntityEvent e) {
-        if (e.getDamager() instanceof Player) {
-            if (e.getEntity() instanceof Player) {
-                Player victim = (Player) e.getEntity();
-                Player attacker = (Player) e.getDamager();
-                FPlayer fvictim = FPlayers.getInstance().getByPlayer(victim);
-                FPlayer fattacker = FPlayers.getInstance().getByPlayer(attacker);
-                if (fattacker.getRelationTo(fvictim) == Relation.TRUCE) {
-                    fattacker.msg(TL.PLAYER_PVP_CANTHURT, fvictim.describeTo(fattacker));
-                    e.setCancelled(true);
-                }
+        if (e.getDamager() instanceof Player && e.getEntity() instanceof Player) {
+            Player victim = (Player) e.getEntity();
+            Player attacker = (Player) e.getDamager();
+            FPlayer fvictim = FPlayers.getInstance().getByPlayer(victim);
+            FPlayer fattacker = FPlayers.getInstance().getByPlayer(attacker);
+            if (fattacker.getRelationTo(fvictim) == Relation.TRUCE) {
+                fattacker.msg(TL.PLAYER_PVP_CANTHURT, fvictim.describeTo(fattacker));
+                e.setCancelled(true);
             }
         }
     }
 
     @EventHandler
     public void onBowHit(EntityDamageByEntityEvent e) {
-        if (e.getDamager() instanceof Projectile) {
-            if (e.getEntity() instanceof Player) {
-                Projectile arrow = ((Projectile) e.getDamager());
-                if (arrow.getShooter() instanceof Player) {
-                    Player damager = (Player) ((Projectile) e.getDamager()).getShooter();
-                    Player victim = (Player) e.getEntity();
-                    FPlayer fdamager = FPlayers.getInstance().getByPlayer(damager);
-                    FPlayer fvictim = FPlayers.getInstance().getByPlayer(victim);
-                    if (damager == victim) return;
-                    if (fdamager == fvictim) return;
-                    if (fvictim.getRelationTo(fdamager) == Relation.TRUCE) {
-                        fdamager.msg(TL.PLAYER_PVP_CANTHURT, fvictim.describeTo(fdamager));
-                        e.setCancelled(true);
-                    }
-                    if (fvictim.getRelationTo(fdamager) == Relation.ENEMY) {
-                        if (fvictim.isFlying()) {
-                            fvictim.setFFlying(false, true);
-                        }
-                    }
+        if (e.getDamager() instanceof Projectile && e.getEntity() instanceof Player) {
+            Projectile arrow = ((Projectile) e.getDamager());
+            if (arrow.getShooter() instanceof Player) {
+                Player damager = (Player) ((Projectile) e.getDamager()).getShooter();
+                Player victim = (Player) e.getEntity();
+                FPlayer fdamager = FPlayers.getInstance().getByPlayer(damager);
+                FPlayer fvictim = FPlayers.getInstance().getByPlayer(victim);
+                if (damager == victim) return;
+                if (fdamager == fvictim) return;
+                if (fvictim.getRelationTo(fdamager) == Relation.TRUCE) {
+                    fdamager.msg(TL.PLAYER_PVP_CANTHURT, fvictim.describeTo(fdamager));
+                    e.setCancelled(true);
+                }
+                if (fvictim.getRelationTo(fdamager) == Relation.ENEMY && fvictim.isFlying()) {
+                    fvictim.setFFlying(false, true);
                 }
             }
         }

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

@@ -4,7 +4,6 @@ import com.massivecraft.factions.*;
 import com.massivecraft.factions.cmd.CmdFGlobal;
 import com.massivecraft.factions.cmd.CmdFly;
 import com.massivecraft.factions.cmd.CmdSeeChunk;
-import com.massivecraft.factions.cmd.FCmdRoot;
 import com.massivecraft.factions.cmd.audit.FLogType;
 import com.massivecraft.factions.cmd.logout.LogoutHandler;
 import com.massivecraft.factions.cmd.wild.CmdWild;
@@ -36,8 +35,6 @@ import net.dv8tion.jda.core.entities.Member;
 import net.dv8tion.jda.core.entities.TextChannel;
 import org.bukkit.*;
 import org.bukkit.block.Block;
-import org.bukkit.entity.Boat;
-import org.bukkit.entity.Minecart;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.EventHandler;
@@ -58,8 +55,6 @@ import java.util.logging.Level;
 public class FactionsPlayerListener implements Listener {
 
     public static Set<FLocation> corners;
-    public static BukkitTask positionTask = null;
-    public static Map<UUID, Location> lastLocations = new HashMap<>();
     /**
      * @author FactionsUUID Team
      */
@@ -193,7 +188,6 @@ public class FactionsPlayerListener implements Listener {
         FLocation loc = new FLocation(block);
         Faction otherFaction = Board.getInstance().getFactionAt(loc);
         Faction myFaction = me.getFaction();
-        Relation rel = myFaction.getRelationTo(otherFaction);
 
         // no door/chest/whatever protection in wilderness, war zones, or safe zones
         if (otherFaction.isSystemFaction()) return true;
@@ -311,7 +305,7 @@ public class FactionsPlayerListener implements Listener {
             if ((landOwned && factionToCheck.getOwnerListString(loc).contains(player.getName())) || (me.getRole() == Role.LEADER && me.getFactionId().equals(factionToCheck.getId()))) {
                 return true;
             } else if (landOwned && !factionToCheck.getOwnerListString(loc).contains(player.getName())) {
-                me.msg(TL.ACTIONS_OWNEDTERRITORYDENY, factionToCheck.getOwnerListString(loc));
+                me.msg(TL.ACTIONS_OWNEDTERRITORYDENY.toString().replace("{owners}", factionToCheck.getOwnerListString(loc)));
                 if (doPain) player.damage(Conf.actionDeniedPainAmount);
                 return false;
             } else if (!landOwned && access == Access.ALLOW) {
@@ -479,6 +473,8 @@ public class FactionsPlayerListener implements Listener {
         // Update the lastLoginTime for this fplayer
         me.setLastLoginTime(System.currentTimeMillis());
 
+        lastLocations.put(player.getUniqueId(), player.getLocation());
+
         // Store player's current FLocation and notify them where they are
         me.setLastStoodAt(new FLocation(player.getLocation()));
 
@@ -522,19 +518,18 @@ public class FactionsPlayerListener implements Listener {
 
     @EventHandler
     public void onPlayerFall(EntityDamageEvent e) {
-        if (e.getEntity() instanceof Player) {
-            if (e.getCause() == EntityDamageEvent.DamageCause.FALL) {
-                Player player = (Player) e.getEntity();
-                if (fallMap.containsKey(player)) {
-                    e.setCancelled(true);
-                    fallMap.remove(player);
-                }
+        if (e.getEntity() instanceof Player && e.getCause() == EntityDamageEvent.DamageCause.FALL) {
+            Player player = (Player) e.getEntity();
+            if (fallMap.containsKey(player)) {
+                e.setCancelled(true);
+                fallMap.remove(player);
             }
         }
     }
 
     @EventHandler(priority = EventPriority.NORMAL)
     public void onPlayerQuit(PlayerQuitEvent event) {
+        Player this_ = event.getPlayer();
         FPlayer me = FPlayers.getInstance().getByPlayer(event.getPlayer());
 
         // Make sure player's power is up to date when they log off.
@@ -551,6 +546,8 @@ public class FactionsPlayerListener implements Listener {
             FactionsPlugin.instance.getTimers().remove(me.getPlayer().getUniqueId());
         }
 
+        lastLocations.remove(this_.getUniqueId());
+
         Faction myFaction = me.getFaction();
         if (!myFaction.isWilderness()) myFaction.memberLoggedOff();
 
@@ -575,17 +572,19 @@ public class FactionsPlayerListener implements Listener {
                 .replace("{leader}", faction.getFPlayerAdmin() + "");
         return string;
     }
-    @Deprecated
+
     public void checkCanFly(FPlayer me) {
-        if (!FactionsPlugin.factionsFlight || !FactionsPlugin.instance.getConfig().getBoolean("ffly.AutoEnable"))
+        if (!me.canFlyAtLocation() || me.checkIfNearbyEnemies()) {
+            if (me.isFlying())
+                me.setFFlying(false, false);
             return;
-        if (me.isFlying()) return;
-        if (me.getPlayer().hasPermission(Permission.FLY_FLY.node)) {
-            me.setFFlying(true, false);
-            CmdFly.flyMap.put(me.getName(), true);
-            if (CmdFly.particleTask == null)
-                CmdFly.startParticles();
         }
+        if (me.isFlying() || !FactionsPlugin.instance.getConfig().getBoolean("ffly.AutoEnable"))
+            return;
+        me.setFFlying(true, false);
+        CmdFly.flyMap.put(me.getName(), true);
+        if (CmdFly.particleTask == null)
+            CmdFly.startParticles();
     }
 
     //inspect
@@ -611,7 +610,7 @@ public class FactionsPlayerListener implements Listener {
                 fplayer.msg(TL.COMMAND_INSPECT_BYPASS);
             }
             List<String[]> info = CoreProtect.getInstance().getAPI().blockLookup(e.getClickedBlock(), 0);
-            if (info.size() == 0) {
+            if (info.isEmpty()) {
                 e.getPlayer().sendMessage(TL.COMMAND_INSPECT_NODATA.toString());
                 return;
             }
@@ -650,15 +649,16 @@ public class FactionsPlayerListener implements Listener {
         return (result.length() == 3 ? result + "0" : result) + "/hrs ago";
     }
 
+    public static BukkitTask positionTask = null;
+    public final Map<UUID, Location> lastLocations = new HashMap<>();
+
     public void startPositionCheck() {
-        positionTask = Bukkit.getScheduler().runTaskTimer(FactionsPlugin.instance, () -> {
-            if (Bukkit.getOnlinePlayers().size() > 0) {
-                for (Player player : Bukkit.getOnlinePlayers()) {
-                    if (!lastLocations.containsKey(player.getUniqueId())) {
-                        lastLocations.put(player.getUniqueId(), player.getLocation());
-                        continue;
-                    }
-                    refreshPosition(player, lastLocations.get(player.getUniqueId()), player.getLocation());
+        positionTask = Bukkit.getScheduler().runTaskTimer(FactionsPlugin.getInstance(), () -> {
+            if (lastLocations.isEmpty()) return;
+            for (Map.Entry<UUID, Location> check : lastLocations.entrySet()) {
+                Player player = Bukkit.getPlayer(check.getKey());
+                if (player != null) {
+                    refreshPosition(player, check.getValue(), player.getLocation());
                     lastLocations.put(player.getUniqueId(), player.getLocation());
                 }
             }
@@ -724,16 +724,16 @@ public class FactionsPlayerListener implements Listener {
                     }, 5);
                 }
             }
-            if (FCmdRoot.instance.fFlyEnabled && CmdFly.autoenable && CmdFly.checkFly(me, me.getPlayer(), factionTo)) {
-                me.setFFlying(true, false);
-                CmdFly.flyMap.put(me.getName(), true);
-                if (CmdFly.particleTask == null)
-                    CmdFly.startParticles();
-            }
 
+            checkCanFly(me);
 
+            Faction at = Board.getInstance().getFactionAt(new FLocation(me.getPlayer().getLocation()));
             if (me.getAutoClaimFor() != null) {
-                me.attemptClaim(me.getAutoClaimFor(), newLocation, true);
+                if (FactionsPlugin.cachedRadiusClaim && me.attemptClaim(me.getFaction(), me.getPlayer().getLocation(), true)) {
+                    me.getFaction().getFPlayersWhereOnline(true).forEach(f -> f.msg(TL.CLAIM_CLAIMED, me.describeTo(f, true), me.getFaction().describeTo(f), at.describeTo(f)));
+                } else {
+                    me.attemptClaim(me.getAutoClaimFor(), newLocation, true);
+                }
                 FactionsPlugin.instance.logFactionEvent(me.getAutoClaimFor(), FLogType.CHUNK_CLAIMS, me.getName(), CC.GreenB + "CLAIMED", String.valueOf(1), (new FLocation(player.getLocation())).formatXAndZ(","));
                 if (Conf.disableFlightOnFactionClaimChange) CmdFly.disableFlight(me);
             } else if (me.isAutoSafeClaimEnabled()) {
@@ -824,18 +824,14 @@ public class FactionsPlayerListener implements Listener {
         // Do type null checks so if XMaterial has a parsing issue and fills null as a value it will not bypass.
         // territoryCancelAndAllowItemUseMaterial bypass the protection system but only if they're not clicking on territoryDenySwitchMaterials
         // if they're clicking on territoryDenySwitchMaterials, let the protection system handle the permissions
-        if (type != null && !Conf.territoryDenySwitchMaterials.contains(block.getType())) {
-            if (Conf.territoryCancelAndAllowItemUseMaterial.contains(type)) {
-                return;
-            }
+        if (type != null && !Conf.territoryDenySwitchMaterials.contains(block.getType()) && Conf.territoryCancelAndAllowItemUseMaterial.contains(type)) {
+            return;
         }
 
-        if (GetPermissionFromUsableBlock(block.getType()) != null) {
-            if (!canPlayerUseBlock(player, block, false)) {
-                event.setCancelled(true);
-                event.setUseInteractedBlock(Event.Result.DENY);
-                return;
-            }
+        if (GetPermissionFromUsableBlock(block.getType()) != null && !canPlayerUseBlock(player, block, false)) {
+            event.setCancelled(true);
+            event.setUseInteractedBlock(Event.Result.DENY);
+            return;
         }
 
         if (type != null && !playerCanUseItemHere(player, block.getLocation(), event.getItem().getType(), false, PermissableAction.ITEM)) {
@@ -856,14 +852,13 @@ public class FactionsPlayerListener implements Listener {
     public void onPlayerBoneMeal(PlayerInteractEvent event) {
         Block block = event.getClickedBlock();
         if (event.getAction() == Action.RIGHT_CLICK_BLOCK && block.getType() == XMaterial.GRASS_BLOCK.parseMaterial()
-                && event.hasItem() && event.getItem().getType() == XMaterial.BONE_MEAL.parseMaterial()) {
-            if (!FactionsBlockListener.playerCanBuildDestroyBlock(event.getPlayer(), block.getLocation(), PermissableAction.BUILD.name(), true)) {
-                FPlayer me = FPlayers.getInstance().getById(event.getPlayer().getUniqueId().toString());
-                Faction myFaction = me.getFaction();
+                && event.hasItem() && event.getItem().getType() == XMaterial.BONE_MEAL.parseMaterial()
+                && !FactionsBlockListener.playerCanBuildDestroyBlock(event.getPlayer(), block.getLocation(), PermissableAction.BUILD.name(), true)) {
+            FPlayer me = FPlayers.getInstance().getById(event.getPlayer().getUniqueId().toString());
+            Faction myFaction = me.getFaction();
 
-                me.msg(TL.ACTIONS_NOPERMISSION.toString().replace("{faction}", myFaction.getTag(me.getFaction())).replace("{action}", "use bone meal"));
-                event.setCancelled(true);
-            }
+            me.msg(TL.ACTIONS_NOPERMISSION.toString().replace("{faction}", myFaction.getTag(me.getFaction())).replace("{action}", "use bone meal"));
+            event.setCancelled(true);
         }
     }
 
@@ -931,10 +926,8 @@ public class FactionsPlayerListener implements Listener {
                 player.sendMessage(String.valueOf(TL.COMMAND_LOGOUT_DAMAGE_TAKEN));
             }
             WaitExecutor.handleAction(player);
-            if (CmdWild.teleporting.contains(player)) {
-                if (!FactionsPlugin.getInstance().getConfig().getBoolean("Wild.FallDamage") && e.getCause() == EntityDamageEvent.DamageCause.FALL) {
-                    e.setCancelled(true);
-                }
+            if (CmdWild.teleporting.contains(player) && !FactionsPlugin.getInstance().getConfig().getBoolean("Wild.FallDamage") && e.getCause() == EntityDamageEvent.DamageCause.FALL) {
+                e.setCancelled(true);
             }
         }
     }
@@ -943,7 +936,6 @@ public class FactionsPlayerListener implements Listener {
     public void onTeleport(PlayerTeleportEvent e) {
         Player player = e.getPlayer();
 
-        if (player == null) return;
         LogoutHandler handler = LogoutHandler.getByName(player.getName());
         if (handler.isLogoutActive(player)) {
             handler.cancelLogout(player);
@@ -981,7 +973,7 @@ public class FactionsPlayerListener implements Listener {
     }
 
     @EventHandler(priority = EventPriority.MONITOR, ignoreCancelled = true)
-    final public void onFactionJoin(FPlayerJoinEvent event) {
+    final void onFactionJoin(FPlayerJoinEvent event) {
         FTeamWrapper.applyUpdatesLater(event.getFaction());
     }
 
@@ -995,7 +987,7 @@ public class FactionsPlayerListener implements Listener {
     }
 
     @EventHandler
-    public void AsyncPlayerChatEvent(AsyncPlayerChatEvent e) {
+    public void asyncPlayerChatEvent(AsyncPlayerChatEvent e) {
         Player p = e.getPlayer();
 
         if (CmdFGlobal.toggled.contains(p.getUniqueId())) {
@@ -1021,10 +1013,8 @@ public class FactionsPlayerListener implements Listener {
 
         for (int i = l.size() - 1; i >= 0; i--) { // going backwards in the list to prevent a ConcurrentModificationException
             Player recipient = l.get(i);
-            if (recipient != null) {
-                if (CmdFGlobal.toggled.contains(recipient.getUniqueId())) {
-                    e.getRecipients().remove(recipient);
-                }
+            if (recipient != null && CmdFGlobal.toggled.contains(recipient.getUniqueId())) {
+                e.getRecipients().remove(recipient);
             }
         }
     }

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

@@ -15,9 +15,6 @@ import org.bukkit.inventory.ItemStack;
  */
 public class MenuListener implements Listener {
 
-    public MenuListener() {
-    }
-
     @EventHandler
     public void onInventoryClick(InventoryClickEvent event) {
         if (event.getView().getTitle().equals("Faction Logs")) {

src/main/java/com/massivecraft/factions/scoreboards/FScoreboard.java

@@ -137,7 +137,7 @@ public class FScoreboard {
                     updateObjective();
                 }
             }
-        }.runTaskLater(FactionsPlugin.getInstance(), FactionsPlugin.getInstance().getConfig().getInt("scoreboard.expiration", 7) * 20);
+        }.runTaskLater(FactionsPlugin.getInstance(), FactionsPlugin.getInstance().getConfig().getInt("scoreboard.expiration", 7) * 20L);
     }
 
     private void updateObjective() {

src/main/java/com/massivecraft/factions/scoreboards/FTeamWrapper.java

@@ -25,6 +25,8 @@ public class FTeamWrapper {
     private final String teamName;
     private final Faction faction;
     private final Set<OfflinePlayer> members = new HashSet<>();
+    private static final String defaultPrefixes = "scoreboard.default-prefixes";
+    private static final String invisFactionMembers = "See-Invisible-Faction-Members";
 
     private FTeamWrapper(Faction faction) {
         this.teamName = "faction_" + (factionTeamPtr++);
@@ -44,7 +46,7 @@ public class FTeamWrapper {
             return;
         }
 
-        if (!FactionsPlugin.getInstance().getConfig().getBoolean("scoreboard.default-prefixes", false) || FactionsPlugin.getInstance().getConfig().getBoolean("See-Invisible-Faction-Members")) {
+        if (!FactionsPlugin.getInstance().getConfig().getBoolean(defaultPrefixes, false) || FactionsPlugin.getInstance().getConfig().getBoolean(invisFactionMembers)) {
             return;
         }
 
@@ -66,7 +68,7 @@ public class FTeamWrapper {
             return;
         }
 
-        if (!FactionsPlugin.getInstance().getConfig().getBoolean("scoreboard.default-prefixes", false) || FactionsPlugin.getInstance().getConfig().getBoolean("See-Invisible-Faction-Members")) {
+        if (!FactionsPlugin.getInstance().getConfig().getBoolean(defaultPrefixes, false) || FactionsPlugin.getInstance().getConfig().getBoolean(invisFactionMembers)) {
             return;
         }
 
@@ -158,7 +160,7 @@ public class FTeamWrapper {
     }
 
     private void updatePrefixes() {
-        if (FactionsPlugin.getInstance().getConfig().getBoolean("scoreboard.default-prefixes", false)) {
+        if (FactionsPlugin.getInstance().getConfig().getBoolean(defaultPrefixes, false)) {
             for (FScoreboard fboard : teams.keySet()) {
                 updatePrefix(fboard);
             }
@@ -166,19 +168,19 @@ public class FTeamWrapper {
     }
 
     private void updatePrefix(FScoreboard fboard) {
-        if (FactionsPlugin.getInstance().getConfig().getBoolean("scoreboard.default-prefixes", false)) {
+        if (FactionsPlugin.getInstance().getConfig().getBoolean(defaultPrefixes, false)) {
             FPlayer fplayer = fboard.getFPlayer();
             Team team = teams.get(fboard);
             boolean focused = false;
 
-            if (FactionsPlugin.getInstance().getConfig().getBoolean("See-Invisible-Faction-Members", false)) {
+            if (FactionsPlugin.getInstance().getConfig().getBoolean(invisFactionMembers, false)) {
                 team.setCanSeeFriendlyInvisibles(true);
             }
 
             if ((FactionsPlugin.getInstance().getConfig().getBoolean("ffocus.Enabled")) && (fplayer.getFaction() != null) && (fplayer.getFaction().getFocused() != null)) {
                 for (FPlayer fp : faction.getFPlayersWhereOnline(true)) {
                     if (fplayer.getFaction().getFocused().equalsIgnoreCase(fp.getName())) {
-                        team.setPrefix(ChatColor.translateAlternateColorCodes('&', FactionsPlugin.getInstance().getConfig().getString("ffocus.Prefix", "&7»&b")));
+                        team.setPrefix(ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(FactionsPlugin.getInstance().getConfig().getString("ffocus.Prefix", "&7»&b"))));
                         focused = true;
                     }
                 }
@@ -191,7 +193,8 @@ public class FTeamWrapper {
                 prefix = prefix.replace("{relationcolor}", faction.getRelationTo(fplayer).getColor().toString());
                 prefix = prefix.replace("{faction}",
                         faction.getTag().substring(0, Math.min("{faction}".length() + 16 - prefix.length(), faction.getTag().length())));
-                if ((team.getPrefix() == null) || (!team.getPrefix().equals(prefix))) {
+                team.getPrefix();
+                if (!team.getPrefix().equals(prefix)) {
                     team.setPrefix(prefix);
                 }
             }

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

@@ -45,15 +45,16 @@ public class ShopGUIFrame {
         int items = FactionsPlugin.getInstance().getFileManager().getShop().getConfig().getConfigurationSection("items").getKeys(false).size();
         for (int a = 1; a <= items; a++) {
             String s = a + "";
-            int slot = FactionsPlugin.getInstance().getFileManager().getShop().fetchInt("items." + s + ".slot");
-            ItemStack material = XMaterial.matchXMaterial(FactionsPlugin.getInstance().getFileManager().getShop().fetchString("items." + s + ".block")).get().parseItem();
-            int cost = FactionsPlugin.getInstance().getFileManager().getShop().fetchInt("items." + s + ".cost");
-            String name = FactionsPlugin.getInstance().getFileManager().getShop().fetchString("items." + s + ".name");
-            boolean glowing = FactionsPlugin.getInstance().getFileManager().getShop().fetchBoolean("items." + s + ".glowing");
-            List<String> lore = FactionsPlugin.getInstance().getFileManager().getShop().fetchStringList("items." + s + ".lore");
+            String varItems = "items.";
+            int slot = FactionsPlugin.getInstance().getFileManager().getShop().fetchInt(varItems + s + ".slot");
+            ItemStack item = XMaterial.matchXMaterial(FactionsPlugin.getInstance().getFileManager().getShop().fetchString(varItems + s + ".block")).get().parseItem();
+            int cost = FactionsPlugin.getInstance().getFileManager().getShop().fetchInt(varItems + s + ".cost");
+            String name = FactionsPlugin.getInstance().getFileManager().getShop().fetchString(varItems + s + ".name");
+            boolean glowing = FactionsPlugin.getInstance().getFileManager().getShop().fetchBoolean(varItems + s + ".glowing");
+            List<String> lore = FactionsPlugin.getInstance().getFileManager().getShop().fetchStringList(varItems + s + ".lore");
 
 
-            ItemStack item = new ItemStack(material);
+            assert item != null;
             ItemMeta meta = item.getItemMeta();
             meta.setDisplayName(FactionsPlugin.instance.color(name));
             meta.addItemFlags();

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

@@ -55,9 +55,9 @@ public enum Role implements Permissable {
                 return COLEADER;
             case 4:
                 return LEADER;
+            default:
+                throw new IllegalStateException("Unexpected value: " + value);
         }
-
-        return null;
     }
 
     public static Role fromString(String check) {
@@ -76,9 +76,9 @@ public enum Role implements Permissable {
             case "recruit":
             case "rec":
                 return RECRUIT;
+            default:
+                throw new IllegalStateException("Unexpected value: " + check.toLowerCase());
         }
-
-        return null;
     }
 
     public boolean isAtLeast(Role role) {

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

@@ -17,27 +17,27 @@ public enum FactionTag implements Tag {
      * @author FactionsUUID Team
      */
 
-    HOME_X("{x}", (fac) -> fac.hasHome() ? String.valueOf(fac.getHome().getBlockX()) : Tag.isMinimalShow() ? null : "{ig}"),
-    HOME_Y("{y}", (fac) -> fac.hasHome() ? String.valueOf(fac.getHome().getBlockY()) : Tag.isMinimalShow() ? null : "{ig}"),
-    HOME_Z("{z}", (fac) -> fac.hasHome() ? String.valueOf(fac.getHome().getBlockZ()) : Tag.isMinimalShow() ? null : "{ig}"),
-    CHUNKS("{chunks}", (fac) -> String.valueOf(fac.getLandRounded())),
-    WARPS("{warps}", (fac) -> String.valueOf(fac.getWarps().size())),
+    HOME_X("{x}", fac -> fac.hasHome() ? String.valueOf(fac.getHome().getBlockX()) : Tag.isMinimalShow() ? null : "{ig}"),
+    HOME_Y("{y}", fac -> fac.hasHome() ? String.valueOf(fac.getHome().getBlockY()) : Tag.isMinimalShow() ? null : "{ig}"),
+    HOME_Z("{z}", fac -> fac.hasHome() ? String.valueOf(fac.getHome().getBlockZ()) : Tag.isMinimalShow() ? null : "{ig}"),
+    CHUNKS("{chunks}", fac -> String.valueOf(fac.getLandRounded())),
+    WARPS("{warps}", fac -> String.valueOf(fac.getWarps().size())),
     HEADER("{header}", (fac, fp) -> FactionsPlugin.getInstance().txt.titleize(fac.getTag(fp))),
-    POWER("{power}", (fac) -> String.valueOf(fac.getPowerRounded())),
-    MAX_POWER("{maxPower}", (fac) -> String.valueOf(fac.getPowerMaxRounded())),
-    POWER_BOOST("{power-boost}", (fac) -> {
+    POWER("{power}", fac -> String.valueOf(fac.getPowerRounded())),
+    MAX_POWER("{maxPower}", fac -> String.valueOf(fac.getPowerMaxRounded())),
+    POWER_BOOST("{power-boost}", fac -> {
         double powerBoost = fac.getPowerBoost();
         return (powerBoost == 0.0) ? "" : (powerBoost > 0.0 ? TL.COMMAND_SHOW_BONUS.toString() : TL.COMMAND_SHOW_PENALTY.toString() + powerBoost + ")");
     }),
-    LEADER("{leader}", (fac) -> {
+    LEADER("{leader}", fac -> {
         FPlayer fAdmin = fac.getFPlayerAdmin();
         return fAdmin == null ? "Server" : fAdmin.getName().substring(0, fAdmin.getName().length() > 14 ? 13 : fAdmin.getName().length());
     }),
-    JOINING("{joining}", (fac) -> (fac.getOpen() ? TL.COMMAND_SHOW_UNINVITED.toString() : TL.COMMAND_SHOW_INVITATION.toString())),
+    JOINING("{joining}", fac -> (fac.getOpen() ? TL.COMMAND_SHOW_UNINVITED.toString() : TL.COMMAND_SHOW_INVITATION.toString())),
     FACTION("{faction}", (Function<Faction, String>) Faction::getTag),
     FACTION_RELATION_COLOR("{faction-relation-color}", (fac, fp) -> fp == null ? "" : fp.getColorTo(fac).toString()),
-    HOME_WORLD("{world}", (fac) -> fac.hasHome() ? fac.getHome().getWorld().getName() : Tag.isMinimalShow() ? null : "{ig}"),
-    RAIDABLE("{raidable}", (fac) -> {
+    HOME_WORLD("{world}", fac -> fac.hasHome() ? fac.getHome().getWorld().getName() : Tag.isMinimalShow() ? null : "{ig}"),
+    RAIDABLE("{raidable}", fac -> {
         if (FactionsPlugin.getInstance().getConfig().getBoolean("hcf.raidable", false)) {
             boolean raidable = fac.getLandRounded() >= fac.getPowerRounded();
             String str = raidable ? TL.RAIDABLE_TRUE.toString() : TL.RAIDABLE_FALSE.toString();
@@ -50,37 +50,35 @@ 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")),
+    ANNOUNCEMENT("{announcement}", fac -> 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")),
     DESCRIPTION("{description}", Faction::getDescription),
-    CREATE_DATE("{create-date}", (fac) -> TL.sdf.format(fac.getFoundedDate())),
-    LAND_REFUND("{land-refund}", (fac) -> Econ.shouldBeUsed() ? Econ.moneyString(Econ.calculateTotalLandRefund(fac.getLandRounded())) : Tag.isMinimalShow() ? null : TL.ECON_OFF.format("refund")),
-    BANK_BALANCE("{faction-balance}", (fac) -> {
+    CREATE_DATE("{create-date}", fac -> TL.sdf.format(fac.getFoundedDate())),
+    LAND_REFUND("{land-refund}", fac -> Econ.shouldBeUsed() ? Econ.moneyString(Econ.calculateTotalLandRefund(fac.getLandRounded())) : Tag.isMinimalShow() ? null : TL.ECON_OFF.format("refund")),
+    BANK_BALANCE("{faction-balance}", fac -> {
         if (Econ.shouldBeUsed()) {
             return Conf.bankEnabled ? Econ.moneyString(Econ.getBalance(fac.getAccountId())) : Tag.isMinimalShow() ? null : TL.ECON_OFF.format("balance");
         }
         return Tag.isMinimalShow() ? null : TL.ECON_OFF.format("balance");
     }),
-    TNT_BALANCE("{tnt-balance}", (fac) -> {
+    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) -> {
+    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))),
+    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))),
     ONLINE_COUNT("{online}", (fac, fp) -> {
         if (fp != null && fp.isOnline()) {
             return String.valueOf(fac.getFPlayersWhereOnline(true, fp).size());
@@ -97,12 +95,12 @@ 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())),
-    FACTION_BANCOUNT("{faction-bancount}", (fac) -> String.valueOf(fac.getBannedPlayers().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())),
+    FACTION_BANCOUNT("{faction-bancount}", fac -> String.valueOf(fac.getBannedPlayers().size())),
     ;
 
     private final String tag;
@@ -149,10 +147,7 @@ public enum FactionTag implements Tag {
         if (!this.foundInString(text)) {
             return text;
         }
-        String result = null;
-        if (this.biFunction != null) {
-            result = this.function == null ? this.biFunction.apply(faction, player) : this.function.apply(faction);
-        }
+        String result = this.function == null ? this.biFunction.apply(faction, player) : this.function.apply(faction);
         return result == null ? null : text.replace(this.tag, result);
     }
 

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

@@ -177,7 +177,7 @@ public enum FancyTag implements Tag {
 
     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.
+            return Collections.emptyList(); // We really, really shouldn't be here.
         }
         return this.function.apply(faction, player, text.replace(this.getTag(), ""), groupMap);
     }

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

@@ -21,6 +21,7 @@ public enum PlayerTag implements Tag {
     }),
     PLAYER_BALANCE("{balance}", (fp) -> Econ.isSetup() ? Econ.getFriendlyBalance(fp) : (Tag.isMinimalShow() ? null : TL.ECON_OFF.format("balance"))),
     PLAYER_POWER("{player-power}", (fp) -> String.valueOf(fp.getPowerRounded())),
+    ROLE("{player-role}", FPlayer::getRolePrefix),
     PLAYER_MAXPOWER("{player-maxpower}", (fp) -> String.valueOf(fp.getPowerMaxRounded())),
     PLAYER_KILLS("{player-kills}", (fp) -> String.valueOf(fp.getKills())),
     PLAYER_DEATHS("{player-deaths}", (fp) -> String.valueOf(fp.getDeaths())),

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

@@ -10,8 +10,8 @@ import java.util.logging.Level;
 
 public class AutoLeaveProcessTask extends BukkitRunnable {
 
-    private transient boolean readyToGo = false;
-    private transient boolean finished = false;
+    private transient boolean readyToGo;
+    private transient boolean finished;
     private transient ListIterator<FPlayer> iterator;
     private transient double toleranceMillis;
 

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

@@ -14,7 +14,10 @@ import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.entity.Player;
 
+import java.lang.reflect.InvocationTargetException;
+import java.util.Arrays;
 import java.util.UUID;
+import java.util.logging.Level;
 
 public class ClipPlaceholderAPIManager extends PlaceholderExpansion implements Relational {
 
@@ -220,10 +223,35 @@ public class ClipPlaceholderAPIManager extends PlaceholderExpansion implements R
                 Faction factionAtLocation = Board.getInstance().getFactionAt(new FLocation(player.getLocation()));
                 return factionAtLocation != null ? factionAtLocation.getTag() : Factions.getInstance().getWilderness().getTag();
         }
+        //If its not hardcoded lets try to grab it anyways
+        boolean targetFaction = false;
+        Object target = fPlayer;
+        String stripped = "";
+        if (placeholder.startsWith("faction_")) {
+            targetFaction = true;
+            target = faction;
+            stripped = placeholder.replace("faction_", "");
+        } else {
+            stripped = placeholder.replace("player_", "");
+        }
+        try {
+            Object pulled;
+            if (targetFaction) {
+                pulled = Faction.class.getDeclaredMethod(stripped).invoke(target);
+            } else {
+                pulled = FPlayer.class.getDeclaredMethod(stripped).invoke(target);
+            }
+            return String.valueOf(pulled);
+        } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) {
+            logInvalid(stripped);
+        }
 
-        return null;
+        return TL.PLACEHOLDERAPI_NULL.toString();
     }
 
+    private static void logInvalid(String placeholder) {
+        FactionsPlugin.getInstance().getLogger().log(Level.INFO, "Invalid request through PlaceholderAPI for placeholder '" + placeholder + "'");
+    }
 
     private int countOn(Faction f, Relation relation, Boolean status, FPlayer player) {
         int count = 0;

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

@@ -19,7 +19,7 @@ public class Cooldown {
     }
 
     public static boolean isOnCooldown(Player player, String name) {
-        if (!player.hasMetadata(name) || player.getMetadata(name).size() <= 0) return false;
+        if (!player.hasMetadata(name) || player.getMetadata(name).isEmpty()) return false;
         long time = player.getMetadata(name).get(0).asLong();
         return (time > System.currentTimeMillis());
     }

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

@@ -2,6 +2,7 @@ package com.massivecraft.factions.util;
 
 import com.massivecraft.factions.FLocation;
 import com.massivecraft.factions.FPlayer;
+import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.zcore.util.TL;
 import org.bukkit.scheduler.BukkitRunnable;
 
@@ -26,7 +27,9 @@ public class CornerTask extends BukkitRunnable {
             cancel();
         } else {
             FLocation fLocation = surrounding.remove(0);
-            if (fPlayer.attemptClaim(fPlayer.getFaction(), fLocation, true)) {
+            if (FactionsPlugin.cachedRadiusClaim && fPlayer.attemptClaim(fPlayer.getFaction(), fLocation, true)) {
+                ++amount;
+            } else if (fPlayer.attemptClaim(fPlayer.getFaction(), fLocation, true)) {
                 ++amount;
             } else {
                 fPlayer.sendMessage(TL.COMMAND_CORNER_FAIL_WITH_FEEDBACK.toString().replace("&", "§") + amount);

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

@@ -15,7 +15,7 @@ import java.io.IOException;
 public class InventoryUtil {
 
 
-    public static String InventoryToString(ItemStack[] items) throws IllegalStateException {
+    public static String InventoryToString(ItemStack[] items) {
         try {
             ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
             BukkitObjectOutputStream dataOutput = new BukkitObjectOutputStream(outputStream);

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

@@ -109,8 +109,6 @@ public class MiscUtil {
 
             switch (player.getRole()) {
                 case LEADER:
-                    admins.add(player);
-                    break;
                 case COLEADER:
                     admins.add(player);
                     break;

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

@@ -20,8 +20,6 @@ public class RelationUtil {
         }
 
         Faction myFaction = getFaction(me);
-//		if (myFaction == null) return that.describeTo(null); // no relation, but can show basic name or tag
-
         if (that instanceof Faction) {
             if (me instanceof FPlayer && myFaction == thatFaction) {
                 ret = TL.GENERIC_YOURFACTION.toString();

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

@@ -187,7 +187,6 @@ public abstract class SpiralTask implements Runnable {
 
     // for successful completion
     public void finish() {
-//		FactionsPlugin.getInstance().log("SpiralTask successfully completed!");
         this.stop();
     }
 

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

@@ -15,8 +15,6 @@ public class UtilFly {
      */
     @Deprecated
     public static void run() {
-        if (!FactionsPlugin.factionsFlight)
-            return;
 
         Bukkit.getScheduler().scheduleSyncRepeatingTask(FactionsPlugin.getInstance(), () -> {
             for (FPlayer fp : FPlayers.getInstance().getOnlinePlayers()) {
@@ -28,8 +26,6 @@ public class UtilFly {
 
     @Deprecated
     public static void setFly(FPlayer fp, boolean fly, boolean silent, boolean damage) {
-        if (!FactionsPlugin.factionsFlight)
-            return;
 
         fp.getPlayer().setAllowFlight(fly);
         fp.getPlayer().setFlying(fly);

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

@@ -16,8 +16,7 @@ public class VisualizeUtil {
     }
 
     public static Set<Location> getPlayerLocations(UUID uuid) {
-        Set<Location> ret = playerLocations.computeIfAbsent(uuid, k -> new HashSet<>());
-        return ret;
+        return playerLocations.computeIfAbsent(uuid, k -> new HashSet<>());
     }
 
     @SuppressWarnings("deprecation")

src/main/java/com/massivecraft/factions/util/timer/TimerRunnable.java

@@ -25,13 +25,6 @@ public class TimerRunnable {
     }
 
 
-    public TimerRunnable(UUID playerUUID, Timer timer, long duration) {
-        this.timer = timer;
-        setRemaining(duration);
-        FactionsPlugin plugin = FactionsPlugin.getInstance();
-        plugin.getTimerManager().getTimerRunnableList().add(this);
-    }
-
     public boolean isCancelled() {
         return cancelled;
     }

src/main/java/com/massivecraft/factions/util/timer/type/GraceTimer.java

@@ -26,22 +26,20 @@ public class GraceTimer extends GlobalTimer implements Listener {
 
     @EventHandler
     public void onBreak(EntityExplodeEvent e) {
-        if(getRemaining() > 0)
-        e.setCancelled(true);
+        if (getRemaining() > 0) {
+            e.setCancelled(true);
+        }
     }
 
     @EventHandler
     public void onTNTPlace(BlockPlaceEvent event) {
         FPlayer fp = FPlayers.getInstance().getByPlayer(event.getPlayer());
-        if(getRemaining() > 0) {
-            if (!fp.isAdminBypassing()) {
-                if (event.getBlock().getType().equals(Material.TNT)) {
-                    event.setCancelled(true);
-                }
-            }
+        if (getRemaining() > 0 && !fp.isAdminBypassing() && event.getBlock().getType().equals(Material.TNT)) {
+            event.setCancelled(true);
         }
     }
 
+
     @Override
     public void load(Config config) {
         setPaused(config.getBoolean(this.name + ".paused"));

src/main/java/com/massivecraft/factions/zcore/MPlugin.java

@@ -3,10 +3,7 @@ package com.massivecraft.factions.zcore;
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.reflect.TypeToken;
-import com.massivecraft.factions.Board;
-import com.massivecraft.factions.Conf;
-import com.massivecraft.factions.FPlayers;
-import com.massivecraft.factions.Factions;
+import com.massivecraft.factions.*;
 import com.massivecraft.factions.zcore.persist.SaveTask;
 import com.massivecraft.factions.zcore.util.PermUtil;
 import com.massivecraft.factions.zcore.util.Persist;
@@ -15,7 +12,6 @@ import com.massivecraft.factions.zcore.util.TextUtil;
 import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.IllegalPluginAccessException;
 import org.bukkit.plugin.java.JavaPlugin;
 
 import java.io.*;
@@ -100,9 +96,7 @@ public abstract class MPlugin extends JavaPlugin {
             long saveTicks = (long) (20 * 60 * Conf.saveToFileEveryXMinutes); // Approximately every 30 min by default
             saveTask = Bukkit.getServer().getScheduler().scheduleSyncRepeatingTask(this, new SaveTask(this), saveTicks, saveTicks);
         }
-
         loadLang();
-
         loadSuccessful = true;
         return true;
     }
@@ -178,17 +172,18 @@ public abstract class MPlugin extends JavaPlugin {
     }
 
     public void onDisable() {
-            if (saveTask != null) {
-                this.getServer().getScheduler().cancelTask(saveTask);
-                saveTask = null;
-            }
-            // only save data if plugin actually loaded successfully
-            if (loadSuccessful) {
-                Factions.getInstance().forceSave();
-                FPlayers.getInstance().forceSave();
-                Board.getInstance().forceSave();
-            }
-            log("Disabled");
+        if (saveTask != null) {
+            this.getServer().getScheduler().cancelTask(saveTask);
+            saveTask = null;
+        }
+        // only save data if plugin actually loaded successfully
+        if (loadSuccessful) {
+            Factions.getInstance().forceSave();
+            FPlayers.getInstance().forceSave();
+            Board.getInstance().forceSave();
+        }
+
+        log("Disabled");
     }
 
     // -------------------------------------------- //

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

@@ -19,6 +19,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public class PermissableActionFrame {
 
@@ -30,9 +31,10 @@ public class PermissableActionFrame {
 
     public PermissableActionFrame(Faction f) {
         ConfigurationSection section = FactionsPlugin.getInstance().getConfig().getConfigurationSection("fperm-gui.action");
+        assert section != null;
         gui = new Gui(FactionsPlugin.getInstance(),
-                section.getInt("rows", 3),
-                FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fperm-gui.action.name").replace("{faction}", f.getTag())));
+                section.getInt("rows", 4),
+                FactionsPlugin.getInstance().color(Objects.requireNonNull(FactionsPlugin.getInstance().getConfig().getString("fperm-gui.action.name")).replace("{faction}", f.getTag())));
     }
 
     public void buildGUI(FPlayer fplayer, Permissable perm) {
@@ -40,8 +42,7 @@ public class PermissableActionFrame {
         List<GuiItem> GUIItems = new ArrayList<>();
         ItemStack dumby = buildDummyItem();
         // Fill background of GUI with dumbyitem & replace GUI assets after
-        for (int x = 0; x <= (gui.getRows() * 9) - 1; x++)
-            GUIItems.add(new GuiItem(dumby, e -> e.setCancelled(true)));
+        for (int x = 0; x <= (gui.getRows() * 9) - 1; x++) GUIItems.add(new GuiItem(dumby, e -> e.setCancelled(true)));
         for (PermissableAction action : PermissableAction.values()) {
             if (action.getSlot() == -1) continue;
             GUIItems.set(action.getSlot(), new GuiItem(action.buildAsset(fplayer, perm), e -> {
@@ -53,17 +54,12 @@ public class PermissableActionFrame {
                         case LEFT:
                             access = Access.ALLOW;
                             success = fplayer.getFaction().setPermission(perm, action, access);
-                            FactionsPlugin.instance.logFactionEvent(fplayer.getFaction(), FLogType.PERM_EDIT_DEFAULTS, fplayer.getName(), ChatColor.GREEN.toString() + ChatColor.BOLD + "ALLOWED", action.getName(), perm.name());
                             break;
                         case RIGHT:
                             access = Access.DENY;
                             success = fplayer.getFaction().setPermission(perm, action, access);
-                            FactionsPlugin.instance.logFactionEvent(fplayer.getFaction(), FLogType.PERM_EDIT_DEFAULTS, fplayer.getName(), ChatColor.RED.toString() + ChatColor.BOLD + "DENIED", action.getName(), perm.name());
                             break;
                         case MIDDLE:
-                            access = Access.UNDEFINED;
-                            success = fplayer.getFaction().setPermission(perm, action, access);
-                            break;
                         default:
                             return;
                     }
@@ -93,9 +89,11 @@ public class PermissableActionFrame {
         ConfigurationSection config = FactionsPlugin.getInstance().getConfig().getConfigurationSection("fperm-gui.dummy-item");
         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")));
-        item.setItemMeta(meta);
+        if (meta != null) {
+            meta.setLore(FactionsPlugin.getInstance().colorList(config.getStringList("Lore")));
+            meta.setDisplayName(FactionsPlugin.getInstance().color(config.getString("Name")));
+            item.setItemMeta(meta);
+        }
         return item;
     }
 
@@ -103,9 +101,11 @@ public class PermissableActionFrame {
         ConfigurationSection config = FactionsPlugin.getInstance().getConfig().getConfigurationSection("fperm-gui.back-item");
         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")));
-        item.setItemMeta(meta);
+        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/gui/PermissableRelationFrame.java

@@ -16,6 +16,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 public class PermissableRelationFrame {
 
@@ -27,9 +28,10 @@ public class PermissableRelationFrame {
 
     public PermissableRelationFrame(Faction f) {
         ConfigurationSection section = FactionsPlugin.getInstance().getConfig().getConfigurationSection("fperm-gui.relation");
+        assert section != null;
         gui = new Gui(FactionsPlugin.getInstance(),
-                section.getInt("rows", 3),
-                FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fperm-gui.relation.name").replace("{faction}", f.getTag())));
+                section.getInt("rows", 4),
+                FactionsPlugin.getInstance().color(Objects.requireNonNull(FactionsPlugin.getInstance().getConfig().getString("fperm-gui.relation.name")).replace("{faction}", f.getTag())));
     }
 
     public void buildGUI(FPlayer fplayer) {
@@ -37,8 +39,7 @@ public class PermissableRelationFrame {
         List<GuiItem> GUIItems = new ArrayList<>();
         ItemStack dumby = buildDummyItem();
         // Fill background of GUI with dumbyitem & replace GUI assets after
-        for (int x = 0; x <= (gui.getRows() * 9) - 1; x++)
-            GUIItems.add(new GuiItem(dumby, e -> e.setCancelled(true)));
+        for (int x = 0; x <= (gui.getRows() * 9) - 1; x++) GUIItems.add(new GuiItem(dumby, e -> e.setCancelled(true)));
         ConfigurationSection sec = FactionsPlugin.getInstance().getConfig().getConfigurationSection("fperm-gui.relation");
         for (String key : sec.getConfigurationSection("slots").getKeys(false)) {
             if (key == null || sec.getInt("slots." + key) < 0) continue;
@@ -58,8 +59,10 @@ public class PermissableRelationFrame {
     private ItemStack buildAsset(String loc, String relation) {
         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);
+        if (meta != null) {
+            meta.setDisplayName(FactionsPlugin.getInstance().color(FactionsPlugin.getInstance().getConfig().getString("fperm-gui.relation.Placeholder-Item.Name").replace("{relation}", relation)));
+            item.setItemMeta(meta);
+        }
         return item;
     }
 
@@ -67,9 +70,12 @@ public class PermissableRelationFrame {
         ConfigurationSection config = FactionsPlugin.getInstance().getConfig().getConfigurationSection("fperm-gui.dummy-item");
         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")));
-        item.setItemMeta(meta);
+        // So u can set it to air.
+        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/frame/fupgrades/UpgradesListener.java

@@ -25,22 +25,22 @@ public class UpgradesListener implements Listener {
 
     @EventHandler
     public static void onDamageReduction(EntityDamageByEntityEvent e) {
-        if (e.isCancelled()) {
-            return;
-        }
-        if (!(e.getDamager() instanceof Player) || !(e.getEntity() instanceof Player)) {
-            return;
-        }
+        if (e.isCancelled()) return;
+
+        if (!(e.getDamager() instanceof Player) || !(e.getEntity() instanceof Player)) return;
+        if(e.getEntity() == null) return;
+
         FPlayer fme = FPlayers.getInstance().getByPlayer((Player) e.getEntity());
         FPlayer dame = FPlayers.getInstance().getByPlayer((Player) e.getDamager());
-        if (fme == null || dame == null) {
-            return;
-        }
+
+        if (fme == null || dame == null) return;
         FLocation floc = new FLocation(fme.getPlayer().getLocation());
+
+        if(floc == null) return;
+
         if (Board.getInstance().getFactionAt(floc) == fme.getFaction()) {
-            if (dame.getFaction() == fme.getFaction()) {
-                return;
-            }
+            if (dame.getFaction() == fme.getFaction()) return;
+
             double damage = e.getDamage();
             int level = fme.getFaction().getUpgrade(UpgradeType.DAMAGEDECREASE);
             double increase = FactionsPlugin.getInstance().getConfig().getDouble("fupgrades.MainMenu.DamageReduction.DamageReductionPercent.level-" + level);
@@ -50,20 +50,17 @@ public class UpgradesListener implements Listener {
 
     @EventHandler
     public static void onDamageIncrease(EntityDamageByEntityEvent e) {
-        if (e == null) {
-            return;
-        }
-        if (!(e.getDamager() instanceof Player) || !(e.getEntity() instanceof Player)) {
-            return;
-        }
+        if (e == null) return;
+
+        if (!(e.getDamager() instanceof Player) || !(e.getEntity() instanceof Player)) return;
+
 
         if (e.getDamager().hasMetadata("NPC") || e.getEntity().hasMetadata("NPC")) return;
 
         FPlayer fme = FPlayers.getInstance().getByPlayer((Player) e.getEntity());
         FPlayer dame = FPlayers.getInstance().getByPlayer((Player) e.getDamager());
-        if (fme == null || dame == null) {
-            return;
-        }
+        if (fme == null || dame == null) return;
+
 
         FLocation floc = new FLocation(fme.getPlayer().getLocation());
 
@@ -87,9 +84,8 @@ public class UpgradesListener implements Listener {
     @EventHandler
     public void onDeath(EntityDeathEvent e) {
         Entity killer = e.getEntity().getKiller();
-        if (killer == null || !(killer instanceof Player)) {
-            return;
-        }
+        if (killer == null || !(killer instanceof Player)) return;
+
         FLocation floc = new FLocation(e.getEntity().getLocation());
         Faction faction = Board.getInstance().getFactionAt(floc);
         if (!faction.isWilderness()) {
@@ -112,9 +108,7 @@ public class UpgradesListener implements Listener {
         Faction factionAtLoc = Board.getInstance().getFactionAt(floc);
         if (!factionAtLoc.isWilderness()) {
             int level = factionAtLoc.getUpgrade(UpgradeType.SPAWNER);
-            if (level == 0) {
-                return;
-            }
+            if (level == 0) return;
             this.lowerSpawnerDelay(e, FactionsPlugin.getInstance().getConfig().getDouble("fupgrades.MainMenu.Spawners.Spawner-Boost.level-" + level));
         }
     }
@@ -131,13 +125,10 @@ public class UpgradesListener implements Listener {
         if (!factionAtLoc.isWilderness()) {
             int level = factionAtLoc.getUpgrade(UpgradeType.CROP);
             int chance = FactionsPlugin.getInstance().getConfig().getInt("fupgrades.MainMenu.Crops.Crop-Boost.level-" + level);
-            if (level == 0 || chance == 0) {
-                return;
-            }
+            if (level == 0 || chance == 0) return;
+
             int randomNum = ThreadLocalRandom.current().nextInt(1, 101);
-            if (randomNum <= chance) {
-                this.growCrop(e);
-            }
+            if (randomNum <= chance) this.growCrop(e);
         }
     }
 
@@ -173,21 +164,16 @@ public class UpgradesListener implements Listener {
         if (!factionAtLoc.isWilderness()) {
             int level = factionAtLoc.getUpgrade(UpgradeType.REDSTONE);
             if (level != 0) {
-                if (level == 1) {
-                    FactionsPlugin.getInstance().getConfig().getInt("fupgrades.MainMenu.Redstone.Cost");
-                }
-                if (unbreakable.contains(block)) {
-                    e.setCancelled(true);
-                }
+                if (level == 1) FactionsPlugin.getInstance().getConfig().getInt("fupgrades.MainMenu.Redstone.Cost");
+                if (unbreakable.contains(block)) e.setCancelled(true);
             }
         }
     }
 
     @EventHandler
     public void onArmorDamage(PlayerItemDamageEvent e) {
-        if (FPlayers.getInstance().getByPlayer(e.getPlayer()) == null) {
-            return;
-        }
+        if (FPlayers.getInstance().getByPlayer(e.getPlayer()) == null) return;
+
         if (e.getItem().getType().toString().contains("LEGGINGS") || e.getItem().getType().toString().contains("CHESTPLATE") || e.getItem().getType().toString().contains("HELMET") || e.getItem().getType().toString().contains("BOOTS")) {
             int lvl = FPlayers.getInstance().getByPlayer(e.getPlayer()).getFaction().getUpgrade(UpgradeType.REINFORCEDARMOR);
             double drop = FactionsPlugin.getInstance().getConfig().getDouble("fupgrades.MainMenu.Armor.Armor-HP-Drop.level-" + lvl);

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

@@ -663,25 +663,34 @@ public abstract class MemoryFPlayer implements FPlayer {
     public void updatePower() {
         if (this.isOffline()) {
             losePowerFromBeingOffline();
-            if (!Conf.powerRegenOffline) return;
+            if (!Conf.powerRegenOffline) {
+                return;
+            }
         } else if (hasFaction() && getFaction().isPowerFrozen()) {
             return; // Don't let power regen if faction power is frozen.
         }
 
         long now = System.currentTimeMillis();
-        this.millisPassed = now - this.lastPowerUpdateTime;
+        long millisPassed = now - this.lastPowerUpdateTime;
         this.lastPowerUpdateTime = now;
 
         Player thisPlayer = this.getPlayer();
-        if (thisPlayer != null && thisPlayer.isDead())
+        if (thisPlayer != null && thisPlayer.isDead()) {
             return;  // don't let dead players regain power until they respawn
-        PowerRegenEvent powerRegenEvent = new PowerRegenEvent(getFaction(), this);
-        Bukkit.getScheduler().runTask(FactionsPlugin.getInstance(), () -> Bukkit.getServer().getPluginManager().callEvent(powerRegenEvent));
+        }
 
-        if (!powerRegenEvent.isCancelled())
-            if (!powerRegenEvent.usingCustomPower())
-                this.alterPower(millisPassed * Conf.powerPerMinute / 60000); // millisPerMinute : 60 * 1000
-            else this.alterPower(+powerRegenEvent.getCustomPower());
+        double delta = millisPassed * Conf.powerPerMinute / 60000; // millisPerMinute : 60 * 1000
+        if (Bukkit.getPluginManager().getPlugin("FactionsPlugin") != null) {
+            Bukkit.getScheduler().runTask(FactionsPlugin.getInstance(), () -> {
+                PowerRegenEvent powerRegenEvent = new PowerRegenEvent(getFaction(), this, delta);
+                Bukkit.getServer().getPluginManager().callEvent(powerRegenEvent);
+                if (!powerRegenEvent.isCancelled()) {
+                    this.alterPower(powerRegenEvent.getDelta());
+                }
+            });
+        } else {
+            this.alterPower(delta);
+        }
     }
 
     public void losePowerFromBeingOffline() {
@@ -963,9 +972,6 @@ public abstract class MemoryFPlayer implements FPlayer {
     }
 
     public void setFFlying(boolean fly, boolean damage) {
-        if (!FactionsPlugin.factionsFlight)
-            return;
-
         Player player = getPlayer();
         if (player == null) return;
 
@@ -974,8 +980,9 @@ public abstract class MemoryFPlayer implements FPlayer {
 
         if (!damage) {
             msg(TL.COMMAND_FLY_CHANGE, fly ? "enabled" : "disabled");
-            if (!fly)
+            if (!fly) {
                 sendMessage(TL.COMMAND_FLY_COOLDOWN.toString().replace("{amount}", FactionsPlugin.getInstance().getConfig().getInt("fly-falldamage-cooldown", 3) + ""));
+            }
         } else {
             msg(TL.COMMAND_FLY_DAMAGE);
         }
@@ -993,6 +1000,7 @@ public abstract class MemoryFPlayer implements FPlayer {
                 Bukkit.getScheduler().runTaskLater(FactionsPlugin.getInstance(), () -> setTakeFallDamage(true), 20L * cooldown);
             }
         }
+
         isFlying = fly;
     }
 
@@ -1018,8 +1026,14 @@ 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.checkFly(this, getPlayer(), faction);
+        if ((faction == getFaction() && getRole() == Role.LEADER) || isAdminBypassing) {
+            return true;
+        }
+
+        if (faction.isSystemFaction()) {
+            return CmdFly.checkBypassPerms(this, getPlayer(), faction, false);
+        }
+
         Access access = faction.getAccess(this, PermissableAction.FLY);
         return access == null || access == Access.UNDEFINED || access == Access.ALLOW;
     }
@@ -1288,11 +1302,13 @@ public abstract class MemoryFPlayer implements FPlayer {
 
 
         // announce success
-        Set<FPlayer> informTheseFPlayers = new HashSet<>();
-        informTheseFPlayers.add(this);
-        informTheseFPlayers.addAll(forFaction.getFPlayersWhereOnline(true));
-        for (FPlayer fp : informTheseFPlayers) {
-            fp.msg(TL.CLAIM_CLAIMED, this.describeTo(fp, true), forFaction.describeTo(fp), currentFaction.describeTo(fp));
+        if(!FactionsPlugin.cachedRadiusClaim) {
+            Set<FPlayer> informTheseFPlayers = new HashSet<>();
+            informTheseFPlayers.add(this);
+            informTheseFPlayers.addAll(forFaction.getFPlayersWhereOnline(true));
+            for (FPlayer fp : informTheseFPlayers) {
+                fp.msg(TL.CLAIM_CLAIMED, this.describeTo(fp, true), forFaction.describeTo(fp), currentFaction.describeTo(fp));
+            }
         }
 
         Board.getInstance().setFactionAt(forFaction, flocation);

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

@@ -1277,9 +1277,10 @@ public abstract class MemoryFaction implements Faction, EconomyParticipator {
             if (Conf.logFactionDisband)
                 FactionsPlugin.getInstance().log("The faction " + this.getTag() + " (" + this.getId() + ") has been disbanded since it has no members left" + (autoLeave ? " and by inactivity" : "") + ".");
 
-
-            for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers())
-                fplayer.msg(TL.COMMAND_DISBAND_BROADCAST_GENERIC, this.getTag(fplayer));
+            if(FactionsPlugin.getInstance().getConfig().getBoolean("faction-disband-broadcast")) {
+                for (FPlayer fplayer : FPlayers.getInstance().getOnlinePlayers())
+                    fplayer.msg(TL.COMMAND_DISBAND_BROADCAST_GENERIC, this.getTag(fplayer));
+            }
 
 
             FactionDisbandEvent disbandEvent = new FactionDisbandEvent(null, getId(), autoLeave ? PlayerDisbandReason.INACTIVITY : PlayerDisbandReason.LEAVE);

src/main/java/com/massivecraft/factions/zcore/util/TL.java

@@ -141,14 +141,14 @@ public enum TL {
     COMMAND_ADMIN_TARGETSELF("'&c&l[!] &cThe target player musn''t be yourself."),
     COMMAND_ADMIN_DEMOTES("&c&l[!] &cYou have demoted &7%1$s &cfrom the position of faction admin."),
     COMMAND_ADMIN_DEMOTED("&c&l[!] &cYou have been demoted from the position of faction admin by &7%1$s&c"),
-    COMMAND_ADMIN_PROMOTES("&e&l[!] &eYou have promoted &6%1$s &eto the position of faction admin."),
-    COMMAND_ADMIN_PROMOTED("&e&l[!] &6%1$s &egave &6%2$s &ethe leadership of &6%3$s&e."),
+    COMMAND_ADMIN_PROMOTES("&c&l[!] &7You have promoted &c%1$s &7to the position of faction admin."),
+    COMMAND_ADMIN_PROMOTED("&c&l[!] &c%1$s &7gave &c%2$s &7the leadership of &c%3$s&7."),
     COMMAND_ADMIN_DESCRIPTION("Hand over your admin rights"),
     COMMAND_ADMIN_NOMEMBERS("&e&l[!] &cNo one else to promote, please disband faction."),
 
     COMMAND_AHOME_DESCRIPTION("Send a player to their f home no matter what."),
     COMMAND_AHOME_NOHOME("%1$s doesn't have an f home."),
-    COMMAND_AHOME_SUCCESS("$1%s was sent to their f home."),
+    COMMAND_AHOME_SUCCESS("%1%s was sent to their f home."),
     COMMAND_AHOME_OFFLINE("%1$s is offline."),
     COMMAND_AHOME_TARGET("You were sent to your f home."),
 
@@ -302,7 +302,7 @@ public enum TL {
     COMMAND_CREATE_TOCREATE("to create a new faction"),
     COMMAND_CREATE_FORCREATE("for creating a new faction"),
     COMMAND_CREATE_ERROR("&c&l[!]&7 There was an &cinternal error&7 while trying to create your faction. &cPlease try again&7."),
-    COMMAND_CREATE_CREATED("&c&l[!]&7 &c%1$s &7created a new faction &c&l%2$s"),
+    COMMAND_CREATE_CREATED("&c&l[!]&7 &c%1$s &7created a new faction named &c&l%2$s&7."),
     COMMAND_CREATE_YOUSHOULD("&c&l[!]&7 You should now: &c%1$s"),
     COMMAND_CREATE_CREATEDLOG(" created a new faction: "),
     COMMAND_CREATE_DESCRIPTION("Create a new faction"),
@@ -395,20 +395,20 @@ public enum TL {
     COMMAND_DISBAND_MARKEDPERMANENT("&c&l[!]&7 This faction is designated as&c permanent&7, so you cannot disband it."),
     COMMAND_DISBAND_BROADCAST_YOURS("&c&l[!]&7 &c%1$s&7 disbanded your &cfaction."),
     COMMAND_DISBAND_BROADCAST_GENERIC("&c&l[!]&7 The Faction &c%1$s&7 was disbanded."),
-    COMMAND_DISBAND_BROADCAST_NOTYOURS("&c&l[!]&7 &c%1$s &7disbanded the faction &c%2$s."),
+    COMMAND_DISBAND_BROADCAST_NOTYOURS("&c&l[!]&7 &c%1$s &7disbanded the faction &c%2$s&7."),
     COMMAND_DISBAND_HOLDINGS("&c&l[!]&7 &7You have been given the disbanded &cfaction's bank&7, totaling &c%1$s."),
     COMMAND_DISBAND_PLAYER("&c&l[!] &7You have disbanded your &cfaction"),
     COMMAND_DISBAND_CONFIRM("&c&l[!]&7 Your Faction has&c {tnt} &7tnt left in the bank, it will be &clost&7 if the faction is &cdisbanded&7. Type&c /f disband &7again within &c10&7 seconds to&c disband&7."),
     COMMAND_DISBAND_DESCRIPTION("Disband a faction"),
 
-    COMMAND_FLY_DISABLED("&c&l[!]&7 Sorry, Faction flight is &cdisabled &7on this server"),
+    COMMAND_FLY_DISABLED("&c&l[!]&7 Sorry, Faction flight is &cdisabled &7on this server."),
     COMMAND_FLY_DESCRIPTION("Enter or leave Faction flight mode"),
-    COMMAND_FLY_CHANGE("&c&l[!]&7 Faction flight &c%1$s"),
-    COMMAND_FLY_COOLDOWN("&c&l[!]&7 You will &cnot&7 take fall damage for &c{amount}&7 seconds"),
-    COMMAND_FLY_DAMAGE("&c&l[!]&7 Faction flight &cdisabled&7 due to entering combat"),
+    COMMAND_FLY_CHANGE("&c&l[!]&7 Faction flight has been &c%1$s&7."),
+    COMMAND_FLY_COOLDOWN("&c&l[!]&7 You will &cnot&7 take fall damage for &c{amount}&7 seconds."),
+    COMMAND_FLY_DAMAGE("&c&l[!]&7 Faction flight &cdisabled&7 due to entering combat."),
     COMMAND_FLY_NO_ACCESS("&c&l[!]&7 &cCannot fly &7in territory of %1$s"),
-    COMMAND_FLY_ENEMY_NEAR("&c&l[!]&7 Flight has been&c disabled&7 an enemy is nearby"),
-    COMMAND_FLY_CHECK_ENEMY("&c&l[!]&7 Cannot fly here, an enemy is &cnearby"),
+    COMMAND_FLY_ENEMY_NEAR("&c&l[!]&7 Flight has been&c disabled&7 an enemy is nearby."),
+    COMMAND_FLY_CHECK_ENEMY("&c&l[!]&7 Cannot fly here, an enemy is &cnearby&7."),
     COMMAND_FLY_NO_EPEARL("&c&l[!] &7You &ccannot&7 throw enderpearls while flying!"),
 
     COMMAND_FOCUS_SAMEFACTION("&c[!] You may not focus players in your faction!"),
@@ -621,7 +621,7 @@ public enum TL {
     COMMAND_OPEN_OPEN("open"),
     COMMAND_OPEN_CLOSED("closed"),
     COMMAND_OPEN_CHANGES("&c&l[!]&7 &c%1$s&7 changed the faction to &c%2$s&7."),
-    COMMAND_OPEN_CHANGED("&c&l[!]&7 The faction &c%1$s&7 is now &c%2$s"),
+    COMMAND_OPEN_CHANGED("&c&l[!]&7 The faction &c%1$s&7 is now &c%2$s&7."),
     COMMAND_OPEN_DESCRIPTION("Switch if invitation is required to join"),
 
     COMMAND_OWNER_DISABLED("&c&l[!]&7 Sorry, but &cowned areas &7are &cdisabled &7on this server."),
@@ -707,11 +707,14 @@ public enum TL {
     COMMAND_PERMANENT_GRANT("&c&l[!]&7 added permanent status to"),
     COMMAND_PERMANENT_REVOKE("&c&l[!]&7 removed permanent status from"),
     COMMAND_PERMANENT_YOURS("&c&l[!]&7 &c%1$s&7 has &c%2$s&7 your faction"),
-    COMMAND_PERMANENT_OTHER("&c&l[!]&7 &c%s &7has &c%s &7the faction &c'%s'."),
-    COMMAND_PROMOTE_TARGET("&c&l[!]&7 You've been &c%1$s&7 to &c%2$s"),
-    COMMAND_PROMOTE_SUCCESS("&c&l[!]&7 You successfully&c %1$s %2$s &cto&7 %3$s"),
+    COMMAND_PERMANENT_OTHER("&c&l[!]&7 &c%s &7has &c%s &7the faction '&c%s&7'."),
+    COMMAND_PROMOTE_TARGET("&c&l[!]&7 You've been &c%1$s&7 to &c%2$s&7."),
+    COMMAND_PROMOTE_SUCCESS("&c&l[!]&7 You successfully &c%1$s %2$s &cto&7 %3$s&7."),
     COMMAND_PROMOTE_PROMOTED("promoted"),
     COMMAND_PROMOTE_DEMOTED("demoted"),
+    COMMAND_PROMOTE_LOWEST_RANK("&c&l[!]&7 &c%1$s&7 already has the lowest rank in the faction."),
+    COMMAND_PROMOTE_HIGHEST_RANK("&c&l[!]&7 &c%1$s&7 already has the highest rank in the faction."),
+    COMMAND_PROMOTE_HIGHER_RANK("&c&l[!]&7 &c%1$s&7 has a higher rank than yours. You &4can not modify&7 his rank."),
     COMMAND_PROMOTE_COLEADER_ADMIN("&c&l[!]&7 &cColeaders cant promote players to Admin!"),
 
     COMMAND_PERMANENTPOWER_DESCRIPTION("Toggle permanent faction power option"),
@@ -723,7 +726,6 @@ public enum TL {
     COMMAND_PROMOTE_DESCRIPTION("/f promote <name>"),
     COMMAND_PROMOTE_WRONGFACTION("&c&l[!]&7 &c%1$s&7 is &cnot&7 part of your faction."),
     COMMAND_NOACCESS("&c&l[!]&7 You don't have access to that."),
-    COMMAND_PROMOTE_NOTTHATPLAYER("&c&l[!]&7 That player &ccannot&7 be promoted."),
     COMMAND_PROMOTE_NOT_ALLOWED("&c&l[!]&7 You cannot promote to the same rank as yourself!"),
     COMMAND_PROMOTE_NOTSELF("&c&l[!]&7 You cannot manage your own rank."),
     COMMAND_PROMOTE_NOT_SAME("&c&l[!]&7 You cannot promote to the same rank as yourself!"),
@@ -731,7 +733,7 @@ public enum TL {
 
     COMMAND_POWER_TOSHOW("to show player power info"),
     COMMAND_POWER_FORSHOW("for showing player power info"),
-    COMMAND_POWER_POWER("&c&l[!]&7 &c%1$s » &cPower &7/ &cMaxpower&a » &c%2$d &7/&c%3$d %4$s"),
+    COMMAND_POWER_POWER("&c&l[!]&7 &c%1$s » &cPower &7/ &cMaxpower&a » &c%2$d &7/ &c%3$d %4$s"),
     COMMAND_POWER_BONUS(" (bonus: "),
     COMMAND_POWER_PENALTY(" (penalty: "),
     COMMAND_POWER_DESCRIPTION("&a&l» &7Show player &apower &7info"),
@@ -750,16 +752,16 @@ public enum TL {
     COMMAND_RELATIONS_ALREADYINRELATIONSHIP("&c&l[!]&7 You &calready&7 have that relation wish set with&c %1$s."),
     COMMAND_RELATIONS_TOMARRY("to change a relation wish"),
     COMMAND_RELATIONS_FORMARRY("for changing a relation wish"),
-    COMMAND_RELATIONS_MUTUAL("&c&l[!]&7 Your faction is now %1$s to %2$s"),
+    COMMAND_RELATIONS_MUTUAL("&c&l[!]&7 Your faction is now %1$s&7 to &c%2$s&7."),
     COMMAND_RELATIONS_PEACEFUL("&c&l[!]&7 This will have no effect while your faction is peaceful."),
     COMMAND_RELATIONS_PEACEFULOTHER("&c&l[!]&7 This will have &cno effect&7 while their faction is peaceful."),
     COMMAND_RELATIONS_DESCRIPTION("Set relation wish to another faction"),
     COMMAND_RELATIONS_EXCEEDS_ME("&c&l[!]&7 Failed to set relation wish. You can only have %1$s %2$s."),
     COMMAND_RELATIONS_EXCEEDS_THEY("&c&l[!]&7 Failed to set relation wish. They can only have %1$s %2$s."),
 
-    COMMAND_RELATIONS_PROPOSAL_1("&c&l[!]&7&c %1$s &7wishes to be your&c %2$s"),
+    COMMAND_RELATIONS_PROPOSAL_1("&c&l[!]&7 &c%1$s &7wishes to be your &c%2$s&7."),
     COMMAND_RELATIONS_PROPOSAL_2("&c&l[!]&7 Type &c/%1$s %2$s %3$s&7 to accept."),
-    COMMAND_RELATIONS_PROPOSAL_SENT("&c&l[!]&7 &c%1$s&7 were informed that you wish to be &c%2$s"),
+    COMMAND_RELATIONS_PROPOSAL_SENT("&c&l[!]&7 &c%1$s&7 were informed that you wish to be &c%2$s&7."),
 
     COMMAND_RELOAD_TIME("&c&l[!]&7 Reloaded &call &7configuration files from disk, took &c%1$d ms."),
     COMMAND_RELOAD_DESCRIPTION("Reload data file(s) from disk"),
@@ -1033,12 +1035,12 @@ public enum TL {
     /**
      * Leaving - This is accessed through a command, and so it MAY need a COMMAND_* slug :s
      */
-    LEAVE_PASSADMIN("You must give the admin role to someone else first."),
-    LEAVE_NEGATIVEPOWER("You cannot leave until your power is positive."),
+    LEAVE_PASSADMIN("&c&l[!] &7You must give the admin role to someone else first."),
+    LEAVE_NEGATIVEPOWER("&c&l[!] &7You cannot leave until your power is positive."),
     LEAVE_TOLEAVE("to leave your faction."),
     LEAVE_FORLEAVE("for leaving your faction."),
-    LEAVE_LEFT("%s left faction %s."),
-    LEAVE_DISBANDED("%s was disbanded."),
+    LEAVE_LEFT("&c&l[!] &c%s&7 left faction &c%s&7."),
+    LEAVE_DISBANDED("&c&l[!] &c%s&7 was disbanded."),
     LEAVE_DISBANDEDLOG("The faction %s (%s) was disbanded due to the last player (%s) leaving."),
     LEAVE_DESCRIPTION("\\n  &a&l» &7Leave your faction"),
     AUTOLEAVE_ADMIN_PROMOTED("&e&l[!] &7Faction admin &c%s&7 has been removed. &c%s&7 has been promoted as the new faction admin."),
@@ -1067,6 +1069,7 @@ public enum TL {
     CLAIM_FORCLAIM("for claiming this land"),
     CLAIM_TOOVERCLAIM("to overclaim this land"),
     CLAIM_FOROVERCLAIM("for over claiming this land"),
+    CLAIM_RADIUS_CLAIM("%1$s &eclaimed %2$s chunks &astarting from &e(X: %3$s, Z: %4$s)"),
     CLAIM_CLAIMED("%s claimed land for %s from %s."),
     CLAIM_CLAIMEDLOG("%s claimed land at (%s) for the faction: %s"),
     CLAIM_OVERCLAIM_DISABLED("Over claiming is disabled on this server."),
@@ -1171,7 +1174,7 @@ public enum TL {
     ECON_PERSONTOOKMONEYFROM("%1$s took %2$s from %3$s."),
     ECON_DISABLED("Factions econ is disabled."),
     ECON_OVER_BAL_CAP("&4The amount &e%s &4is over Essentials' balance cap."),
-    ECON_MONEYLOST("&c%s &7lost &c%s &7%s."),
+    ECON_MONEYLOST("&c&l[!] %s &7lost &c%s &7%s."),
     ECON_CANTAFFORD("&c%s &7can't afford &c%s&7 %s."),
     ECON_UNABLETOTRANSFER("&7Unable to transfer &c%s&7 to &c%s&7 from &c%s&7."),
     ECON_PLAYERBALANCE("&c%s&7's balance is &c%s&7."),
@@ -1284,7 +1287,9 @@ public enum TL {
     WARMUPS_NOTIFY_FLIGHT("&eFlight will enable in &d%2$d &eseconds."),
     WARMUPS_NOTIFY_TELEPORT("&eYou will teleport to &d%1$s &ein &d%2$d &eseconds."),
     WARMUPS_ALREADY("&cYou are already warming up."),
-    WARMUPS_CANCELLED("&cYou have cancelled your warmup.");
+    WARMUPS_CANCELLED("&cYou have cancelled your warmup."),
+
+    PLACEHOLDERAPI_NULL("");
 
     public static SimpleDateFormat sdf;
     private static YamlConfiguration LANG;

src/main/java/com/massivecraft/factions/zcore/util/TagUtil.java

@@ -105,7 +105,6 @@ public class TagUtil {
         if (FactionsPlugin.getInstance().isMVdWPlaceholderAPIHooked() && player.isOnline()) {
             line = be.maximvdw.placeholderapi.PlaceholderAPI.replacePlaceholders(player, line);
         }
-
         return line;
     }
 

src/main/java/com/massivecraft/factions/zcore/util/TextUtil.java

@@ -47,33 +47,45 @@ public class TextUtil {
         String text = "";
         FancyMessage message = new FancyMessage(text);
         ChatColor color = null;
+        ChatColor style = null;
         char[] chars = first.toCharArray();
 
         for (int i = 0; i < chars.length; i++) {
             // changed this so javadocs wont throw an error
             String compareChar = chars[i] + "";
             if (compareChar.equals("§")) {
-                if (color != null) {
-                    if (color.isColor()) {
-                        message.then(text).color(color);
-                    } else {
-                        message.then(text).style(color);
+                if (color != null || style != null) {
+                    message.then(text);
+                    if (color != null)
+                        message.color(color);
+                    if (style != null) {
+                        message.style(style);
+                        style = null;
                     }
                     text = "";
                 }
-                color = ChatColor.getByChar(chars[i + 1]);
+                ChatColor tempColor = ChatColor.getByChar(chars[i + 1]);
+                if (tempColor != null) {
+                    if (tempColor == ChatColor.RESET) {
+                        color = ChatColor.WHITE;
+                    } else if (tempColor.isColor()) {
+                        color = tempColor;
+                    } else {
+                        style = tempColor;
+                    }
+                }
                 i++; // skip color char
             } else {
                 text += chars[i];
             }
         }
         if (text.length() > 0) {
-            if (color != null) {
-                if (color.isColor()) {
-                    message.then(text).color(color);
-                } else {
-                    message.then(text).style(color);
-                }
+            if (color != null || style != null) {
+                message.then(text);
+                if (color != null)
+                    message.color(color);
+                if (style != null)
+                    message.style(style);
             } else {
                 message.text(text);
             }

src/main/resources/config.yml

@@ -832,7 +832,7 @@ Missions:
       - "&b&lMine &f&n10,000&r &2Sugar Cane"
     Mission:
       Type: "MINE"
-      Material: "SUGAR_CANE_BLOCK"
+      Material: "SUGAR_CANE"
       Amount: 10000
     Reward:
       Commands: ["f points add %faction% 100"]
@@ -1250,9 +1250,9 @@ fupgrades:
     Members:
       Max-Level: 3
       Members-Limit:
-        level-1: 30
-        level-2: 35
-        level-3: 40
+        level-1: 5 #The Number Of Members It Will Increase By
+        level-2: 10
+        level-3: 15
       Cost:
         level-1: 1000000
         level-2: 2000000
@@ -1266,9 +1266,9 @@ fupgrades:
           - '&7&oYour current level is &e&l&o{level}'
           - ''
           - '&c&lFaction Member Limit'
-          - '&4&l* &cLevel 1: &f30'
-          - '&4&l* &cLevel 2: &f35'
-          - '&4&l* &cLevel 3: &f40'
+          - '&4&l* &cLevel 1: &f35'
+          - '&4&l* &cLevel 2: &f40'
+          - '&4&l* &cLevel 3: &f45'
           - '&f'
           - '&c&lCosts'
           - '&4&l* &cLevel 1: &f$1,000,000'
@@ -1438,8 +1438,6 @@ Wild:
   Enabled: true
   # Time to wait in seconds #
   Wait: 5
-  # World players will be teleported to #
-  World: 'World'
   # General GUI Settings #
   GUI:
     Name: 'Teleporter'
@@ -1450,6 +1448,7 @@ Wild:
   Zones:
     # You may create your own zones here please just follow the original format #
    Close:
+     World: world
      Range:
        MinX: -200
        MaxX: 200
@@ -1464,6 +1463,7 @@ Wild:
      Name: '&cLow Range'
      Slot: 1
    Medium:
+     World: world
      Range:
        MinX: -400
        MaxX: 400
@@ -1478,6 +1478,7 @@ Wild:
      Name: '&cMedium Range'
      Slot: 4
    Far:
+     World: world
      Range:
        MinX: -800
        MaxX: 800

src/main/resources/lang/ja_JP.yml

@@ -89,8 +89,8 @@ COMMAND:
     INUSE: <b>That tag is already in use.
     TOCREATE: to create a new faction
     FORCREATE: for creating a new faction
-    ERROR: <b>There was an internal error while trying to create your faction. Please try again.
-    CREATED: %s<i> created a new faction %s
+    ERROR: '<b>There was an internal error while trying to create your faction. Please try again.'
+    CREATED: '%s<i> created a new faction %s'
     CREATEDLOG: ' は新しい党派を造りました: '
     YOUSHOULD: '<i>You should now: %s'
   DEINVITE: