mirror of
https://github.com/PaperMC/Paper.git
synced 2024-12-29 12:27:59 +01:00
fix compile issues
This commit is contained in:
parent
9adbb0e5c1
commit
97d6e76ee5
@ -4,21 +4,6 @@ Date: Mon, 8 Apr 2024 16:43:16 +0200
|
|||||||
Subject: [PATCH] API for checking sent chunks
|
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
|
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
|
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
|
||||||
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
--- a/src/main/java/org/bukkit/craftbukkit/entity/CraftPlayer.java
|
@ -29,7 +29,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
}
|
}
|
||||||
+ final java.util.concurrent.CompletableFuture<ChunkAccess> future = new java.util.concurrent.CompletableFuture<>();
|
+ final java.util.concurrent.CompletableFuture<ChunkAccess> future = new java.util.concurrent.CompletableFuture<>();
|
||||||
+ ca.spottedleaf.moonrise.common.util.ChunkSystem.scheduleChunkLoad(
|
+ 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);
|
+ world.getChunkSource().mainThreadProcessor.managedBlock(future::isDone);
|
||||||
+ return future.thenApply(c -> {
|
+ return future.thenApply(c -> {
|
@ -32,9 +32,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
|
|||||||
@Override
|
@Override
|
||||||
public void remove() {
|
public void remove() {
|
||||||
+ // Paper start - fix removing recipes from RecipeIterator
|
+ // Paper start - fix removing recipes from RecipeIterator
|
||||||
+ if (this.currentRecipe instanceof org.bukkit.Keyed keyed) {
|
+ if (true) throw new UnsupportedOperationException();
|
||||||
+ MinecraftServer.getServer().getRecipeManager().byName.remove(org.bukkit.craftbukkit.util.CraftNamespacedKey.toMinecraft(keyed.getKey()));
|
|
||||||
+ }
|
|
||||||
+ // Paper end - fix removing recipes from RecipeIterator
|
+ // Paper end - fix removing recipes from RecipeIterator
|
||||||
this.recipes.remove();
|
this.recipes.remove();
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user