Upstream/Paper
1
0
Fork 0
mirror of https://github.com/PaperMC/Paper.git synced 2024-11-27 13:06:02 +01:00
Code Issues Projects Releases Wiki Activity

Remove chunks from queue if we don't need them anymore.

Browse Source
This commit is contained in:
Travis Watkins 2014-02-11 20:48:50 -06:00 committed by EvilSeph
parent f6f0cf338a
commit afb3511a4a
2 changed files with 45 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/main/java/net/minecraft/server/PlayerChunk.java
View File

@ -3,6 +3,11 @@ package net.minecraft.server;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
// CraftBukkit start
import org.bukkit.craftbukkit.chunkio.ChunkIOExecutor;
import java.util.HashMap;
// CraftBukkit end
class PlayerChunk { class PlayerChunk {
private final List b; private final List b;
@ -12,20 +17,22 @@ class PlayerChunk {
private int f; private int f;
private long g; private long g;
final PlayerChunkMap playerChunkMap; final PlayerChunkMap playerChunkMap;
private boolean loaded = false; // CraftBukkit // CraftBukkit start
private final HashMap<EntityPlayer, Runnable> players = new HashMap<EntityPlayer, Runnable>();
private boolean loaded = false;
private Runnable loadedRunnable = new Runnable() {
public void run() {
PlayerChunk.this.loaded = true;
}
};
// CraftBukkit end
public PlayerChunk(PlayerChunkMap playerchunkmap, int i, int j) { public PlayerChunk(PlayerChunkMap playerchunkmap, int i, int j) {
this.playerChunkMap = playerchunkmap; this.playerChunkMap = playerchunkmap;
this.b = new ArrayList(); this.b = new ArrayList();
this.dirtyBlocks = new short[64]; this.dirtyBlocks = new short[64];
this.location = new ChunkCoordIntPair(i, j); this.location = new ChunkCoordIntPair(i, j);
// CraftBukkit start playerchunkmap.a().chunkProviderServer.getChunkAt(i, j, this.loadedRunnable); // CraftBukkit
playerchunkmap.a().chunkProviderServer.getChunkAt(i, j, new Runnable() {
public void run() {
PlayerChunk.this.loaded = true;
}
});
// CraftBukkit end
} }
public void a(final EntityPlayer entityplayer) { // CraftBukkit - added final to argument public void a(final EntityPlayer entityplayer) { // CraftBukkit - added final to argument
@ -38,27 +45,50 @@ class PlayerChunk {
this.b.add(entityplayer); this.b.add(entityplayer);
// CraftBukkit start // CraftBukkit start
Runnable playerRunnable;
if (this.loaded) { if (this.loaded) {
playerRunnable = null;
entityplayer.chunkCoordIntPairQueue.add(this.location); entityplayer.chunkCoordIntPairQueue.add(this.location);
} else { } else {
this.playerChunkMap.a().chunkProviderServer.getChunkAt(this.location.x, this.location.z, new Runnable() { playerRunnable = new Runnable() {
public void run() { public void run() {
entityplayer.chunkCoordIntPairQueue.add(PlayerChunk.this.location); entityplayer.chunkCoordIntPairQueue.add(PlayerChunk.this.location);
} }
}); };
this.playerChunkMap.a().chunkProviderServer.getChunkAt(this.location.x, this.location.z, playerRunnable);
} }
this.players.put(entityplayer, playerRunnable);
// CraftBukkit end // CraftBukkit end
} }
} }
public void b(EntityPlayer entityplayer) { public void b(EntityPlayer entityplayer) {
if (this.b.contains(entityplayer)) { if (this.b.contains(entityplayer)) {
// CraftBukkit start - If we haven't loaded yet don't load the chunk just so we can clean it up
if (!this.loaded) {
ChunkIOExecutor.dropQueuedChunkLoad(this.playerChunkMap.a(), this.location.x, this.location.z, this.players.get(entityplayer));
this.b.remove(entityplayer);
this.players.remove(entityplayer);
if (this.b.isEmpty()) {
ChunkIOExecutor.dropQueuedChunkLoad(this.playerChunkMap.a(), this.location.x, this.location.z, this.loadedRunnable);
long i = (long) this.location.x + 2147483647L | (long) this.location.z + 2147483647L << 32;
PlayerChunkMap.b(this.playerChunkMap).remove(i);
PlayerChunkMap.c(this.playerChunkMap).remove(this);
}
return;
}
// CraftBukkit end
Chunk chunk = PlayerChunkMap.a(this.playerChunkMap).getChunkAt(this.location.x, this.location.z); Chunk chunk = PlayerChunkMap.a(this.playerChunkMap).getChunkAt(this.location.x, this.location.z);
if (chunk.k()) { if (chunk.k()) {
entityplayer.playerConnection.sendPacket(new PacketPlayOutMapChunk(chunk, true, 0)); entityplayer.playerConnection.sendPacket(new PacketPlayOutMapChunk(chunk, true, 0));
} }
this.players.remove(entityplayer); // CraftBukkit
this.b.remove(entityplayer); this.b.remove(entityplayer);
entityplayer.chunkCoordIntPairQueue.remove(this.location); entityplayer.chunkCoordIntPairQueue.remove(this.location);
if (this.b.isEmpty()) { if (this.b.isEmpty()) {

5
src/main/java/org/bukkit/craftbukkit/chunkio/ChunkIOExecutor.java
View File

@ -20,6 +20,11 @@ public class ChunkIOExecutor {
instance.add(new QueuedChunk(x, z, loader, world, provider), runnable); instance.add(new QueuedChunk(x, z, loader, world, provider), runnable);
} }
// Abuses the fact that hashCode and equals for QueuedChunk only use world and coords
public static void dropQueuedChunkLoad(World world, int x, int z, Runnable runnable) {
instance.drop(new QueuedChunk(x, z, null, world, null), runnable);
}
public static void adjustPoolSize(int players) { public static void adjustPoolSize(int players) {
int size = Math.max(BASE_THREADS, (int) Math.ceil(players / PLAYERS_PER_THREAD)); int size = Math.max(BASE_THREADS, (int) Math.ceil(players / PLAYERS_PER_THREAD));
instance.setActiveThreads(size); instance.setActiveThreads(size);