From cb7548a1938ecd4209641e23cd6ab7acc009e74e Mon Sep 17 00:00:00 2001 From: XiaoMoMi Date: Thu, 5 Jun 2025 22:16:15 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9A=BE=E7=BB=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/SelfIncreaseIntTemplateArgument.java | 13 ++++++++----- .../plugin/config/template/TemplateManagerImpl.java | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/config/template/SelfIncreaseIntTemplateArgument.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/config/template/SelfIncreaseIntTemplateArgument.java index d99690814..6d2c94ca2 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/config/template/SelfIncreaseIntTemplateArgument.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/config/template/SelfIncreaseIntTemplateArgument.java @@ -20,8 +20,11 @@ public class SelfIncreaseIntTemplateArgument implements TemplateArgument { @Override public String get() { - String value = String.valueOf(current); - if (current < max) current += 1; + String value = String.valueOf(this.current); + if (this.current < this.max) this.current += 1; + else { + throw new IllegalStateException("SelfIncreaseInt " + this.current + " is already >= " + this.max); + } return value; } @@ -31,15 +34,15 @@ public class SelfIncreaseIntTemplateArgument implements TemplateArgument { } public int current() { - return current; + return this.current; } public int min() { - return min; + return this.min; } public int max() { - return max; + return this.max; } public static class Factory implements TemplateArgumentFactory { diff --git a/core/src/main/java/net/momirealms/craftengine/core/plugin/config/template/TemplateManagerImpl.java b/core/src/main/java/net/momirealms/craftengine/core/plugin/config/template/TemplateManagerImpl.java index 3ae0e421e..a87eeae02 100644 --- a/core/src/main/java/net/momirealms/craftengine/core/plugin/config/template/TemplateManagerImpl.java +++ b/core/src/main/java/net/momirealms/craftengine/core/plugin/config/template/TemplateManagerImpl.java @@ -452,7 +452,7 @@ public class TemplateManagerImpl implements TemplateManager { String key = input.substring(1, input.length() - 1); return Optional.ofNullable(arguments.get(key)) .map(TemplateArgument::get) - .orElse(replacePlaceholders(input, arguments)); + .orElseGet(() -> replacePlaceholders(input, arguments)); } return replacePlaceholders(input, arguments); }