SteamWar/Paper
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to Minecraft 1.14.4

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2019-07-20 09:00:00 +10:00
parent fa576e3e73
commit a4b8e8ce68
102 changed files with 678 additions and 751 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
paper-server/nms-patches/TagRegistry.patch
View File

@@ -1,23 +1,23 @@
--- a/net/minecraft/server/TagRegistry.java
+++ b/net/minecraft/server/TagRegistry.java
@@ -58,7 +58,7 @@
CompletableFuture<Map<MinecraftKey, Tag.a<Item>>> completablefuture1 = this.b.a(iresourcemanager, executor);
CompletableFuture<Map<MinecraftKey, Tag.a<FluidType>>> completablefuture2 = this.c.a(iresourcemanager, executor);
CompletableFuture<Map<MinecraftKey, Tag.a<EntityTypes<?>>>> completablefuture3 = this.d.a(iresourcemanager, executor);
CompletableFuture<Map<MinecraftKey, Tag.a<Item>>> completablefuture1 = this.itemTags.a(iresourcemanager, executor);
CompletableFuture<Map<MinecraftKey, Tag.a<FluidType>>> completablefuture2 = this.fluidTags.a(iresourcemanager, executor);
CompletableFuture<Map<MinecraftKey, Tag.a<EntityTypes<?>>>> completablefuture3 = this.entityTags.a(iresourcemanager, executor);
- CompletableFuture completablefuture4 = completablefuture.thenCombine(completablefuture1, Pair::of).thenCombine(completablefuture2.thenCombine(completablefuture3, Pair::of), (pair, pair1) -> {
+ CompletableFuture<TagRegistry.a> completablefuture4 = completablefuture.thenCombine(completablefuture1, Pair::of).thenCombine(completablefuture2.thenCombine(completablefuture3, Pair::of), (pair, pair1) -> { // CraftBukkit - decompile error
return new TagRegistry.a((Map) pair.getFirst(), (Map) pair.getSecond(), (Map) pair1.getFirst(), (Map) pair1.getSecond());
});
@@ -72,6 +72,12 @@
TagsItem.a((Tags) this.b);
TagsFluid.a((Tags) this.c);
TagsEntity.a((Tags) this.d);
TagsItem.a((Tags) this.itemTags);
TagsFluid.a((Tags) this.fluidTags);
TagsEntity.a((Tags) this.entityTags);
+ // CraftBukkit start
+ this.a.version++;
+ this.b.version++;
+ this.c.version++;
+ this.d.version++;
+ this.blockTags.version++;
+ this.itemTags.version++;
+ this.fluidTags.version++;
+ this.entityTags.version++;
+ // CraftBukkit end
}, executor1);
}