🐛 Fix suspend for unclosed NBT array tags

Fix #415.
SpyglassMC · Apr 25, 2020 · 77f13d5 · 77f13d5
1 parent d38573f
commit 77f13d5
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/parsers/NbtArgumentParser.ts b/src/parsers/NbtArgumentParser.ts
@@ -410,11 +410,6 @@ export default class NbtArgumentParser extends ArgumentParser<NbtNode> {
                 const result = this.parsePrimitiveTag(reader, superNode, helper)
                 combineArgumentParserResult(ans, result)
                 reader.skipWhiteSpace()
-                if (reader.peek() === ',') {
-                    reader
-                        .skip()
-                        .skipWhiteSpace()
-                }
                 if (ans.data[NbtNodeType] === 'ByteArray') {
                     ans.data.push(result.data as NbtByteNode)
                     if (!isNbtByteNode(result.data)) {
@@ -455,6 +450,13 @@ export default class NbtArgumentParser extends ArgumentParser<NbtNode> {
                         )
                     }
                 }
+                if (reader.peek() === ',') {
+                    reader
+                        .skip()
+                        .skipWhiteSpace()
+                    continue
+                }
+                break
             }
             reader
                 .expect(']')