mirror of
https://github.com/PaperMC/Paper.git
synced 2024-11-06 02:42:14 +01:00
31 lines
1.6 KiB
Diff
31 lines
1.6 KiB
Diff
From 0000000000000000000000000000000000000000 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 69159ae999af8b48542f69eb60ad0822eca2809d..eb4dd0708930b0c5388a88c193d1c17978e42f48 100644
|
|
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
|
|
@@ -413,13 +413,13 @@ public class CraftWorld implements World {
|
|
|
|
@Override
|
|
public boolean isChunkLoaded(int x, int z) {
|
|
- return world.getChunkProvider().isChunkLoaded(x, z);
|
|
+ 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);
|
|
}
|