Mirror von
https://github.com/PaperMC/Paper.git
synchronisiert 2024-11-15 20:40:07 +01:00
bd1e1ad1aa
Upstream has released updates that appears to apply and compile correctly. This update has not been tested by PaperMC and as with ANY update, please do your own testing Bukkit Changes: 5d4de46e Fix checkstyle.xml formatting adf331f1 SPIGOT-5496: API to create and manipulate hardcore worlds CraftBukkit Changes:c727dc2aFix checkstyle.xml formattinge7202cd4SPIGOT-5496: API to create and manipulate hardcore worlds9820cd2dMC-151364, SPIGOT-5494: Feeding dolphin hangs if generate-structures=false
35 Zeilen
1.6 KiB
Diff
35 Zeilen
1.6 KiB
Diff
From 5620e40df38c5991a73c4ae175263e24a30a9385 Mon Sep 17 00:00:00 2001
|
|
From: Shane Freeder <theboyetronic@gmail.com>
|
|
Date: Tue, 21 May 2019 02:34:04 +0100
|
|
Subject: [PATCH] improve CraftWorld#isChunkLoaded
|
|
|
|
getChunkAt will request the chunk using vanillas chunk loading system,
|
|
which while we're not going to load the chunk, does involve the server
|
|
waiting for the execution queue to get to our request; We can just query
|
|
the chunk status and get a response now, vs having to wait
|
|
|
|
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
index 0a91617290..3a686c5287 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -404,14 +404,13 @@ public class CraftWorld implements World {
|
|
|
|
@Override
|
|
public boolean isChunkLoaded(int x, int z) {
|
|
- net.minecraft.server.Chunk chunk = world.getChunkProvider().getChunkAt(x, z, false);
|
|
- return chunk != null;
|
|
+ return world.getChunkProvider().getChunkAtIfLoadedImmediately(x, z) != null; // Paper
|
|
}
|
|
|
|
@Override
|
|
public boolean isChunkGenerated(int x, int z) {
|
|
try {
|
|
- return isChunkLoaded(x, z) || world.getChunkProvider().playerChunkMap.read(new ChunkCoordIntPair(x, z)) != null;
|
|
+ return world.getChunkProvider().getChunkAtIfCachedImmediately(x, z) != null || world.getChunkProvider().playerChunkMap.read(new ChunkCoordIntPair(x, z)) != null; // Paper (TODO check if the first part can be removed)
|
|
} catch (IOException ex) {
|
|
throw new RuntimeException(ex);
|
|
}
|
|
--
|
|
2.24.1
|
|
|