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

Update to Minecraft 1.16.1

Browse Source 
By: md_5 <git@md-5.net>
This commit is contained in:
CraftBukkit/Spigot
2020-06-25 10:00:00 +10:00
parent 3862d2811e
commit 50503fd516
424 changed files with 5960 additions and 5636 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
paper-server/nms-patches/DefinedStructure.patch
View File

@@ -1,6 +1,15 @@
--- a/net/minecraft/server/DefinedStructure.java
+++ b/net/minecraft/server/DefinedStructure.java
@@ -84,7 +84,7 @@
@@ -98,7 +98,7 @@
}
private static List<DefinedStructure.BlockInfo> a(List<DefinedStructure.BlockInfo> list, List<DefinedStructure.BlockInfo> list1, List<DefinedStructure.BlockInfo> list2) {
- Comparator<DefinedStructure.BlockInfo> comparator = Comparator.comparingInt((definedstructure_blockinfo) -> {
+ Comparator<DefinedStructure.BlockInfo> comparator = Comparator.<DefinedStructure.BlockInfo>comparingInt((definedstructure_blockinfo) -> { // CraftBukkit - decompile error
return definedstructure_blockinfo.a.getY();
}).thenComparingInt((definedstructure_blockinfo) -> {
return definedstructure_blockinfo.a.getX();
@@ -118,7 +118,7 @@
}
private void a(World world, BlockPosition blockposition, BlockPosition blockposition1) {
@@ -9,7 +18,7 @@
return !(entity instanceof EntityHuman);
});
@@ -388,11 +388,13 @@
@@ -430,11 +430,13 @@
}
private static Optional<Entity> a(GeneratorAccess generatoraccess, NBTTagCompound nbttagcompound) {
@@ -27,11 +36,11 @@
}
public BlockPosition a(EnumBlockRotation enumblockrotation) {
@@ -801,7 +803,7 @@
@@ -869,7 +871,7 @@
public IBlockData a(int i) {
IBlockData iblockdata = (IBlockData) this.b.fromId(i);
- return iblockdata == null ? DefinedStructure.a.a : iblockdata;
- return iblockdata == null ? DefinedStructure.b.a : iblockdata;
+ return iblockdata == null ? a : iblockdata; // CraftBukkit - decompile error
}