Skip to content

Commit

Permalink
Fix DataConverter ConverterParticleToNBT.parseProperties
Browse files Browse the repository at this point in the history
- The old code was using `StringReader.peek()` in a place where it meant to be `StringReader.skip()`.
- The vanilla code allows a trailing comma, but only if there is no whitespace between it and the closing bracket, which is a bit weird. I think that's a bug and it shouldn't allow trailing commas, but if you disagree then only the first issue needs to be fixed.
  • Loading branch information
Earthcomputer authored and Spottedleaf committed May 10, 2024
1 parent b56e92f commit 2df1dac
Showing 1 changed file with 25 additions and 23 deletions.
48 changes: 25 additions & 23 deletions patches/server/0976-Rewrite-dataconverter-system.patch
Original file line number Diff line number Diff line change
Expand Up @@ -7908,10 +7908,10 @@ index 0000000000000000000000000000000000000000..769dd8447976b66dcfc36283ede4ae16
+}
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/particle/ConverterParticleToNBT.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/particle/ConverterParticleToNBT.java
new file mode 100644
index 0000000000000000000000000000000000000000..0f961bca2ab2cd9e93cb7c23951ac6b867cdd04e
index 0000000000000000000000000000000000000000..2cf90187ea8bc54b06cebd54ae2582ca66d91132
--- /dev/null
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/converters/particle/ConverterParticleToNBT.java
@@ -0,0 +1,268 @@
@@ -0,0 +1,270 @@
+package ca.spottedleaf.dataconverter.minecraft.converters.particle;
+
+import ca.spottedleaf.dataconverter.types.ListType;
Expand Down Expand Up @@ -7970,27 +7970,29 @@ index 0000000000000000000000000000000000000000..0f961bca2ab2cd9e93cb7c23951ac6b8
+ reader.expect('[');
+ reader.skipWhitespace();
+
+ while (reader.canRead() && reader.peek() != ']') {
+ reader.skipWhitespace();
+
+ final String property = reader.readString();
+
+ reader.skipWhitespace();
+ reader.expect('=');
+ reader.skipWhitespace();
+
+ final String value = reader.readString();
+ ret.setString(property, value);
+
+ reader.skipWhitespace();
+ if (reader.canRead()) {
+ if (reader.peek() != ',') {
+ // invalid character or ']'
+ break;
+ if (reader.canRead() && reader.peek() != ']') {
+ while (reader.canRead()) {
+ final String property = reader.readString();
+
+ reader.skipWhitespace();
+ reader.expect('=');
+ reader.skipWhitespace();
+
+ final String value = reader.readString();
+ ret.setString(property, value);
+
+ reader.skipWhitespace();
+ if (reader.canRead()) {
+ if (reader.peek() != ',') {
+ // invalid character or ']'
+ break;
+ }
+
+ // skip ',' and move onto next entry
+ reader.skip();
+ }
+
+ // skip ',' and move onto next entry
+ reader.peek();
+
+ reader.skipWhitespace();
+ }
+ }
+
Expand Down Expand Up @@ -22437,7 +22439,7 @@ index 0000000000000000000000000000000000000000..f50b81d931a1908d405bb72e0679983a
+}
diff --git a/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java
new file mode 100644
index 0000000000000000000000000000000000000000..29d256c2f5d5e338dc7abeb82c0f1ae99ee1edf7
index 0000000000000000000000000000000000000000..40f9b8f2a3d0b01dc97472f34c441321a0e33079
--- /dev/null
+++ b/src/main/java/ca/spottedleaf/dataconverter/minecraft/versions/V3818.java
@@ -0,0 +1,339 @@
Expand Down

0 comments on commit 2df1dac

Please sign in to comment.