Merge pull request #452 from kennytv/fix/trailing-comma

KyoriPowered · Sep 25, 2021 · c324532 · c324532
2 parents 4877bb3 + 96aad41
commit c324532
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/nbt/src/main/java/net/kyori/adventure/nbt/TagStringReader.java b/nbt/src/main/java/net/kyori/adventure/nbt/TagStringReader.java
@@ -309,7 +309,7 @@ private boolean separatorOrCompleteWith(final char endCharacter) throws StringTa
       return true;
     }
     this.buffer.expect(Tokens.VALUE_SEPARATOR);
-    return false;
+    return this.buffer.takeIf(endCharacter);
   }
 
   /**

diff --git a/nbt/src/test/java/net/kyori/adventure/nbt/StringIOTest.java b/nbt/src/test/java/net/kyori/adventure/nbt/StringIOTest.java
@@ -276,6 +276,13 @@ void testEmptyLongArray() throws IOException {
     assertEquals(LongArrayBinaryTag.of(), this.stringToTag("[L; ]"));
   }
 
+  @Test
+  void testTrailingComma() throws IOException {
+    assertEquals(CompoundBinaryTag.builder().putString("test", "hello").build(), this.stringToTag("{test: \"hello\",}"));
+    assertEquals(IntArrayBinaryTag.of(1), this.stringToTag("[I;1,]"));
+    assertEquals(ListBinaryTag.builder().add(StringBinaryTag.of("hello")).build(), this.stringToTag("[\"hello\",]"));
+  }
+
   private String tagToString(final BinaryTag tag) throws IOException {
     final StringWriter writer = new StringWriter();
     try(final TagStringWriter emitter = new TagStringWriter(writer, "")) {