diff --git a/gradle.properties b/gradle.properties index 64b0fc9e3..6f5a77fb3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ version = 1.17.1-R0.1-SNAPSHOT mcVersion = 1.17.1 packageVersion = 1_17_R1 -paperCommit = b750837b0525c4bcac8121ca6ed02d572e1a0ecc +paperCommit = 651f96afcc6bc7c2b180a22fe822a5cdcc93cdea org.gradle.caching = true org.gradle.parallel = true diff --git a/patches/server/0001-Airplane-Server-Changes.patch b/patches/server/0001-Airplane-Server-Changes.patch index 69a6c50df..6eb73a3cc 100644 --- a/patches/server/0001-Airplane-Server-Changes.patch +++ b/patches/server/0001-Airplane-Server-Changes.patch @@ -90,7 +90,7 @@ index 218f5bafeed8551b55b91c7fccaf6935c8b631ca..9d70f944af2c81ab5ab23b06857d740d metrics.addCustomChart(new Metrics.DrilldownPie("java_version", () -> { Map> map = new HashMap<>(); diff --git a/src/main/java/com/destroystokyo/paper/PaperConfig.java b/src/main/java/com/destroystokyo/paper/PaperConfig.java -index 83811726fc97d6288b7489d3cc48b86a5fbc33bd..7314fa88c7ee5185664f92aa064eaa38d8f5839d 100644 +index 076b0218ccb064ee36f46f9d76fe61eacda931b3..6ba32b6efd32e6861f2c6bc8296b12c5c9cee593 100644 --- a/src/main/java/com/destroystokyo/paper/PaperConfig.java +++ b/src/main/java/com/destroystokyo/paper/PaperConfig.java @@ -202,16 +202,26 @@ public class PaperConfig { @@ -1582,10 +1582,10 @@ index 0000000000000000000000000000000000000000..a7f297ebb569f7c1f205e967ca485be7 + } +} diff --git a/src/main/java/net/minecraft/Util.java b/src/main/java/net/minecraft/Util.java -index 69faebb95924946f648cf9f86ff777d3274e3f28..1b246a401e626ba3034c36deedd8488a49479c96 100644 +index 505546d32eea4682452dbac02311433157f6a30e..5c7b9ad379f3c272e15648dd16f4df9245d927da 100644 --- a/src/main/java/net/minecraft/Util.java +++ b/src/main/java/net/minecraft/Util.java -@@ -332,6 +332,10 @@ public class Util { +@@ -344,6 +344,10 @@ public class Util { } public static CompletableFuture> sequence(List> futures) { @@ -1596,7 +1596,7 @@ index 69faebb95924946f648cf9f86ff777d3274e3f28..1b246a401e626ba3034c36deedd8488a return futures.stream().reduce(CompletableFuture.completedFuture(Lists.newArrayList()), (completableFuture, completableFuture2) -> { return completableFuture2.thenCombine(completableFuture, (object, list) -> { List list2 = Lists.newArrayListWithCapacity(list.size() + 1); -@@ -347,6 +351,8 @@ public class Util { +@@ -359,6 +363,8 @@ public class Util { return list3; }); });