core
/
testserver
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
testserver/Spigot-Server-Patches/0395-improve-CraftWorld-isC...

28 lines
1.1 KiB
Diff
Raw Normal View History

Move version command update checking to the implementation This makes it easier for downstream projects (forks) to replace the version fetching system with their own. It is as simple as implementing an interface and overriding the default implementation of org.bukkit.UnsafeValues#getVersionFetcher() It also makes it easier for us to organize things like the version history feature. Lastly I have updated the paper implementation to check against the site API rather than against jenkins.
2019-05-27 09:13:41 +00:00
From a7d0a14bfad6b16f43caea8778de15a4398b2f0b Mon Sep 17 00:00:00 2001
stop CraftWorld#isChunkLoaded from loading chunks
2019-05-21 01:37:47 +00:00
From: Shane Freeder <theboyetronic@gmail.com>
Date: Tue, 21 May 2019 02:34:04 +0100
improve CraftWorld#isChunkLoaded to use the chunk status 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"
2019-05-21 20:32:47 +00:00
Subject: [PATCH] improve CraftWorld#isChunkLoaded
stop CraftWorld#isChunkLoaded from loading chunks
2019-05-21 01:37:47 +00:00
improve CraftWorld#isChunkLoaded to use the chunk status 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"
2019-05-21 20:32:47 +00:00
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
stop CraftWorld#isChunkLoaded from loading chunks
2019-05-21 01:37:47 +00:00
diff --git a/src/main/java/org/bukkit/craftbukkit/CraftWorld.java b/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
Move version command update checking to the implementation This makes it easier for downstream projects (forks) to replace the version fetching system with their own. It is as simple as implementing an interface and overriding the default implementation of org.bukkit.UnsafeValues#getVersionFetcher() It also makes it easier for us to organize things like the version history feature. Lastly I have updated the paper implementation to check against the site API rather than against jenkins.
2019-05-27 09:13:41 +00:00
index 63f953617..c0207694a 100644
stop CraftWorld#isChunkLoaded from loading chunks
2019-05-21 01:37:47 +00:00
--- a/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 {
@Override
public boolean isChunkLoaded(int x, int z) {
- net.minecraft.server.Chunk chunk = world.getChunkProvider().getChunkAt(x, z, false);
Updated Upstream (CraftBukkit) 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 CraftBukkit Changes: 17da3420 Fix reading custom persistent entity data 83783357 SPIGOT-4980: Shields will not be put on cooldown when hit with an axe 8d0f3722 SPIGOT-4752: Fixed inconsistency between isChunkLoaded and chunk load/unload events 3f9f31c3 SPIGOT-4982: Armor disappearing while breaking the armor stand
2019-05-26 01:56:30 +00:00
- return chunk != null;
improve CraftWorld#isChunkLoaded to use the chunk status 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"
2019-05-21 20:32:47 +00:00
+ return world.getChunkProvider().isLoaded(x, z);// Paper
stop CraftWorld#isChunkLoaded from loading chunks
2019-05-21 01:37:47 +00:00
}
@Override
--
2.21.0