Merge #135

135: Fixed itemCriteria and fixed whitespace error on data modify r=Levertion a=MSpaceDev Fixed itemCriteria returning entities instead of items. Fixed data modiy so that it does not return an error when there is whitespace after the nbt path. Edit by @Levertion: fixes #134 fixes #133. Co-authored-by: MSpaceDev <[email protected]>
Levertion · Apr 27, 2019 · a8597a9 · a8597a9
2 parents 2053e6b + 0c6bf6b
commit a8597a9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/dist/index.js b/dist/index.js
diff --git a/src/parsers/minecraft/nbt-path.ts b/src/parsers/minecraft/nbt-path.ts
@@ -683,6 +683,8 @@ function parsePath(reader: StringReader): ReturnedInfo<PathParseResult> {
                 }
                 return helper.fail();
             }
+        } else if (reader.peek() === " ") {
+            return helper.succeed(result);
         } else {
             return helper.fail(
                 exceptions.BAD_CHAR.create(

diff --git a/src/parsers/minecraft/scoreboard.ts b/src/parsers/minecraft/scoreboard.ts
@@ -285,9 +285,7 @@ export const criteriaParser: Parser = {
                 const result = parseNamespaceOption(
                     reader,
                     stringArrayToNamespaces([
-                        ...info.data.globalData.registries[
-                            "minecraft:entity_type"
-                        ]
+                        ...info.data.globalData.registries["minecraft:item"]
                     ]),
                     CompletionItemKind.Reference,
                     "."