Merge branch 'dev'

SlimefunGuguProject · Jan 14, 2025 · 386bf8f · 386bf8f
2 parents d2df303 + f03ac18
commit 386bf8f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/city/norain/slimefun4/VaultIntegration.java b/src/main/java/city/norain/slimefun4/VaultIntegration.java
@@ -23,7 +23,7 @@ protected static void register(@Nonnull Slimefun plugin) {
                 plugin.getLogger().log(Level.WARNING, "无法接入 Vault. 如果你是 CMI 用户, 请至配置文件启用经济系统");
             }
         } else {
-            plugin.getLogger().log(Level.WARNING, "无法接入 Vault. 你必须先安装 Vault!");
+            plugin.getLogger().log(Level.WARNING, "无法接入 Vault, 使用游戏币解锁研究功能将无法使用");
         }
     }
 

diff --git a/.../java/com/xzavier0722/mc/plugin/slimefun4/storage/adapter/sqlcommon/SqlCommonAdapter.java b/.../java/com/xzavier0722/mc/plugin/slimefun4/storage/adapter/sqlcommon/SqlCommonAdapter.java
@@ -1,6 +1,7 @@
 package com.xzavier0722.mc.plugin.slimefun4.storage.adapter.sqlcommon;
 
 import static com.xzavier0722.mc.plugin.slimefun4.storage.adapter.sqlcommon.SqlConstants.FIELD_TABLE_VERSION;
+import static com.xzavier0722.mc.plugin.slimefun4.storage.adapter.sqlcommon.SqlConstants.TABLE_NAME_TABLE_INFORMATION;
 
 import city.norain.slimefun4.timings.entry.SQLEntry;
 import com.xzavier0722.mc.plugin.slimefun4.storage.adapter.IDataSourceAdapter;
@@ -95,7 +96,8 @@ public void shutdown() {
     }
 
     public int getDatabaseVersion() {
-        return executeQuery("SELECT (" + FIELD_TABLE_VERSION + ") FROM " + tableInformationTable)
+        return executeQuery("SELECT (" + FIELD_TABLE_VERSION + ") FROM "
+                        + (tableInformationTable == null ? TABLE_NAME_TABLE_INFORMATION : tableInformationTable))
                 .getFirst()
                 .getInt(FieldKey.TABLE_VERSION);
     }