summaryrefslogtreecommitdiffstats
path: root/nms-patches/CustomFunctionData.patch
blob: 8542f3a5153c701a652dd3fd8612cbb06e8f0517 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
--- a/net/minecraft/server/CustomFunctionData.java
+++ b/net/minecraft/server/CustomFunctionData.java
@@ -32,7 +32,7 @@
     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();
@@ -60,7 +60,7 @@
     }
 
     public com.mojang.brigadier.CommandDispatcher<CommandListenerWrapper> d() {
-        return this.f.getCommandDispatcher().a();
+        return this.f.vanillaCommandDispatcher.a(); // CraftBukkit
     }
 
     public void Y_() {
@@ -164,7 +164,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);
             }));