diff --git a/patches/server/CB-fixes.patch b/patches/server/CB-fixes.patch index 90e696b5b8..e6f8c2f5a8 100644 --- a/patches/server/CB-fixes.patch +++ b/patches/server/CB-fixes.patch @@ -10,6 +10,8 @@ Subject: [PATCH] CB fixes * Fixed method signature of Marker#addPassenger +* Removed unneeded UOE in CustomWorldChunkManager (extends BiomeSource) + diff --git a/src/main/java/net/minecraft/server/level/ServerLevel.java b/src/main/java/net/minecraft/server/level/ServerLevel.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/net/minecraft/server/level/ServerLevel.java @@ -60,6 +62,20 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 this.storageAccess = chunkIoWorker; this.registryAccess = registryManager; this.structureManager = structureManager; +diff --git a/src/main/java/org/bukkit/craftbukkit/generator/CustomWorldChunkManager.java b/src/main/java/org/bukkit/craftbukkit/generator/CustomWorldChunkManager.java +index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 +--- a/src/main/java/org/bukkit/craftbukkit/generator/CustomWorldChunkManager.java ++++ b/src/main/java/org/bukkit/craftbukkit/generator/CustomWorldChunkManager.java +@@ -0,0 +0,0 @@ public class CustomWorldChunkManager extends BiomeSource { + + @Override + public BiomeSource withSeed(long seed) { +- // TODO check method further +- throw new UnsupportedOperationException("Cannot copy CustomWorldChunkManager"); ++ return this; // Paper - Since this doesn't take a seed, no need to throw UOE + } + + @Override diff --git a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java b/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/util/permissions/CraftDefaultPermissions.java