Updated Upstream (Paper)

Upstream has released updates that appears to apply and compile correctly Paper Changes: 83c89d7af Updated Upstream (Bukkit) 43e2f13b2 Updated Upstream (Bukkit/CraftBukkit) 0faaa7da9 Updated Upstream (Bukkit/CraftBukkit) 83f377be8 Preserve order and allow multiple equal blocks in hidden-blocks of Anti-Xray (#4072) 8535eca3b [CI-SKIP] Fix an error in commit message when updating upstream (#4796)
YatopiaMC · Nov 26, 2020 · ff785fc · ff785fc
1 parent 1421cca
commit ff785fc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/Paper b/Paper
diff --git a/patches/server/0009-Delay-chunk-unloads.patch b/patches/server/0009-Delay-chunk-unloads.patch
@@ -247,7 +247,7 @@ index 5c789b25f1df2eae8ea8ceb4ba977ba336fe6d5e..ab0417b3897911ba29602d696f4842bf
          return new TicketType<>(s, comparator, 0L);
      }
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 299f57ca2a65887a0d7e7c584fc1bd5c783b0db2..f74aefc804f783a016bdda64aec64e4eedccf155 100644
+index 3f84c006be361e04910437c656344170d4ff70ee..3520c672c3f8cfcab9a047080171afed45b70773 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -504,6 +504,7 @@ public class CraftWorld implements World {

diff --git a/patches/server/0013-Per-World-Spawn-Limits.patch b/patches/server/0013-Per-World-Spawn-Limits.patch
@@ -34,7 +34,7 @@ index 9eb28e3c2b20f6db37aaaae84b7ac28377ddb5d5..3b20b9d64187f95e9244349085aa5a1a
  }
 \ No newline at end of file
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index f74aefc804f783a016bdda64aec64e4eedccf155..2b26b90590aba3ddef8e886e764467c6a71edded 100644
+index 3520c672c3f8cfcab9a047080171afed45b70773..f52a7d3989b08cadd1e46def683550350b9369a2 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -341,6 +341,14 @@ public class CraftWorld implements World {

diff --git a/patches/server/0031-Revert-getChunkAt-Async-retaining-chunks-for-long-pe.patch b/patches/server/0031-Revert-getChunkAt-Async-retaining-chunks-for-long-pe.patch
@@ -6,7 +6,7 @@ Subject: [PATCH] Revert getChunkAt(Async) retaining chunks for long periods of
 
 
 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
-index 2b26b90590aba3ddef8e886e764467c6a71edded..4de6252f07b3090c267503a549c58681ebf1fa9d 100644
+index f52a7d3989b08cadd1e46def683550350b9369a2..2028db6da469fc3c086842302d782bb081ed39f9 100644
 --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
 @@ -422,14 +422,7 @@ public class CraftWorld implements World {
@@ -25,7 +25,7 @@ index 2b26b90590aba3ddef8e886e764467c6a71edded..4de6252f07b3090c267503a549c58681
      }
 
      // Paper start
-@@ -2545,7 +2538,7 @@ public class CraftWorld implements World {
+@@ -2562,7 +2555,7 @@ public class CraftWorld implements World {
          }
          return this.world.getChunkProvider().getChunkAtAsynchronously(x, z, gen, urgent).thenComposeAsync((either) -> {
              net.minecraft.server.Chunk chunk = (net.minecraft.server.Chunk) either.left().orElse(null);