diff --git a/patches/unapplied/server/API-for-checking-sent-chunks.patch b/patches/server/API-for-checking-sent-chunks.patch similarity index 71% rename from patches/unapplied/server/API-for-checking-sent-chunks.patch rename to patches/server/API-for-checking-sent-chunks.patch index 516805afe7..089b388295 100644 --- a/patches/unapplied/server/API-for-checking-sent-chunks.patch +++ b/patches/server/API-for-checking-sent-chunks.patch @@ -4,21 +4,6 @@ Date: Mon, 8 Apr 2024 16:43:16 +0200 Subject: [PATCH] API for checking sent chunks -diff --git a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java -index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 ---- a/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java -+++ b/src/main/java/ca/spottedleaf/moonrise/patches/chunk_system/player/RegionizedPlayerChunkLoader.java -@@ -0,0 +0,0 @@ public final class RegionizedPlayerChunkLoader { - - // now all tickets should be removed, which is all of our external state - } -+ -+ // For external checks -+ public it.unimi.dsi.fastutil.longs.LongOpenHashSet getSentChunksRaw() { -+ return this.sentChunks; -+ } - } - } diff --git a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java b/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644 --- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java diff --git a/patches/unapplied/server/Fix-CraftWorld-isChunkGenerated.patch b/patches/server/Fix-CraftWorld-isChunkGenerated.patch similarity index 95% rename from patches/unapplied/server/Fix-CraftWorld-isChunkGenerated.patch rename to patches/server/Fix-CraftWorld-isChunkGenerated.patch index 06c95139ff..5f99cb056a 100644 --- a/patches/unapplied/server/Fix-CraftWorld-isChunkGenerated.patch +++ b/patches/server/Fix-CraftWorld-isChunkGenerated.patch @@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 } + final java.util.concurrent.CompletableFuture future = new java.util.concurrent.CompletableFuture<>(); + ca.spottedleaf.moonrise.common.util.ChunkSystem.scheduleChunkLoad( -+ this.world, x, z, false, ChunkStatus.EMPTY, true, ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.NORMAL, future::complete ++ this.world, x, z, false, ChunkStatus.EMPTY, true, ca.spottedleaf.concurrentutil.util.Priority.NORMAL, future::complete + ); + world.getChunkSource().mainThreadProcessor.managedBlock(future::isDone); + return future.thenApply(c -> { diff --git a/patches/server/Fix-removing-recipes-from-RecipeIterator.patch b/patches/server/Fix-removing-recipes-from-RecipeIterator.patch index 6c8c77d21b..beb400b7f5 100644 --- a/patches/server/Fix-removing-recipes-from-RecipeIterator.patch +++ b/patches/server/Fix-removing-recipes-from-RecipeIterator.patch @@ -32,9 +32,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000 @Override public void remove() { + // Paper start - fix removing recipes from RecipeIterator -+ if (this.currentRecipe instanceof org.bukkit.Keyed keyed) { -+ MinecraftServer.getServer().getRecipeManager().byName.remove(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(keyed.getKey())); -+ } ++ if (true) throw new UnsupportedOperationException(); + // Paper end - fix removing recipes from RecipeIterator this.recipes.remove(); } diff --git a/patches/api/API-for-updating-recipes-on-clients.patch b/patches/unapplied/api/API-for-updating-recipes-on-clients.patch similarity index 100% rename from patches/api/API-for-updating-recipes-on-clients.patch rename to patches/unapplied/api/API-for-updating-recipes-on-clients.patch