Repo-Mirror/eco
9
0
Fork 0
Code Issues Releases 2 Activity

Fixed static placeholder string formatting

Browse Source
This commit is contained in:
Auxilor
2022-05-19 17:12:51 +01:00
parent 78b76cb453
commit 7e61340285
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/EcoConfig.kt
View File

@@ -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) {