Updated GitHub repository. Added new permission check for using colou…

…rs in clan prefix. Added new permission node `clanslite.clan.prefixcolors`. Added new string to `messages.yml`. Changed plugin version to `1.4.3`.
Loving11ish · Dec 2, 2023 · 4dc2060 · 4dc2060
1 parent 1d3e019
commit 4dc2060
Show file tree

Hide file tree

Showing 60 changed files with 147 additions and 137 deletions.
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>me.loving11ish</groupId>
     <artifactId>ClansLite</artifactId>
-    <version>1.4.2</version>
+    <version>1.4.3</version>
     <packaging>jar</packaging>
 
     <name>ClansLite</name>

diff --git a/src/main/java/me/loving11ish/clans/Clans.java b/src/main/java/me/loving11ish/clans/Clans.java
@@ -38,7 +38,7 @@
 
 public final class Clans extends JavaPlugin {
 
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
 
     private final PluginDescriptionFile pluginInfo = getDescription();
     private final String pluginVersion = pluginInfo.getVersion();

diff --git a/src/main/java/me/loving11ish/clans/commands/ClanAdmin.java b/src/main/java/me/loving11ish/clans/commands/ClanAdmin.java
@@ -21,9 +21,9 @@
 
 public class ClanAdmin implements CommandExecutor {
 
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
-    
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
+
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private ArrayList<Player> onlinePlayers = new ArrayList<>(Bukkit.getOnlinePlayers());
     private static final String PLAYER_TO_KICK = "%KICKEDPLAYER%";

diff --git a/src/main/java/me/loving11ish/clans/commands/ClanChatCommand.java b/src/main/java/me/loving11ish/clans/commands/ClanChatCommand.java
@@ -21,16 +21,16 @@
 import java.util.UUID;
 
 public class ClanChatCommand implements CommandExecutor {
-
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
+
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static final String TIME_LEFT = "%TIMELEFT%";
     private static final String CLAN_PLACEHOLDER = "%CLAN%";
 
-    HashMap<UUID, Long> chatCoolDownTimer = new HashMap<>();
+    private final HashMap<UUID, Long> chatCoolDownTimer = new HashMap<>();
 
     @Override
     public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {

diff --git a/src/main/java/me/loving11ish/clans/commands/ClanChatSpyCommand.java b/src/main/java/me/loving11ish/clans/commands/ClanChatSpyCommand.java
@@ -11,8 +11,8 @@
 
 public class ClanChatSpyCommand implements CommandExecutor {
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     @Override
     public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {

diff --git a/src/main/java/me/loving11ish/clans/commands/ClanChestCommand.java b/src/main/java/me/loving11ish/clans/commands/ClanChestCommand.java
@@ -18,9 +18,9 @@
 
 public class ClanChestCommand implements CommandExecutor {
 
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
 
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     @Override
     public boolean onCommand(CommandSender sender, Command command, String label, String[] args) {

diff --git a/src/main/java/me/loving11ish/clans/commands/ClanCommand.java b/src/main/java/me/loving11ish/clans/commands/ClanCommand.java
@@ -19,11 +19,11 @@
 
 public class ClanCommand implements CommandExecutor {
 
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
 
     public static WrappedTask bannedTaskUpdateTask;
 
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static List<String> bannedTags;
 

diff --git a/...ava/me/loving11ish/clans/commands/clanChestLockSubCommands/ChestAccessListSubCommand.java b/...ava/me/loving11ish/clans/commands/clanChestLockSubCommands/ChestAccessListSubCommand.java
@@ -19,7 +19,7 @@
 
 public class ChestAccessListSubCommand {
 
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static final String PLAYER_PLACEHOLDER = "%PLAYER%";
 

diff --git a/src/main/java/me/loving11ish/clans/commands/clanChestLockSubCommands/ChestBuySubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanChestLockSubCommands/ChestBuySubCommand.java
@@ -13,10 +13,10 @@
 
 public class ChestBuySubCommand {
 
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private final int purchasePrice = clansConfig.getInt("protections.chests.clan-points-purchase-value");
     private static final String AMOUNT_PLACEHOLDER = "%AMOUNT%";

diff --git a/...main/java/me/loving11ish/clans/commands/clanChestLockSubCommands/ChestLockSubCommand.java b/...main/java/me/loving11ish/clans/commands/clanChestLockSubCommands/ChestLockSubCommand.java
@@ -21,10 +21,10 @@
 
 public class ChestLockSubCommand {
 
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static final String LIMIT_PLACEHOLDER = "%LIMIT%";
     private static final String X_PLACEHOLDER = "%X%";

diff --git a/...in/java/me/loving11ish/clans/commands/clanChestLockSubCommands/ChestUnlockSubCommand.java b/...in/java/me/loving11ish/clans/commands/clanChestLockSubCommands/ChestUnlockSubCommand.java
@@ -19,10 +19,10 @@
 
 public class ChestUnlockSubCommand {
 
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static final String X_PLACEHOLDER = "%X%";
     private static final String Y_PLACEHOLDER = "%Y%";

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanAllySubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanAllySubCommand.java
@@ -17,10 +17,10 @@
 
 public class ClanAllySubCommand {
 
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
-    
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
+
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static final String ALLY_CLAN = "%ALLYCLAN%";
     private static final String ALLY_OWNER = "%ALLYOWNER%";

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanCreateSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanCreateSubCommand.java
@@ -15,20 +15,20 @@
 import java.util.*;
 
 public class ClanCreateSubCommand {
-
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
+
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static final String CLAN_PLACEHOLDER = "%CLAN%";
     private static final String CLAN_OWNER = "%CLANOWNER%";
 
     int MIN_CHAR_LIMIT = clansConfig.getInt("clan-tags.min-character-limit");
     int MAX_CHAR_LIMIT = clansConfig.getInt("clan-tags.max-character-limit");
 
-    Set<Map.Entry<UUID, Clan>> clans = ClansStorageUtil.getClans();
-    ArrayList<String> clanNamesList = new ArrayList<>();
+    private final Set<Map.Entry<UUID, Clan>> clans = ClansStorageUtil.getClans();
+    private final ArrayList<String> clanNamesList = new ArrayList<>();
 
     public boolean createClanSubCommand(CommandSender sender, String[] args, List<String> bannedTags) {
         if (sender instanceof Player) {

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanDelHomeSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanDelHomeSubCommand.java
@@ -12,11 +12,11 @@
 import me.loving11ish.clans.utils.ColorUtils;
 
 public class ClanDelHomeSubCommand {
-
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
+
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     public boolean deleteClanHomeSubCommand(CommandSender sender) {
         if (sender instanceof Player) {

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanDisbandSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanDisbandSubCommand.java
@@ -11,7 +11,7 @@
 
 public class ClanDisbandSubCommand {
 
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     public boolean disbandClanSubCommand(CommandSender sender) {
         if (sender instanceof Player) {

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanEnemySubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanEnemySubCommand.java
@@ -17,11 +17,11 @@
 import java.util.UUID;
 
 public class ClanEnemySubCommand {
-
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
+
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static final String ENEMY_CLAN = "%ENEMYCLAN%";
     private static final String ENEMY_OWNER = "%ENEMYOWNER%";

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanHomeSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanHomeSubCommand.java
@@ -19,16 +19,16 @@
 
 public class ClanHomeSubCommand {
 
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static final String TIME_LEFT = "%TIMELEFT%";
 
     private static ClanHomePreTeleportEvent homePreTeleportEvent = null;
 
-    HashMap<UUID, Long> homeCoolDownTimer = new HashMap<>();
+    private final HashMap<UUID, Long> homeCoolDownTimer = new HashMap<>();
 
     public boolean tpClanHomeSubCommand(CommandSender sender) {
         if (sender instanceof Player) {

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanInfoSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanInfoSubCommand.java
@@ -14,8 +14,8 @@
 
 public class ClanInfoSubCommand {
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static final String CLAN_PLACEHOLDER = "%CLAN%";
     private static final String OWNER = "%OWNER%";

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanInviteSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanInviteSubCommand.java
@@ -12,8 +12,8 @@
 
 public class ClanInviteSubCommand {
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static final String INVITED_PLAYER = "%INVITED%";
 

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanJoinSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanJoinSubCommand.java
@@ -17,10 +17,10 @@
 
 public class ClanJoinSubCommand {
 
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
     private static final String PLAYER_PLACEHOLDER = "%PLAYER%";
     private static final String CLAN_PLACEHOLDER = "%CLAN%";
 

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanKickSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanKickSubCommand.java
@@ -13,7 +13,7 @@
 
 public class ClanKickSubCommand {
 
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static final String CLAN_PLACEHOLDER = "%CLAN%";
     private static final String PLAYER_TO_KICK = "%KICKEDPLAYER%";

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanLeaveSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanLeaveSubCommand.java
@@ -10,7 +10,7 @@
 
 public class ClanLeaveSubCommand {
 
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static final String CLAN_PLACEHOLDER = "%CLAN%";
 

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanListSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanListSubCommand.java
@@ -14,7 +14,7 @@
 
 public class ClanListSubCommand {
 
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     public boolean clanListSubCommand(CommandSender sender) {
         if (sender instanceof Player) {

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanPlayerPointsSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanPlayerPointsSubCommand.java
@@ -14,10 +14,10 @@
 
 public class ClanPlayerPointsSubCommand {
 
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static final String POINT_PLACEHOLDER = "%POINTVALUE%";
 

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanPointSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanPointSubCommand.java
@@ -16,10 +16,10 @@
 
 public class ClanPointSubCommand {
 
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
-    
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
+
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     private static final String CLAN_PLACEHOLDER = "%CLAN%";
     private static final String POINT_PLACEHOLDER = "%POINTS%";

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanPrefixSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanPrefixSubCommand.java
@@ -12,14 +12,14 @@
 
 public class ClanPrefixSubCommand {
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     int MIN_CHAR_LIMIT = clansConfig.getInt("clan-tags.min-character-limit");
     int MAX_CHAR_LIMIT = clansConfig.getInt("clan-tags.max-character-limit");
 
-    Set<Map.Entry<UUID, Clan>> clans = ClansStorageUtil.getClans();
-    ArrayList<String> clansPrefixList = new ArrayList<>();
+    private final Set<Map.Entry<UUID, Clan>> clans = ClansStorageUtil.getClans();
+    private final ArrayList<String> clansPrefixList = new ArrayList<>();
 
     public boolean clanPrefixSubCommand(CommandSender sender, String[] args, List<String> bannedTags) {
         if (sender instanceof Player) {
@@ -35,6 +35,10 @@ public boolean clanPrefixSubCommand(CommandSender sender, String[] args, List<St
                     player.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("clan-prefix-already-taken").replace("%CLANPREFIX%", args[1])));
                     return true;
                 }
+                if (args[1].contains("&")||args[1].contains("#") && !player.hasPermission("clanslite.clan.prefixcolors")){
+                    player.sendMessage(ColorUtils.translateColorCodes(messagesConfig.getString("clan-prefix-no-colours-permission")));
+                    return true;
+                }
                 if (ClansStorageUtil.isClanOwner(player)){
                     if (args[1].length() >= MIN_CHAR_LIMIT && args[1].length() <= MAX_CHAR_LIMIT) {
                         Clan playerClan = ClansStorageUtil.findClanByOwner(player);

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanPvpSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanPvpSubCommand.java
@@ -10,8 +10,8 @@
 
 public class ClanPvpSubCommand {
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     public boolean clanPvpSubCommand(CommandSender sender) {
         if (sender instanceof Player) {

diff --git a/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanSetHomeSubCommand.java b/src/main/java/me/loving11ish/clans/commands/clanSubCommands/ClanSetHomeSubCommand.java
@@ -14,10 +14,10 @@
 
 public class ClanSetHomeSubCommand {
 
-    ConsoleCommandSender console = Bukkit.getConsoleSender();
+    private final ConsoleCommandSender console = Bukkit.getConsoleSender();
 
-    FileConfiguration clansConfig = Clans.getPlugin().getConfig();
-    FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
+    private final FileConfiguration clansConfig = Clans.getPlugin().getConfig();
+    private final FileConfiguration messagesConfig = Clans.getPlugin().messagesFileManager.getMessagesConfig();
 
     public boolean setClanHomeSubCommand(CommandSender sender) {
         if (sender instanceof Player) {