Skip to content

Commit 8bae82d

Browse files
authored
Use deserialised row keys in config tables (#7962)
1 parent bd097b4 commit 8bae82d

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

patches/server/0004-Paper-config-files.patch

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Subject: [PATCH] Paper config files
55

66

77
diff --git a/build.gradle.kts b/build.gradle.kts
8-
index 35839e1c2dede1e3a1e54b124667cf2bf63e73f0..a87cf2a4ad955b7429269f2d46adbe59f6e4525e 100644
8+
index e4e9df9283c1a0fd7fff38a5d9b6a51f15e06b7a..07b7d43796985cff828ff472ddef2a11b543a4af 100644
99
--- a/build.gradle.kts
1010
+++ b/build.gradle.kts
1111
@@ -12,6 +12,7 @@ dependencies {
@@ -2405,7 +2405,7 @@ index 0000000000000000000000000000000000000000..add9d16bac9e4570fbdcf8368d7ba031
24052405
+}
24062406
diff --git a/src/main/java/io/papermc/paper/configuration/serializer/TableSerializer.java b/src/main/java/io/papermc/paper/configuration/serializer/TableSerializer.java
24072407
new file mode 100644
2408-
index 0000000000000000000000000000000000000000..0b235ebe6e79d7aa420d6b8a52aedb3a4d8b6629
2408+
index 0000000000000000000000000000000000000000..346422c5eb791961061cc73b9b827d63bbd67daf
24092409
--- /dev/null
24102410
+++ b/src/main/java/io/papermc/paper/configuration/serializer/TableSerializer.java
24112411
@@ -0,0 +1,89 @@
@@ -2461,9 +2461,9 @@ index 0000000000000000000000000000000000000000..0b235ebe6e79d7aa420d6b8a52aedb3a
24612461
+ final BasicConfigurationNode rowKeyNode = BasicConfigurationNode.root(node.options());
24622462
+
24632463
+ for (final Object key : node.childrenMap().keySet()) {
2464-
+ rowKeySerializer.deserialize(rowType, rowKeyNode.set(key));
2464+
+ final R rowKey = rowKeySerializer.deserialize(rowType, rowKeyNode.set(key));
24652465
+ final Map<C, V> map = columnValueSerializer.deserialize(mapType, node.node(rowKeyNode.raw()));
2466-
+ map.forEach((column, value) -> table.put((R) rowKeyNode.raw(), column, value));
2466+
+ map.forEach((column, value) -> table.put(rowKey, column, value));
24672467
+ }
24682468
+ }
24692469
+

0 commit comments

Comments
 (0)