OpenSource/PaperMC
OpenSource/PaperMC
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-12-29 07:48:53 +01:00
Code Issues Projects Releases Packages Wiki Activity

improve CraftWorld#isChunkLoaded to use the chunk status

Browse source 
vs just checking that it exists as an updating chunk, as this appears to
be a "the chunk should be loaded, but might not be"
This commit is contained in:
Shane Freeder 2019-05-21 21:32:47 +01:00
parent 034fefceb7
commit 4800d2da2a
No known key found for this signature in database
GPG key ID: A3F61EA5A085289C
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Spigot-Server-Patches/0396-stop-CraftWorld-isChunkLoaded-from-loading-chunks.patch → Spigot-Server-Patches/0396-improve-CraftWorld-isChunkLoaded.patch
View file

@ -1,11 +1,15 @@
From b38dea63dc59e73147e3786336135b11d2385118 Mon Sep 17 00:00:00 2001 From 3cf8a9e0a5cb9d0a4c4171d08a243fa7ccf8b732 Mon Sep 17 00:00:00 2001
From: Shane Freeder <theboyetronic@gmail.com> From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 21 May 2019 02:34:04 +0100 Date: Tue, 21 May 2019 02:34:04 +0100
Subject: [PATCH] stop CraftWorld#isChunkLoaded from loading chunks 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 diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
index a263d8e7f..4cdc16d5b 100644 index a263d8e7f..5632d3e3f 100644
--- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java --- a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
+++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
@@ -382,8 +382,7 @@ public class CraftWorld implements World { @@ -382,8 +382,7 @@ public class CraftWorld implements World {
@ -14,7 +18,7 @@ index a263d8e7f..4cdc16d5b 100644
public boolean isChunkLoaded(int x, int z) { public boolean isChunkLoaded(int x, int z) {
- net.minecraft.server.Chunk chunk = world.getChunkProvider().getChunkAt(x, z, false); - net.minecraft.server.Chunk chunk = world.getChunkProvider().getChunkAt(x, z, false);
- return chunk != null && chunk.loaded; - return chunk != null && chunk.loaded;
+ return world.getChunkProvider().playerChunkMap.updatingChunks.containsKey(ChunkCoordIntPair.pair(x, z)); // Paper + return world.getChunkProvider().isLoaded(x, z);// Paper
} }
@Override @Override