Fix SpigotCommandRegistration having two copies of brigadierDispatcher

willkroboth · willkroboth · commit f9a8dccc0226 · 2024-06-03T11:36:04.000-04:00
It seems the underlying field accessed by running `this.&lt;MinecraftServer&gt;getMinecraftServer().getCommands().getDispatcher()` changes at some point. So, calling this during load actually results in just another copy of the `brigadierDispatcher`. However, if we call it later, it correctly returns the `resourcesDispatcher`.
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/SpigotCommandRegistration.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-core/src/main/java/dev/jorel/commandapi/SpigotCommandRegistration.java
@@ -11,6 +11,7 @@
 import org.bukkit.command.SimpleCommandMap;
 
 import java.util.*;
+import java.util.function.Supplier;
 
 /**
  * Handles logic for registering commands on Spigot and old versions of Paper
@@ -21,7 +22,7 @@ public class SpigotCommandRegistration<Source> extends CommandRegistrationStrate
 
 	// References to necessary objects
 	private final CommandDispatcher<Source> brigadierDispatcher;
-	private final CommandDispatcher<Source> resourcesDispatcher;
+	private final Supplier<CommandDispatcher<Source>> getResourcesDispatcher;
 
 	// Namespaces
 	private final Set<String> namespacesToFix = new HashSet<>();
@@ -30,11 +31,11 @@ public class SpigotCommandRegistration<Source> extends CommandRegistrationStrate
 	// Reflection
 	private final SafeVarHandle<SimpleCommandMap, Map<String, Command>> commandMapKnownCommands;
 
-	public SpigotCommandRegistration(CommandAPIBukkit<Source> commandAPIBukkit, CommandDispatcher<Source> brigadierDispatcher, CommandDispatcher<Source> resourcesDispatcher) {
+	public SpigotCommandRegistration(CommandAPIBukkit<Source> commandAPIBukkit, CommandDispatcher<Source> brigadierDispatcher, Supplier<CommandDispatcher<Source>> getResourcesDispatcher) {
 		this.commandAPIBukkit = commandAPIBukkit;
 
 		this.brigadierDispatcher = brigadierDispatcher;
-		this.resourcesDispatcher = resourcesDispatcher;
+		this.getResourcesDispatcher = getResourcesDispatcher;
 
 		this.commandMapKnownCommands = SafeVarHandle.ofOrNull(SimpleCommandMap.class, "knownCommands", "knownCommands", Map.class);
 	}
@@ -69,6 +70,7 @@ public void runTasksAfterServerStart() {
 
 	private void fixNamespaces() {
 		Map<String, Command> knownCommands = commandMapKnownCommands.get((SimpleCommandMap) commandAPIBukkit.getPaper().getCommandMap());
+		CommandDispatcher<Source> resourcesDispatcher = getResourcesDispatcher.get();
 
 		// Remove namespaces
 		for (String command : namespacesToFix) {
@@ -143,7 +145,7 @@ public void postCommandRegistration(RegisteredCommand registeredCommand, Literal
 			// and avoiding doing things twice for existing commands, this is a distilled version of those methods.
 
 			Map<String, Command> knownCommands = commandMapKnownCommands.get((SimpleCommandMap) commandAPIBukkit.getPaper().getCommandMap());
-			RootCommandNode<Source> root = resourcesDispatcher.getRoot();
+			RootCommandNode<Source> root = getResourcesDispatcher.get().getRoot();
 
 			String name = resultantNode.getLiteral();
 			String namespace = registeredCommand.namespace();
@@ -291,7 +293,7 @@ public void unregister(String commandName, boolean unregisterNamespaces, boolean
 			// Remove commands from the resources dispatcher
 			// If we are unregistering a Bukkit command, ONLY unregister BukkitCommandWrappers
 			// If we are unregistering a Vanilla command, DO NOT unregister BukkitCommandWrappers
-			removeBrigadierCommands(resourcesDispatcher, commandName, unregisterNamespaces,
+			removeBrigadierCommands(getResourcesDispatcher.get(), commandName, unregisterNamespaces,
 				c -> !unregisterBukkit ^ commandAPIBukkit.isBukkitCommandWrapper(c));
 		}
 	}
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.16.1/src/main/java/dev/jorel/commandapi/nms/NMS_1_16_R1.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.16.1/src/main/java/dev/jorel/commandapi/nms/NMS_1_16_R1.java
@@ -533,7 +533,7 @@ public BlockData getBlockState(CommandContext<CommandListenerWrapper> cmdCtx, St
 	public CommandRegistrationStrategy<CommandListenerWrapper> createCommandRegistrationStrategy() {
 		return new SpigotCommandRegistration<>(this,
 			this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.a(),
-			this.<MinecraftServer>getMinecraftServer().getCommandDispatcher().a()
+			() -> this.<MinecraftServer>getMinecraftServer().getCommandDispatcher().a()
 		);
 	}
 
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.16.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_16_R2.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.16.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_16_R2.java
@@ -531,7 +531,7 @@ public BlockData getBlockState(CommandContext<CommandListenerWrapper> cmdCtx, St
 	public CommandRegistrationStrategy<CommandListenerWrapper> createCommandRegistrationStrategy() {
 		return new SpigotCommandRegistration<>(this,
 			this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.a(),
-			this.<MinecraftServer>getMinecraftServer().getCommandDispatcher().a()
+			() -> this.<MinecraftServer>getMinecraftServer().getCommandDispatcher().a()
 		);
 	}
 
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.16.4/src/main/java/dev/jorel/commandapi/nms/NMS_1_16_4_R3.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.16.4/src/main/java/dev/jorel/commandapi/nms/NMS_1_16_4_R3.java
@@ -487,7 +487,7 @@ public BlockData getBlockState(CommandContext<CommandListenerWrapper> cmdCtx, St
 	public CommandRegistrationStrategy<CommandListenerWrapper> createCommandRegistrationStrategy() {
 		return new SpigotCommandRegistration<>(this,
 			this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.a(),
-			this.<MinecraftServer>getMinecraftServer().getCommandDispatcher().a()
+			() -> this.<MinecraftServer>getMinecraftServer().getCommandDispatcher().a()
 		);
 	}
 
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.17-common/src/main/java/dev/jorel/commandapi/nms/NMS_1_17_Common.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.17-common/src/main/java/dev/jorel/commandapi/nms/NMS_1_17_Common.java
@@ -316,7 +316,7 @@ public BlockData getBlockState(CommandContext<CommandSourceStack> cmdCtx, String
 	public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistrationStrategy() {
 		return new SpigotCommandRegistration<>(this,
 			this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),
-			this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
+			() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
 		);
 	}
 
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.18.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_18_R2.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.18.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_18_R2.java
@@ -376,7 +376,7 @@ public BlockData getBlockState(CommandContext<CommandSourceStack> cmdCtx, String
 	public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistrationStrategy() {
 		return new SpigotCommandRegistration<>(this,
 			this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),
-			this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
+			() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
 		);
 	}
 
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.18/src/main/java/dev/jorel/commandapi/nms/NMS_1_18_R1.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.18/src/main/java/dev/jorel/commandapi/nms/NMS_1_18_R1.java
@@ -324,7 +324,7 @@ public BlockData getBlockState(CommandContext<CommandSourceStack> cmdCtx, String
 	public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistrationStrategy() {
 		return new SpigotCommandRegistration<>(this,
 			this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),
-			this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
+			() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
 		);
 	}
 
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.19-common/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_Common.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.19-common/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_Common.java
@@ -446,7 +446,7 @@ public final BlockData getBlockState(CommandContext<CommandSourceStack> cmdCtx,
 	public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistrationStrategy() {
 		return new SpigotCommandRegistration<>(this,
 			this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),
-			this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
+			() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
 		);
 	}
 
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.19.3/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_3_R2.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.19.3/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_3_R2.java
@@ -321,7 +321,7 @@ public final BlockData getBlockState(CommandContext<CommandSourceStack> cmdCtx,
 	public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistrationStrategy() {
 		return new SpigotCommandRegistration<>(this,
 			this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),
-			this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
+			() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
 		);
 	}
 
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.19.4/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_4_R3.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.19.4/src/main/java/dev/jorel/commandapi/nms/NMS_1_19_4_R3.java
@@ -318,7 +318,7 @@ public final BlockData getBlockState(CommandContext<CommandSourceStack> cmdCtx,
 	public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistrationStrategy() {
 		return new SpigotCommandRegistration<>(this,
 			this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),
-			this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
+			() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
 		);
 	}
 
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.20.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_20_R2.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.20.2/src/main/java/dev/jorel/commandapi/nms/NMS_1_20_R2.java
@@ -340,7 +340,7 @@ public final BlockData getBlockState(CommandContext<CommandSourceStack> cmdCtx,
 	public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistrationStrategy() {
 		return new SpigotCommandRegistration<>(this,
 			this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),
-			this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
+			() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
 		);
 	}
 
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.20.3/src/main/java/dev/jorel/commandapi/nms/NMS_1_20_R3.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.20.3/src/main/java/dev/jorel/commandapi/nms/NMS_1_20_R3.java
@@ -415,7 +415,7 @@ public final BlockData getBlockState(CommandContext<CommandSourceStack> cmdCtx,
 	public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistrationStrategy() {
 		return new SpigotCommandRegistration<>(this,
 			this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),
-			this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
+			() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
 		);
 	}
 
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
@@ -902,7 +902,7 @@ public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistration
 		if (vanillaCommandDispatcherFieldExists) {
 			return new SpigotCommandRegistration<>(this,
 				this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),
-				this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
+				() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
 			);
 		} else {
 			return new PaperCommandRegistration<>(this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher());
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.20/src/main/java/dev/jorel/commandapi/nms/NMS_1_20_R1.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-nms/commandapi-bukkit-1.20/src/main/java/dev/jorel/commandapi/nms/NMS_1_20_R1.java
@@ -317,7 +317,7 @@ public final BlockData getBlockState(CommandContext<CommandSourceStack> cmdCtx,
 	public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistrationStrategy() {
 		return new SpigotCommandRegistration<>(this,
 			this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),
-			this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
+			() -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()
 		);
 	}
 
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin/src/main/java/dev/jorel/commandapi/CommandAPIMain.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-plugin/src/main/java/dev/jorel/commandapi/CommandAPIMain.java
@@ -26,6 +26,7 @@
 import java.util.Map;
 import java.util.Map.Entry;
 
+import dev.jorel.commandapi.arguments.StringArgument;
 import org.bukkit.Bukkit;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.plugin.InvalidPluginException;
@@ -131,5 +132,18 @@ private JavaPlugin getAndValidatePlugin(String pluginName) {
 	@Override
 	public void onEnable() {
 		CommandAPI.onEnable();
+
+		new CommandAPICommand("register")
+			.withArguments(new StringArgument("name"))
+			.executes(info -> {
+				String name = info.args().getUnchecked("name");
+
+				new CommandAPICommand(name)
+					.executes(subinfo -> {
+						subinfo.sender().sendMessage("You ran the " + name + " command");
+					})
+					.register();
+			})
+			.register();
 	}
 }
diff --git a/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl/src/main/java/dev/jorel/commandapi/test/MockPlatform.java b/commandapi-platforms/commandapi-bukkit/commandapi-bukkit-test/commandapi-bukkit-test-impl/src/main/java/dev/jorel/commandapi/test/MockPlatform.java
@@ -71,7 +71,7 @@ public static void unload() {
 
 	@Override
 	public CommandRegistrationStrategy<CLW> createCommandRegistrationStrategy() {
-		return new SpigotCommandRegistration<>(this, dispatcher, resourcesDispatcher);
+		return new SpigotCommandRegistration<>(this, dispatcher, () -> resourcesDispatcher);
 	}
 
 	public CommandDispatcher<CLW> getResourcesDispatcher() {

Original file line number	Diff line number	Diff line change
`@@ -533,7 +533,7 @@ public BlockData getBlockState(CommandContext<CommandListenerWrapper> cmdCtx, St`
`533`	`533`	`public CommandRegistrationStrategy<CommandListenerWrapper> createCommandRegistrationStrategy() {`
`534`	`534`	`return new SpigotCommandRegistration<>(this,`
`535`	`535`	`this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.a(),`
`536`		`- this.<MinecraftServer>getMinecraftServer().getCommandDispatcher().a()`
	`536`	`+ () -> this.<MinecraftServer>getMinecraftServer().getCommandDispatcher().a()`
`537`	`537`	`);`
`538`	`538`	`}`
`539`	`539`
Original file line number	Diff line number	Diff line change
`@@ -531,7 +531,7 @@ public BlockData getBlockState(CommandContext<CommandListenerWrapper> cmdCtx, St`
`531`	`531`	`public CommandRegistrationStrategy<CommandListenerWrapper> createCommandRegistrationStrategy() {`
`532`	`532`	`return new SpigotCommandRegistration<>(this,`
`533`	`533`	`this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.a(),`
`534`		`- this.<MinecraftServer>getMinecraftServer().getCommandDispatcher().a()`
	`534`	`+ () -> this.<MinecraftServer>getMinecraftServer().getCommandDispatcher().a()`
`535`	`535`	`);`
`536`	`536`	`}`
`537`	`537`
Original file line number	Diff line number	Diff line change
`@@ -487,7 +487,7 @@ public BlockData getBlockState(CommandContext<CommandListenerWrapper> cmdCtx, St`
`487`	`487`	`public CommandRegistrationStrategy<CommandListenerWrapper> createCommandRegistrationStrategy() {`
`488`	`488`	`return new SpigotCommandRegistration<>(this,`
`489`	`489`	`this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.a(),`
`490`		`- this.<MinecraftServer>getMinecraftServer().getCommandDispatcher().a()`
	`490`	`+ () -> this.<MinecraftServer>getMinecraftServer().getCommandDispatcher().a()`
`491`	`491`	`);`
`492`	`492`	`}`
`493`	`493`
Original file line number	Diff line number	Diff line change
`@@ -316,7 +316,7 @@ public BlockData getBlockState(CommandContext<CommandSourceStack> cmdCtx, String`
`316`	`316`	`public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistrationStrategy() {`
`317`	`317`	`return new SpigotCommandRegistration<>(this,`
`318`	`318`	`this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),`
`319`		`- this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()`
	`319`	`+ () -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()`
`320`	`320`	`);`
`321`	`321`	`}`
`322`	`322`
Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ public BlockData getBlockState(CommandContext<CommandSourceStack> cmdCtx, String`
`376`	`376`	`public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistrationStrategy() {`
`377`	`377`	`return new SpigotCommandRegistration<>(this,`
`378`	`378`	`this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),`
`379`		`- this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()`
	`379`	`+ () -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()`
`380`	`380`	`);`
`381`	`381`	`}`
`382`	`382`
Original file line number	Diff line number	Diff line change
`@@ -324,7 +324,7 @@ public BlockData getBlockState(CommandContext<CommandSourceStack> cmdCtx, String`
`324`	`324`	`public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistrationStrategy() {`
`325`	`325`	`return new SpigotCommandRegistration<>(this,`
`326`	`326`	`this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),`
`327`		`- this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()`
	`327`	`+ () -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()`
`328`	`328`	`);`
`329`	`329`	`}`
`330`	`330`
Original file line number	Diff line number	Diff line change
`@@ -446,7 +446,7 @@ public final BlockData getBlockState(CommandContext<CommandSourceStack> cmdCtx,`
`446`	`446`	`public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistrationStrategy() {`
`447`	`447`	`return new SpigotCommandRegistration<>(this,`
`448`	`448`	`this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),`
`449`		`- this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()`
	`449`	`+ () -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()`
`450`	`450`	`);`
`451`	`451`	`}`
`452`	`452`
Original file line number	Diff line number	Diff line change
`@@ -321,7 +321,7 @@ public final BlockData getBlockState(CommandContext<CommandSourceStack> cmdCtx,`
`321`	`321`	`public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistrationStrategy() {`
`322`	`322`	`return new SpigotCommandRegistration<>(this,`
`323`	`323`	`this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),`
`324`		`- this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()`
	`324`	`+ () -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()`
`325`	`325`	`);`
`326`	`326`	`}`
`327`	`327`
Original file line number	Diff line number	Diff line change
`@@ -318,7 +318,7 @@ public final BlockData getBlockState(CommandContext<CommandSourceStack> cmdCtx,`
`318`	`318`	`public CommandRegistrationStrategy<CommandSourceStack> createCommandRegistrationStrategy() {`
`319`	`319`	`return new SpigotCommandRegistration<>(this,`
`320`	`320`	`this.<MinecraftServer>getMinecraftServer().vanillaCommandDispatcher.getDispatcher(),`
`321`		`- this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()`
	`321`	`+ () -> this.<MinecraftServer>getMinecraftServer().getCommands().getDispatcher()`
`322`	`322`	`);`
`323`	`323`	`}`
`324`	`324`