diff --git a/eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java b/eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java index cd7ff5c5..09d21195 100644 --- a/eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java +++ b/eco-api/src/main/java/com/willfp/eco/core/integrations/placeholder/PlaceholderManager.java @@ -56,7 +56,7 @@ public class PlaceholderManager { @NotNull final String identifier) { Optional matching = REGISTERED_PLACEHOLDERS.stream().filter(expansion -> expansion.getIdentifier().equalsIgnoreCase(identifier)).findFirst(); if (matching.isEmpty()) { - return null; + return ""; } PlaceholderEntry entry = matching.get(); if (player == null && entry.requiresPlayer()) { diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/json/EcoLoadableJSONConfig.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/json/EcoLoadableJSONConfig.kt index 89cbae8f..8b70e654 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/json/EcoLoadableJSONConfig.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/json/EcoLoadableJSONConfig.kt @@ -27,7 +27,6 @@ class EcoLoadableJSONConfig( } override fun createFile() { - val resourcePath = resourcePath val inputStream = source.getResourceAsStream(resourcePath)!! val outFile = File(this.plugin.dataFolder, resourcePath) val lastIndex = resourcePath.lastIndexOf('/') @@ -37,11 +36,7 @@ class EcoLoadableJSONConfig( } if (!outFile.exists()) { val out: OutputStream = FileOutputStream(outFile) - val buf = ByteArray(1024) - var len: Int - while (inputStream.read(buf).also { len = it } > 0) { - out.write(buf, 0, len) - } + inputStream.copyTo(out, 1024) out.close() inputStream.close() } diff --git a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/yaml/EcoLoadableYamlConfig.kt b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/yaml/EcoLoadableYamlConfig.kt index 115b710d..4c88c444 100644 --- a/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/yaml/EcoLoadableYamlConfig.kt +++ b/eco-core/core-backend/src/main/kotlin/com/willfp/eco/internal/config/yaml/EcoLoadableYamlConfig.kt @@ -31,7 +31,6 @@ open class EcoLoadableYamlConfig( } final override fun createFile() { - val resourcePath = resourcePath val inputStream = source.getResourceAsStream(resourcePath)!! val outFile = File(this.plugin.dataFolder, resourcePath) val lastIndex = resourcePath.lastIndexOf('/') @@ -41,11 +40,7 @@ open class EcoLoadableYamlConfig( } if (!outFile.exists()) { val out: OutputStream = FileOutputStream(outFile) - val buf = ByteArray(1024) - var len: Int - while (inputStream.read(buf).also { len = it } > 0) { - out.write(buf, 0, len) - } + inputStream.copyTo(out, 1024) out.close() inputStream.close() }