From d2519b507e0f9d18361501f4bf0809d68a2a385b Mon Sep 17 00:00:00 2001 From: Nassim Jahnke Date: Fri, 10 Jun 2022 14:45:58 +0200 Subject: [PATCH] Updated Upstream (CraftBukkit) Upstream has released updates that appear to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing CraftBukkit Changes: cc7edd6bc SPIGOT-7051: Worldgen API does not run vanilla noise generation when shouldGenerateNoise is true --- patches/server/Oprimise-map-impl-for-tracked-players.patch | 4 ++-- work/CraftBukkit | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/patches/server/Oprimise-map-impl-for-tracked-players.patch b/patches/server/Oprimise-map-impl-for-tracked-players.patch index 759217e582..aeb3f65b13 100644 --- a/patches/server/Oprimise-map-impl-for-tracked-players.patch +++ b/patches/server/Oprimise-map-impl-for-tracked-players.patch @@ -10,8 +10,8 @@ diff --git a/src/main/java/net/minecraft/server/level/ChunkMap.java b/src/main/j index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/level/ChunkMap.java +++ b/src/main/java/net/minecraft/server/level/ChunkMap.java -@@ -0,0 +0,0 @@ import org.apache.commons.lang3.mutable.MutableObject; - import org.slf4j.Logger; +@@ -0,0 +0,0 @@ import org.slf4j.Logger; + import org.bukkit.craftbukkit.generator.CustomChunkGenerator; import org.bukkit.entity.Player; // CraftBukkit end +import it.unimi.dsi.fastutil.objects.ReferenceOpenHashSet; // Paper diff --git a/work/CraftBukkit b/work/CraftBukkit index b2557f6acd..cc7edd6bc5 160000 --- a/work/CraftBukkit +++ b/work/CraftBukkit @@ -1 +1 @@ -Subproject commit b2557f6acd3a2b065643f1c58a411a20c1eef842 +Subproject commit cc7edd6bc52f405818c8b995e576cfdcb537d88b