OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2025-03-22 23:15:36 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix compile issues

Browse source
This commit is contained in:
Spottedleaf 2024-10-25 11:46:53 -07:00
parent 1d63b06b5e
commit d83a56b430
2 changed files with 21 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
patches/server/1039-fixup-MC-Utils.patch
View file

@ -1329,6 +1329,25 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
} }
// Paper end - chunk system hooks // Paper end - chunk system hooks
if (!this.addEntityUuid(entity)) { if (!this.addEntityUuid(entity)) {
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -0,0 +0,0 @@ public class CraftWorld extends CraftRegionAccessor implements World {
}
}
- ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority priority;
+ ca.spottedleaf.concurrentutil.util.Priority priority;
if (urgent) {
- priority = ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.HIGHER;
+ priority = ca.spottedleaf.concurrentutil.util.Priority.HIGHER;
} else {
- priority = ca.spottedleaf.concurrentutil.executor.standard.PrioritisedExecutor.Priority.NORMAL;
+ priority = ca.spottedleaf.concurrentutil.util.Priority.NORMAL;
}
java.util.concurrent.CompletableFuture<Chunk> ret = new java.util.concurrent.CompletableFuture<>();
diff --git a/src/main/resources/META-INF/services/ca.spottedleaf.moonrise.common.PlatformHooks b/src/main/resources/META-INF/services/ca.spottedleaf.moonrise.common.PlatformHooks diff --git a/src/main/resources/META-INF/services/ca.spottedleaf.moonrise.common.PlatformHooks b/src/main/resources/META-INF/services/ca.spottedleaf.moonrise.common.PlatformHooks
new file mode 100644 new file mode 100644
index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000 index 0000000000000000000000000000000000000000..0000000000000000000000000000000000000000

4
patches/server/Moonrise-optimisation-patches.patch
View file

@ -10372,7 +10372,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ } + }
+ +
+ // Don't really have a choice but to place this hook here + // Don't really have a choice but to place this hook here
+ PlatformHooks.get().onChunkHolderTicketChange(this.world, this, oldLevel, newLevel); + PlatformHooks.get().onChunkHolderTicketChange(this.world, this.vanillaChunkHolder, oldLevel, newLevel);
+ } + }
+ +
+ static final int NEIGHBOUR_RADIUS = 2; + static final int NEIGHBOUR_RADIUS = 2;
@ -14401,7 +14401,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
+ +
+ try { + try {
+ // run converters + // run converters
+ final CompoundTag converted = this.world.getChunkSource().chunkMap.upgradeChunkTag(data); + final CompoundTag converted = this.world.getChunkSource().chunkMap.upgradeChunkTag(data, new ChunkPos(this.chunkX, this.chunkZ)); // Paper
+ +
+ // unpack the data + // unpack the data
+ final SerializableChunkData chunkData = SerializableChunkData.parse( + final SerializableChunkData chunkData = SerializableChunkData.parse(