Updated Upstream (Paper)

Upstream has released updates that appear to apply and compile correctly

Paper Changes:
2cf4b82d71 Correctly parse last update for old chunks for regionfile recalc
8f65f378ce [ci skip] Fix typo in getNearbyLivingEntities documentation (#7205)
87e443bf9a Fix migration logic for old player saving config option
6cb62bf003 Deprecate localized name API (#7212)
5883773e37 Fix Chunk#isSlimeChunk when all-chunks-are-slime-chunks is true (#7211)
1931bb53bf https://youtu.be/NIH6j7-w198
This commit is contained in:
BillyGalbreath
2021-12-28 15:49:08 -06:00
parent 1f2d9788a7
commit eceb7fb471
4 changed files with 4 additions and 24 deletions

View File

@@ -1,20 +0,0 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: BillyGalbreath <blake.galbreath@gmail.com>
Date: Mon, 27 Dec 2021 12:25:14 -0600
Subject: [PATCH] PaperPR - Fix Chunk#isSlimeChunk when
all-chunks-are-slime-chunks is true
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
index d51476ca2aad08a0dd93a2e772dd7750afc939dc..f20293426b104ed0c02a931b5ab77f87590f0c18 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftChunk.java
@@ -205,7 +205,7 @@ public class CraftChunk implements Chunk {
@Override
public boolean isSlimeChunk() {
// 987234911L is deterimined in EntitySlime when seeing if a slime can spawn in a chunk
- return WorldgenRandom.seedSlimeChunk(this.getX(), this.getZ(), this.getWorld().getSeed(), worldServer.spigotConfig.slimeSeed).nextInt(10) == 0;
+ return this.worldServer.paperConfig.allChunksAreSlimeChunks || WorldgenRandom.seedSlimeChunk(this.getX(), this.getZ(), this.getWorld().getSeed(), worldServer.spigotConfig.slimeSeed).nextInt(10) == 0; // Paper
}
@Override