Fix LazyEmbed replacements

srnyx · Aug 19, 2024 · f3b31c2 · f3b31c2
1 parent aed33d3
commit f3b31c2
Showing 1 changed file with 27 additions and 25 deletions.
diff --git a/src/main/java/xyz/srnyx/lazylibrary/LazyEmbed.java b/src/main/java/xyz/srnyx/lazylibrary/LazyEmbed.java
@@ -330,43 +330,45 @@ public LazyEmbed replace(@NotNull String key, @Nullable Object value) {
      */
     @NotNull
     public MessageEmbed build(@NotNull LazyLibrary library) {
-        // Get replaceable values
-        String authorNameReplace = authorName;
-        String titleTextReplace = titleText;
-        String descriptionReplace = description;
-        String footerTextReplace = footerText;
-
-        // Parse replacements for the values
-        final boolean hasReplacements = !replacements.isEmpty();
-        if (hasReplacements) for (final Map.Entry<String, String> entry : replacements.entrySet()) {
-            if (authorNameReplace != null) authorNameReplace = authorNameReplace.replace(entry.getKey(), entry.getValue());
-            if (titleTextReplace != null) titleTextReplace = titleTextReplace.replace(entry.getKey(), entry.getValue());
-            if (descriptionReplace != null) descriptionReplace = descriptionReplace.replace(entry.getKey(), entry.getValue());
-            if (footerTextReplace != null) footerTextReplace = footerTextReplace.replace(entry.getKey(), entry.getValue());
-        }
+        // Replacements
+        if (!replacements.isEmpty()) {
+            // Get replaceable values
+            String authorNameReplace = authorName;
+            String titleTextReplace = titleText;
+            String descriptionReplace = description;
+            String footerTextReplace = footerText;
+
+            // Parse replacements for the values
+            for (final Map.Entry<String, String> entry : replacements.entrySet()) {
+                if (authorNameReplace != null) authorNameReplace = authorNameReplace.replace(entry.getKey(), entry.getValue());
+                if (titleTextReplace != null) titleTextReplace = titleTextReplace.replace(entry.getKey(), entry.getValue());
+                if (descriptionReplace != null) descriptionReplace = descriptionReplace.replace(entry.getKey(), entry.getValue());
+                if (footerTextReplace != null) footerTextReplace = footerTextReplace.replace(entry.getKey(), entry.getValue());
+            }
 
-        // Set the values
-        setAuthor(authorNameReplace, authorUrl, authorIcon);
-        setTitle(titleTextReplace, titleUrl);
-        setDescription(descriptionReplace);
-        setFooter(footerTextReplace, footerIcon);
+            // Set the new values
+            setAuthor(authorNameReplace, authorUrl, authorIcon);
+            setTitle(titleTextReplace, titleUrl);
+            setDescription(descriptionReplace);
+            setFooter(footerTextReplace, footerIcon);
 
-        // Fields
-        if (hasReplacements) {
+            // Fields
+            final List<MessageEmbed.Field> newFields = new ArrayList<>(fields);
             clearFields();
-            for (final MessageEmbed.Field field : new ArrayList<>(fields)) {
+            for (final MessageEmbed.Field field : newFields) {
                 // Get name and value
                 String name = field.getName();
                 String value = field.getValue();
+                if (name == null || value == null) continue;
 
                 // Parse replacements for the name and value
                 for (final Map.Entry<String, String> entry : replacements.entrySet()) {
-                    if (name != null) name = name.replace(entry.getKey(), entry.getValue());
-                    if (value != null) value = value.replace(entry.getKey(), entry.getValue());
+                    name = name.replace(entry.getKey(), entry.getValue());
+                    value = value.replace(entry.getKey(), entry.getValue());
                 }
 
                 // Add the new field
-                if (name != null && value != null) addField(name, value, field.isInline());
+                addField(name, value, field.isInline());
             }
         }