mirror of
https://github.com/PaperMC/Paper.git
synced 2024-09-19 18:31:18 +02:00
39 lines
1.7 KiB
Diff
39 lines
1.7 KiB
Diff
--- a/net/minecraft/server/CustomFunctionData.java
|
|
+++ b/net/minecraft/server/CustomFunctionData.java
|
|
@@ -32,14 +32,16 @@
|
|
private final Map<MinecraftKey, CustomFunction> g = Maps.newHashMap();
|
|
private final ArrayDeque<CustomFunctionData.a> h = new ArrayDeque();
|
|
private boolean i;
|
|
- private final Tags<CustomFunction> j = new Tags((minecraftkey) -> {
|
|
+ private final Tags<CustomFunction> j = new Tags<>((minecraftkey) -> { // CraftBukkit - decompile error
|
|
return this.a(minecraftkey) != null;
|
|
}, this::a, "tags/functions", true, "function");
|
|
private final List<CustomFunction> k = Lists.newArrayList();
|
|
private boolean l;
|
|
+ private final com.mojang.brigadier.CommandDispatcher<CommandListenerWrapper> dispatcher; // CraftBukkit
|
|
|
|
public CustomFunctionData(MinecraftServer minecraftserver) {
|
|
this.f = minecraftserver;
|
|
+ this.dispatcher = this.f.getCommandDispatcher().a(); // CraftBukkit
|
|
}
|
|
|
|
@Nullable
|
|
@@ -60,7 +62,7 @@
|
|
}
|
|
|
|
public com.mojang.brigadier.CommandDispatcher<CommandListenerWrapper> d() {
|
|
- return this.f.getCommandDispatcher().a();
|
|
+ return dispatcher; // CraftBukkit
|
|
}
|
|
|
|
public void X_() {
|
|
@@ -164,7 +166,7 @@
|
|
arraylist.add(CompletableFuture.supplyAsync(() -> {
|
|
return a(iresourcemanager, minecraftkey);
|
|
}, Resource.a).thenApplyAsync((list) -> {
|
|
- return CustomFunction.a(minecraftkey, this, list);
|
|
+ return CustomFunction.a(minecraftkey1, this, list); // CraftBukkit - decompile error
|
|
}).handle((customfunction, throwable) -> {
|
|
return this.a(customfunction, throwable, minecraftkey);
|
|
}));
|