3
0
Mirror von https://github.com/PaperMC/Paper.git synchronisiert 2024-12-28 00:50:08 +01:00
Paper/nms-patches/ChunkProviderServer.patch

110 Zeilen
4.0 KiB
Diff

2015-05-25 12:37:24 +02:00
--- a/net/minecraft/server/ChunkProviderServer.java
+++ b/net/minecraft/server/ChunkProviderServer.java
2018-12-25 22:00:00 +01:00
@@ -16,6 +16,11 @@
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
+// CraftBukkit start
+import org.bukkit.craftbukkit.chunkio.ChunkIOExecutor;
+import org.bukkit.event.world.ChunkUnloadEvent;
+// CraftBukkit end
+
public class ChunkProviderServer implements IChunkProvider {
2016-02-29 22:32:46 +01:00
private static final Logger a = LogManager.getLogger();
2018-12-25 22:00:00 +01:00
@@ -34,7 +39,7 @@
2018-07-15 02:00:00 +02:00
this.chunkLoader = ichunkloader;
this.chunkGenerator = chunkgenerator;
2018-08-26 04:00:00 +02:00
this.asyncTaskHandler = iasynctaskhandler;
- this.chunkScheduler = new ChunkTaskScheduler(2, worldserver, chunkgenerator, ichunkloader, iasynctaskhandler);
+ this.chunkScheduler = new ChunkTaskScheduler(0, worldserver, chunkgenerator, ichunkloader, iasynctaskhandler); // CraftBukkit - very buggy, broken in lots of __subtle__ ways. Same goes for async chunk loading. Also Bukkit API / plugins can't handle async events at all anyway.
2018-12-25 22:00:00 +01:00
this.batchScheduler = new SchedulerBatch<>(this.chunkScheduler);
2018-07-15 02:00:00 +02:00
}
@@ -112,6 +117,25 @@
}
2018-07-15 02:00:00 +02:00
}
2018-07-25 11:32:06 +02:00
+ // CraftBukkit start
2018-08-26 04:00:00 +02:00
+ public Chunk generateChunk(int x, int z) {
+ try {
+ this.batchScheduler.b();
+ ChunkCoordIntPair pos = new ChunkCoordIntPair(x, z);
+ this.chunkScheduler.forcePolluteCache(pos);
+ ((ChunkRegionLoader) this.chunkLoader).blacklist.add(pos.a());
2018-08-26 04:00:00 +02:00
+ this.batchScheduler.a(pos);
+ CompletableFuture<ProtoChunk> completablefuture = this.batchScheduler.c();
2018-07-25 11:32:06 +02:00
+
+ Chunk chunk = (Chunk) completablefuture.thenApply(this::a).join();
+ ((ChunkRegionLoader) this.chunkLoader).blacklist.remove(pos.a());
+ return chunk;
2018-08-26 04:00:00 +02:00
+ } catch (RuntimeException runtimeexception) {
+ throw this.a(x, z, (Throwable) runtimeexception);
2018-07-25 11:32:06 +02:00
+ }
2018-08-26 04:00:00 +02:00
+ }
+ // CraftBukkit end
+
public IChunkAccess a(int i, int j, boolean flag) {
Chunk chunk = this.getChunkAt(i, j, true, false);
@@ -249,10 +273,12 @@
2018-08-26 04:00:00 +02:00
Chunk chunk = (Chunk) this.chunks.get(olong);
2018-08-26 04:00:00 +02:00
if (chunk != null) {
- chunk.removeEntities();
- this.saveChunk(chunk);
- this.chunks.remove(olong);
- this.lastChunk = null;
+ // CraftBukkit start - move unload logic to own method
+ if (!unloadChunk(chunk, true)) {
+ continue;
+ }
+ // CraftBukkit end
+
2018-08-26 04:00:00 +02:00
++i;
}
}
@@ -265,6 +291,42 @@
return false;
}
+ // CraftBukkit start
+ public boolean unloadChunk(Chunk chunk, boolean save) {
+ ChunkUnloadEvent event = new ChunkUnloadEvent(chunk.bukkitChunk, save);
+ this.world.getServer().getPluginManager().callEvent(event);
+ if (event.isCancelled()) {
+ return false;
+ }
+ save = event.isSaveChunk();
+
+ // Update neighbor counts
+ for (int x = -2; x < 3; x++) {
+ for (int z = -2; z < 3; z++) {
+ if (x == 0 && z == 0) {
+ continue;
+ }
+
2018-08-26 04:00:00 +02:00
+ Chunk neighbor = this.getChunkAt(chunk.locX + x, chunk.locZ + z, false, false);
+ if (neighbor != null) {
+ neighbor.setNeighborUnloaded(-x, -z);
+ chunk.setNeighborUnloaded(x, z);
+ }
+ }
+ }
+ // Moved from unloadChunks above
+ synchronized (this.chunkLoader) {
+ chunk.removeEntities();
+ if (save) {
+ this.saveChunk(chunk);
+ }
+ this.chunks.remove(chunk.chunkKey);
+ this.lastChunk = null;
+ }
+ return true;
+ }
+ // CraftBukkit end
+
2018-08-26 04:00:00 +02:00
public boolean d() {
return !this.world.savingDisabled;
}