3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-15 11:00:06 +01:00

Correctly copy alias requirements in command upgrader

Fixes NPE when converting namespaced commands.

Since the brigadier command api, more aliased commands
(namespaced variants) are registered in the vanilla dispatcher,
which made this issue more apparent.
Dieser Commit ist enthalten in:
Jason Penilla 2024-05-13 15:55:15 -07:00 committet von Spottedleaf
Ursprung bebcc9cc93
Commit 2faa3b2f44

Datei anzeigen

@ -27719,7 +27719,7 @@ index 0000000000000000000000000000000000000000..62c0f4073aff301bf5b3187e0d4446fd
+} +}
diff --git a/src/main/java/ca/spottedleaf/dataconverter/util/CommandArgumentUpgrader.java b/src/main/java/ca/spottedleaf/dataconverter/util/CommandArgumentUpgrader.java diff --git a/src/main/java/ca/spottedleaf/dataconverter/util/CommandArgumentUpgrader.java b/src/main/java/ca/spottedleaf/dataconverter/util/CommandArgumentUpgrader.java
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..e0f2772fa51e47b45eda5781ea8c34e59cc4b285 index 0000000000000000000000000000000000000000..6f2a30eed4e9741a128b5a171edef6abedab7362
--- /dev/null --- /dev/null
+++ b/src/main/java/ca/spottedleaf/dataconverter/util/CommandArgumentUpgrader.java +++ b/src/main/java/ca/spottedleaf/dataconverter/util/CommandArgumentUpgrader.java
@@ -0,0 +1,491 @@ @@ -0,0 +1,491 @@
@ -27842,7 +27842,7 @@ index 0000000000000000000000000000000000000000..e0f2772fa51e47b45eda5781ea8c34e5
+ new LiteralCommandNode<>( + new LiteralCommandNode<>(
+ redirectNode.getName(), + redirectNode.getName(),
+ null, + null,
+ null, + toNode.getRequirement(),
+ toNode, + toNode,
+ redirectNode.getRedirectModifier(), + redirectNode.getRedirectModifier(),
+ redirectNode.isFork() + redirectNode.isFork()