Paper/nms-patches/CustomFunctionData.patch

39 lines
1.7 KiB
Diff
Raw Normal View History

2017-05-14 04:00:00 +02:00
--- a/net/minecraft/server/CustomFunctionData.java
+++ b/net/minecraft/server/CustomFunctionData.java
2018-07-15 02:00:00 +02:00
@@ -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
2017-05-14 04:00:00 +02:00
2018-07-15 02:00:00 +02:00
public CustomFunctionData(MinecraftServer minecraftserver) {
this.f = minecraftserver;
+ this.dispatcher = this.f.getCommandDispatcher().a(); // CraftBukkit
2017-05-14 04:00:00 +02:00
}
2018-07-15 02:00:00 +02:00
@Nullable
@@ -60,7 +62,7 @@
2017-05-14 04:00:00 +02:00
}
2018-07-15 02:00:00 +02:00
public com.mojang.brigadier.CommandDispatcher<CommandListenerWrapper> d() {
- return this.f.getCommandDispatcher().a();
+ return dispatcher; // CraftBukkit
2017-05-14 04:00:00 +02:00
}
2018-07-15 02:00:00 +02:00
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);
}));