From 36c8d53a85f962ba217af283a079d3a72e101272 Mon Sep 17 00:00:00 2001
From: Driftay <driftayllc@gmail.com>
Date: Tue, 10 Mar 2020 06:36:47 -0400
Subject: [PATCH] Configurable Option For Click To Claim

---
 src/main/java/com/massivecraft/factions/Conf.java           | 1 +
 .../factions/zcore/fupgrades/FUpgradeFrame.java             | 6 ++++--
 .../massivecraft/factions/zcore/persist/MemoryBoard.java    | 6 ++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/massivecraft/factions/Conf.java b/src/main/java/com/massivecraft/factions/Conf.java
index bd1e2d73..526c9eb3 100644
--- a/src/main/java/com/massivecraft/factions/Conf.java
+++ b/src/main/java/com/massivecraft/factions/Conf.java
@@ -259,6 +259,7 @@ public class Conf {
     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<>();
     public static Set<Material> territoryDenySwitchMaterials = new HashSet<>();
diff --git a/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradeFrame.java b/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradeFrame.java
index 06df9eef..28a2d534 100644
--- a/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradeFrame.java
+++ b/src/main/java/com/massivecraft/factions/zcore/fupgrades/FUpgradeFrame.java
@@ -8,6 +8,7 @@ import com.massivecraft.factions.FPlayers;
 import com.massivecraft.factions.Faction;
 import com.massivecraft.factions.FactionsPlugin;
 import com.massivecraft.factions.util.XMaterial;
+import org.bukkit.ChatColor;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
@@ -15,6 +16,7 @@ import org.bukkit.inventory.meta.ItemMeta;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 /**
  * @author Saser
@@ -26,8 +28,8 @@ public class FUpgradeFrame {
 	public FUpgradeFrame(Faction f) {
 		this.gui = new Gui(FactionsPlugin.getInstance(),
 				FactionsPlugin.getInstance().getConfig().getInt("fupgrades.MainMenu.Rows", 5),
-				ChatColor.translateAlternateColorCodes('&', FactionsPlugin.getInstance().getConfig()
-						.getString("fupgrades.MainMenu.Title").replace("{faction}", f.getTag())));
+				ChatColor.translateAlternateColorCodes('&', Objects.requireNonNull(FactionsPlugin.getInstance().getConfig()
+                        .getString("fupgrades.MainMenu.Title")).replace("{faction}", f.getTag())));
 	}
 
     public void buildGUI(FPlayer fplayer) {
diff --git a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryBoard.java b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryBoard.java
index fab2379f..3e27ae66 100644
--- a/src/main/java/com/massivecraft/factions/zcore/persist/MemoryBoard.java
+++ b/src/main/java/com/massivecraft/factions/zcore/persist/MemoryBoard.java
@@ -236,8 +236,10 @@ public abstract class MemoryBoard extends Board {
                         row.then("-").color(Conf.colorWilderness);
                         // Lol someone didnt add the x and z making it claim the wrong position Can i copyright this xD
                         if (fplayer.getPlayer().hasPermission(Permission.CLAIMAT.node)) {
-                            row.tooltip(TL.CLAIM_CLICK_TO_CLAIM.format(dx + topLeft.getX(), dz + topLeft.getZ()))
-                                    .command(String.format("/f claimat %s %d %d", flocation.getWorldName(), dx + topLeft.getX(), dz + topLeft.getZ()));
+                            if (Conf.enableClickToClaim) {
+                                row.tooltip(TL.CLAIM_CLICK_TO_CLAIM.format(dx + topLeft.getX(), dz + topLeft.getZ()))
+                                        .command(String.format("/f claimat %s %d %d", flocation.getWorldName(), dx + topLeft.getX(), dz + topLeft.getZ()));
+                            }
                         }
                     } else if (factionHere.isSafeZone()) {
                         row.then("+").color(Conf.colorSafezone).tooltip(oneLineToolTip(factionHere, fplayer));