Merge remote-tracking branch 'upstream/master'

mcchampions · Feb 16, 2025 · e44d9a0 · e44d9a0
2 parents ebe9948 + 88ddfb3
commit e44d9a0
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/adapter/mysql/MysqlAdapter.java b/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/adapter/mysql/MysqlAdapter.java
@@ -406,7 +406,7 @@ private void createTableMetadataTable() {
         if (Slimefun.isNewlyInstalled()) {
             executeSql(MessageFormat.format(
                     """
-                    INSERT INTO {0} ({1}, {2}) VALUES ({3}, {4});
+                    INSERT INTO {0} ({1}, {2}) VALUES ("{3}", {4});
                     """,
                     tableMetadataTable,
                     FIELD_TABLE_METADATA_KEY,

diff --git a/...ava/com/xzavier0722/mc/plugin/slimefun4/storage/adapter/postgresql/PostgreSqlAdapter.java b/...ava/com/xzavier0722/mc/plugin/slimefun4/storage/adapter/postgresql/PostgreSqlAdapter.java
@@ -420,7 +420,7 @@ private void createTableMetadataTable() {
         if (Slimefun.isNewlyInstalled()) {
             executeSql(MessageFormat.format(
                     """
-                    INSERT INTO {0} ({1}, {2}) VALUES ({3}, {4});
+                    INSERT INTO {0} ({1}, {2}) VALUES ("{3}", {4});
                     """,
                     tableMetadataTable,
                     FIELD_TABLE_METADATA_KEY,

diff --git a/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/adapter/sqlite/SqliteAdapter.java b/src/main/java/com/xzavier0722/mc/plugin/slimefun4/storage/adapter/sqlite/SqliteAdapter.java
@@ -399,7 +399,7 @@ private void createTableMetadataTable() {
         if (Slimefun.isNewlyInstalled()) {
             executeSql(MessageFormat.format(
                     """
-                    INSERT INTO {0} ({1}, {2}) VALUES ({3}, {4});
+                    INSERT INTO {0} ({1}, {2}) VALUES ("{3}", {4});
                     """,
                     SqlUtils.mapTable(DataScope.TABLE_METADATA),
                     FIELD_TABLE_METADATA_KEY,

diff --git a/...main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/BlockDataController.java b/...main/java/com/xzavier0722/mc/plugin/slimefun4/storage/controller/BlockDataController.java
@@ -232,10 +232,10 @@ public SlimefunUniversalBlockData createUniversalBlock(Location l, String sfId)
         UUID uuid = UUID.randomUUID();
         SlimefunUniversalBlockData uniData = new SlimefunUniversalBlockData(uuid, sfId, l);
 
-        uniData.initLastPresent();
-
         uniData.setIsDataLoaded(true);
 
+        uniData.initLastPresent();
+
         loadedUniversalData.put(uuid, uniData);
 
         UniversalMenuPreset preset = UniversalMenuPreset.getPreset(sfId);