From 7e613402854f1cf4d6f39b82e4a6f80e9afd3e75 Mon Sep 17 00:00:00 2001
From: Auxilor <william.favierparsons1@gmail.com>
Date: Thu, 19 May 2022 17:12:51 +0100
Subject: [PATCH] Fixed static placeholder string formatting

---
 .../kotlin/com/willfp/eco/internal/config/EcoConfig.kt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoConfig.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoConfig.kt
index b3881462..85b766dc 100644
--- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoConfig.kt
+++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoConfig.kt
@@ -139,9 +139,11 @@ open class EcoConfig(
         option: StringUtils.FormatOption
     ): String? {
         var string = get(path)?.toString() ?: return null
-        for (injection in placeholderInjections) {
-            if (injection is StaticPlaceholder) {
-                string = string.replace("%${injection.identifier}%", injection.value)
+        if (format && option == StringUtils.FormatOption.WITH_PLACEHOLDERS) {
+            for (injection in placeholderInjections) {
+                if (injection is StaticPlaceholder) {
+                    string = string.replace("%${injection.identifier}%", injection.value)
+                }
             }
         }
         return if (format) StringUtils.format(string, option) else string
@@ -153,7 +155,7 @@ open class EcoConfig(
         option: StringUtils.FormatOption
     ): List<String>? {
         val strings = (get(path) as? Iterable<*>)?.map { it.toString() }?.toMutableList() ?: return null
-        if (placeholderInjections.isNotEmpty()) {
+        if (placeholderInjections.isNotEmpty() && format && option == StringUtils.FormatOption.WITH_PLACEHOLDERS) {
             strings.replaceAll {
                 var string = it
                 for (injection in placeholderInjections) {