This seems to work too

DerEchtePilz · DerEchtePilz · commit 35ecee0ebb7a · 2025-02-20T16:02:00.000+01:00
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.20.5/src/main/java/dev/jorel/commandapi/nms/NMS_1_20_R4.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.20.5/src/main/java/dev/jorel/commandapi/nms/NMS_1_20_R4.java
@@ -1071,12 +1071,7 @@ public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistration
 			}
 			return new PaperCommandRegistration<>(
 				() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher(),
-				() -> {
-					SimpleHelpMap helpMap = (SimpleHelpMap) Bukkit.getServer().getHelpMap();
-					helpMap.clear();
-					helpMap.initializeGeneralTopics();
-					helpMap.initializeCommands();
-				},
+				() -> ((SimpleHelpMap) Bukkit.getServer().getHelpMap()).initializeCommands(),
 				node -> bukkitCommandNode_bukkitBrigCommand.isInstance(node.getCommand())
 			);
 		}
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.21.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_21_R2.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.21.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_21_R2.java
@@ -1108,12 +1108,7 @@ public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistration
 			}
 			return new PaperCommandRegistration<>(
 				() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher(),
-				() -> {
-					SimpleHelpMap helpMap = (SimpleHelpMap) Bukkit.getServer().getHelpMap();
-					helpMap.clear();
-					helpMap.initializeGeneralTopics();
-					helpMap.initializeCommands();
-				},
+				() -> ((SimpleHelpMap) Bukkit.getServer().getHelpMap()).initializeCommands(),
 				node -> bukkitCommandNode_bukkitBrigCommand.isInstance(node.getCommand())
 			);
 		}
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.21.4/src/main/java/dev/jorel/commandapi/nms/NMS_1_21_R3.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.21.4/src/main/java/dev/jorel/commandapi/nms/NMS_1_21_R3.java
@@ -1154,12 +1154,7 @@ public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistration
 			}
 			return new PaperCommandRegistration<>(
 				() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher(),
-				() -> {
-					SimpleHelpMap helpMap = (SimpleHelpMap) Bukkit.getServer().getHelpMap();
-					helpMap.clear();
-					helpMap.initializeGeneralTopics();
-					helpMap.initializeCommands();
-				},
+				() -> ((SimpleHelpMap) Bukkit.getServer().getHelpMap()).initializeCommands(),
 				node -> bukkitCommandNode_bukkitBrigCommand.isInstance(node.getCommand())
 			);
 		}
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.21/src/main/java/dev/jorel/commandapi/nms/NMS_1_21_R1.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.21/src/main/java/dev/jorel/commandapi/nms/NMS_1_21_R1.java
@@ -1069,12 +1069,7 @@ public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistration
 			}
 			return new PaperCommandRegistration<>(
 				() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher(),
-				() -> {
-					SimpleHelpMap helpMap = (SimpleHelpMap) Bukkit.getServer().getHelpMap();
-					helpMap.clear();
-					helpMap.initializeGeneralTopics();
-					helpMap.initializeCommands();
-				},
+				() -> ((SimpleHelpMap) Bukkit.getServer().getHelpMap()).initializeCommands(),
 				node -> bukkitCommandNode_bukkitBrigCommand.isInstance(node.getCommand())
 			);
 		}

Original file line number	Diff line number	Diff line change
`@@ -1071,12 +1071,7 @@ public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistration`
`1071`	`1071`	`}`
`1072`	`1072`	`return new PaperCommandRegistration<>(`
`1073`	`1073`	`() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher(),`
`1074`		`- () -> {`
`1075`		`- SimpleHelpMap helpMap = (SimpleHelpMap) Bukkit.getServer().getHelpMap();`
`1076`		`- helpMap.clear();`
`1077`		`- helpMap.initializeGeneralTopics();`
`1078`		`- helpMap.initializeCommands();`
`1079`		`- },`
	`1074`	`+ () -> ((SimpleHelpMap) Bukkit.getServer().getHelpMap()).initializeCommands(),`
`1080`	`1075`	`node -> bukkitCommandNode_bukkitBrigCommand.isInstance(node.getCommand())`
`1081`	`1076`	`);`
`1082`	`1077`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1108,12 +1108,7 @@ public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistration`
`1108`	`1108`	`}`
`1109`	`1109`	`return new PaperCommandRegistration<>(`
`1110`	`1110`	`() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher(),`
`1111`		`- () -> {`
`1112`		`- SimpleHelpMap helpMap = (SimpleHelpMap) Bukkit.getServer().getHelpMap();`
`1113`		`- helpMap.clear();`
`1114`		`- helpMap.initializeGeneralTopics();`
`1115`		`- helpMap.initializeCommands();`
`1116`		`- },`
	`1111`	`+ () -> ((SimpleHelpMap) Bukkit.getServer().getHelpMap()).initializeCommands(),`
`1117`	`1112`	`node -> bukkitCommandNode_bukkitBrigCommand.isInstance(node.getCommand())`
`1118`	`1113`	`);`
`1119`	`1114`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1154,12 +1154,7 @@ public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistration`
`1154`	`1154`	`}`
`1155`	`1155`	`return new PaperCommandRegistration<>(`
`1156`	`1156`	`() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher(),`
`1157`		`- () -> {`
`1158`		`- SimpleHelpMap helpMap = (SimpleHelpMap) Bukkit.getServer().getHelpMap();`
`1159`		`- helpMap.clear();`
`1160`		`- helpMap.initializeGeneralTopics();`
`1161`		`- helpMap.initializeCommands();`
`1162`		`- },`
	`1157`	`+ () -> ((SimpleHelpMap) Bukkit.getServer().getHelpMap()).initializeCommands(),`
`1163`	`1158`	`node -> bukkitCommandNode_bukkitBrigCommand.isInstance(node.getCommand())`
`1164`	`1159`	`);`
`1165`	`1160`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1069,12 +1069,7 @@ public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistration`
`1069`	`1069`	`}`
`1070`	`1070`	`return new PaperCommandRegistration<>(`
`1071`	`1071`	`() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher(),`
`1072`		`- () -> {`
`1073`		`- SimpleHelpMap helpMap = (SimpleHelpMap) Bukkit.getServer().getHelpMap();`
`1074`		`- helpMap.clear();`
`1075`		`- helpMap.initializeGeneralTopics();`
`1076`		`- helpMap.initializeCommands();`
`1077`		`- },`
	`1072`	`+ () -> ((SimpleHelpMap) Bukkit.getServer().getHelpMap()).initializeCommands(),`
`1078`	`1073`	`node -> bukkitCommandNode_bukkitBrigCommand.isInstance(node.getCommand())`
`1079`	`1074`	`);`
`1080`	`1075`	`}`