Updated Upstream (Bukkit/CraftBukkit) (#7776)
This commit is contained in:
parent
608482d512
commit
4166632333
33 changed files with 144 additions and 132 deletions
|
@ -22,7 +22,7 @@ wants it to collect even faster, they can restore that setting back to 1 instead
|
|||
Not adding it to .getType() though to keep behavior consistent with vanilla for performance reasons.
|
||||
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftServer.java b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
index 4756ae3b7e217e3849c6fedfcb6f5b601719735d..8699b1c7d9085a07919cdb51391a189cf59e6623 100644
|
||||
index d4d8eee914f71d9a33feda82ef54cb0c40b0e60c..28a04d21801a9bb1e4311e6da28eae26283a2e36 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftServer.java
|
||||
@@ -359,7 +359,7 @@ public final class CraftServer implements Server {
|
||||
|
@ -44,7 +44,7 @@ index 4756ae3b7e217e3849c6fedfcb6f5b601719735d..8699b1c7d9085a07919cdb51391a189c
|
|||
this.printSaveWarning = false;
|
||||
console.autosavePeriod = this.configuration.getInt("ticks-per.autosave");
|
||||
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
index 98ce85ee3d717e921dcbf7e4c4b3a4c5db61b77b..68f6ccacacad0e06f27d56b19b9f68b0691e747e 100644
|
||||
index 249befd851798012e390017b90cd234a17d71718..62078ee1996c671639d00ddce4dabb7238a672b7 100644
|
||||
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
||||
@@ -275,8 +275,21 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
||||
|
@ -111,7 +111,7 @@ index 98ce85ee3d717e921dcbf7e4c4b3a4c5db61b77b..68f6ccacacad0e06f27d56b19b9f68b0
|
|||
world.getChunkSource().getChunk(x, z, ChunkStatus.FULL, true);
|
||||
return true;
|
||||
// Paper end
|
||||
@@ -1978,6 +1994,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
||||
@@ -1972,6 +1988,7 @@ public class CraftWorld extends CraftRegionAccessor implements World {
|
||||
|
||||
return this.world.getChunkSource().getChunkAtAsynchronously(x, z, gen, urgent).thenComposeAsync((either) -> {
|
||||
net.minecraft.world.level.chunk.LevelChunk chunk = (net.minecraft.world.level.chunk.LevelChunk) either.left().orElse(null);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue