SteamWar/Paper
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Clean up add/removePluginChunkTicket

Browse Source 
No need to be that invasive to Vanilla code for simple, non-hot and small collection checks
This commit is contained in:
Nassim Jahnke
2024-12-17 21:40:20 +01:00
parent 88b2981e09
commit d94e258d01
2 changed files with 35 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
paper-server/src/main/java/org/bukkit/craftbukkit/CraftWorld.java
View File

@@ -584,10 +584,9 @@ public class CraftWorld extends CraftRegionAccessor implements World {
Preconditions.checkArgument(plugin != null, "null plugin");
Preconditions.checkArgument(plugin.isEnabled(), "plugin is not enabled");
DistanceManager chunkDistanceManager = this.world.getChunkSource().chunkMap.distanceManager;
if (chunkDistanceManager.addRegionTicketAtDistance(TicketType.PLUGIN_TICKET, new ChunkPos(x, z), 2, plugin)) { // keep in-line with force loading, add at level 31
this.getChunkAt(x, z); // ensure loaded
final DistanceManager distanceManager = this.world.getChunkSource().chunkMap.distanceManager;
if (distanceManager.addPluginRegionTicket(new ChunkPos(x, z), plugin)) {
this.getChunkAt(x, z); // ensure it's loaded
return true;
}
@@ -598,8 +597,8 @@ public class CraftWorld extends CraftRegionAccessor implements World {
public boolean removePluginChunkTicket(int x, int z, Plugin plugin) {
Preconditions.checkNotNull(plugin, "null plugin");
DistanceManager chunkDistanceManager = this.world.getChunkSource().chunkMap.distanceManager;
return chunkDistanceManager.removeRegionTicketAtDistance(TicketType.PLUGIN_TICKET, new ChunkPos(x, z), 2, plugin); // keep in-line with force loading, remove at level 31
final DistanceManager distanceManager = this.world.getChunkSource().chunkMap.distanceManager;
return distanceManager.removePluginRegionTicket(new ChunkPos(x, z), plugin);
}
@Override