From 0143d3fa0d9e597d91c0b9916b4a90b1fd6314d8 Mon Sep 17 00:00:00 2001
From: jones6096 <63066064+jones6096@users.noreply.github.com>
Date: Thu, 23 Nov 2023 22:04:12 -0500
Subject: [PATCH] Remove Unnecessary Check

Meta placeholders are always enabled, errors aren't thrown when an invalid or no meta key is requested
---
 .../feusalamander/vmessage/Configuration.java   | 17 +++++++----------
 .../me/feusalamander/vmessage/Listeners.java    | 11 +++--------
 src/main/resources/config.toml                  |  2 --
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/main/java/me/feusalamander/vmessage/Configuration.java b/src/main/java/me/feusalamander/vmessage/Configuration.java
index 5e3502f..224cc79 100644
--- a/src/main/java/me/feusalamander/vmessage/Configuration.java
+++ b/src/main/java/me/feusalamander/vmessage/Configuration.java
@@ -28,8 +28,6 @@ public final class Configuration {
     private List<String> changecmd;
     private String custom1;
     private String custom2;
-    private boolean custom1Enabled;
-    private boolean custom2Enabled;
     private Toml aliases;
 
     Configuration(Toml config) {
@@ -52,8 +50,6 @@ public final class Configuration {
         minimessage = config.getBoolean("Message-format.minimessage");
         all = config.getBoolean("Message.all", false);
 
-        custom1Enabled = config.getBoolean("Custom-Meta.custom1enabled", false);
-        custom2Enabled = config.getBoolean("Custom-Meta.custom2enabled", false);
         custom1 = config.getString("Custom-Meta.custom1", "");
         custom2 = config.getString("Custom-Meta.custom2", "");
         this.config = config;
@@ -139,10 +135,13 @@ public final class Configuration {
     public Toml getAliases() {
         return aliases;
     }
-    public boolean isCustom1Enabled() {return this.custom1Enabled;}
-    public boolean isCustom2Enabled() {return this.custom2Enabled;}
-    public String getCustom1() {return this.custom1;}
-    public String getCustom2() {return this.custom2;}
+    public String getCustom1() {
+		return this.custom1;
+	}
+    public String getCustom2() {
+		return this.custom2;
+	}
+	
     void reload(){
         config = config.read(file);
         this.messageFormat = config.getString("Message.format");
@@ -165,8 +164,6 @@ public final class Configuration {
         this.minimessage = config.getBoolean("Message-format.minimessage");
         this.all = config.getBoolean("Message.all", false);
 
-        this.custom1Enabled = config.getBoolean("Custom-Meta.custom1enabled");
-        this.custom2Enabled = config.getBoolean("Custom-Meta.custom2enabled");
         this.custom1 = config.getString("Custom-Meta.custom1");
         this.custom2 = config.getString("Custom-Meta.custom2");
     }
diff --git a/src/main/java/me/feusalamander/vmessage/Listeners.java b/src/main/java/me/feusalamander/vmessage/Listeners.java
index 35c9614..c6d9109 100644
--- a/src/main/java/me/feusalamander/vmessage/Listeners.java
+++ b/src/main/java/me/feusalamander/vmessage/Listeners.java
@@ -181,14 +181,9 @@ public final class Listeners {
         final CachedMetaData data = luckPermsAPI.getPlayerAdapter(Player.class).getMetaData(p);
         final String prefix = data.getPrefix();
         final String suffix = data.getSuffix();
-        String custom1 = null;
-        String custom2 = null;
-        if (configuration.isCustom1Enabled()) {
-            custom1 = data.getMetaValue(configuration.getCustom1());
-        }
-        if (configuration.isCustom2Enabled()) {
-            custom2 = data.getMetaValue(configuration.getCustom2());
-        }
+        final String custom1 = data.getMetaValue(configuration.getCustom1());
+        final String custom2 = data.getMetaValue(configuration.getCustom2());
+
         if (message.contains("#prefix#") && prefix != null) {
             message = message.replace("#prefix#", prefix);
         }
diff --git a/src/main/resources/config.toml b/src/main/resources/config.toml
index 7025b5b..9e3fe83 100644
--- a/src/main/resources/config.toml
+++ b/src/main/resources/config.toml
@@ -46,6 +46,4 @@ servername = "Server Name"
 [Custom-Meta]
 #Enables definition of Custom Luckperms Meta Placeholders
 custom1 = ""
-custom1enabled = false
 custom2 = ""
-custom2enabled = false