Merge remote-tracking branch 'origin/forge' into forge

Nova-Committee · Dec 9, 2023 · 68f11e4 · 68f11e4
2 parents e3d3c75 + d87379b
commit 68f11e4
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/forge/src/main/java/cn/evole/mods/mcbot/util/locale/I18n.java b/forge/src/main/java/cn/evole/mods/mcbot/util/locale/I18n.java
@@ -83,6 +83,11 @@ public static String get(String key, Object... args) {
     }
 
     public static String get(String key) {
-        return translations.get(key);
+        String translation = translations.get(key);
+        if (translation != null) {
+            return translation;
+        } else {
+            return key;
+        }
     }
 }
diff --git a/forge/src/main/java/cn/evole/mods/mcbot/util/onebot/BotUtils.java b/forge/src/main/java/cn/evole/mods/mcbot/util/onebot/BotUtils.java
@@ -48,7 +48,7 @@ private static boolean isVar(String msg) {
     public static String varParse(CustomCmd customCmd, String cmd) {
         String returnCmd = "";
         if (isVar(cmd)) {//存在变量
-            val replaceContent = customCmd.getCmdContent().split("%")[0].replaceAll(" ", "");
+            val replaceContent = customCmd.getCmdContent().split("%")[0].trim();
             returnCmd = cmd.replace(customCmd.getCmdAlies(), replaceContent);//返回q群指令
         } else returnCmd = customCmd.getCmdContent();//返回普通自定义命令指令
         return returnCmd;