lishid
/
Orebfuscator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved performance of ChunkReloader

master
Aleksey-Terzi 2016-07-04 19:57:30 +03:00
parent b0b2e9a1ce
commit a2d303077a
2 changed files with 18 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugin/pom.xml
View File

@ -4,7 +4,7 @@
<groupId>com.lishid</groupId>
<artifactId>orebfuscator</artifactId>
<version>4.1.3-SNAPSHOT</version>
<version>4.1.4-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Orebfuscator4</name>

45
Plugin/src/main/java/com/lishid/orebfuscator/obfuscation/ChunkReloader.java
View File

@ -132,48 +132,33 @@ public class ChunkReloader extends Thread implements Runnable {
}
}
private static void scheduleReloadChunks(final World world, HashSet<ChunkCoord> chunksForReloadForWorld)
{
private static void scheduleReloadChunks(final World world, HashSet<ChunkCoord> chunksForReloadForWorld) {
File cacheFolder = new File(OrebfuscatorConfig.getCacheFolder(), world.getName());
final ArrayList<ChunkCoord> scheduledChunksForReload = new ArrayList<ChunkCoord>();
final IChunkManager chunkManager = Orebfuscator.nms.getChunkManager(world);
for(ChunkCoord chunk : chunksForReloadForWorld) {
for(final ChunkCoord chunk : chunksForReloadForWorld) {
if(OrebfuscatorConfig.UseCache) {
ObfuscatedCachedChunk cache = new ObfuscatedCachedChunk(cacheFolder, chunk.x, chunk.z);
if(cache.getHash() != 0) continue;
}
scheduledChunksForReload.add(chunk);
//Orebfuscator.log("Add chunk x = " + chunk.x + ", z = " + chunk.z + " to schedule for reload for players");/*debug*/
Orebfuscator.instance.runTask(new Runnable() {
public void run() {
runReloadChunk(world, chunkManager, chunk);
}
});
}
Orebfuscator.instance.runTask(new Runnable() {
public void run() {
runReloadChunks(world, scheduledChunksForReload);
}
});
}
private static void runReloadChunks(World world, ArrayList<ChunkCoord> scheduledChunksForReload) {
IChunkManager chunkManager = Orebfuscator.nms.getChunkManager(world);
private static void runReloadChunk(World world, IChunkManager chunkManager, ChunkCoord chunk) {
//Reload chunk for players
HashSet<Player> affectedPlayers = new HashSet<Player>();
ArrayList<ChunkCoord> notReloadedChunks = new ArrayList<ChunkCoord>();
for(ChunkCoord chunk : scheduledChunksForReload) {
if(!world.isChunkLoaded(chunk.x, chunk.z)) continue;
if(!chunkManager.resendChunk(chunk.x, chunk.z, affectedPlayers)) {
notReloadedChunks.add(chunk);
//Orebfuscator.log("Is not possible to reload chunk x = " + chunk.x + ", z = " + chunk.z + ", add for later reload");/*debug*/
} else {
//Orebfuscator.log("Force chunk x = " + chunk.x + ", z = " + chunk.z + " to reload for players");/*debug*/
}
}
if(!world.isChunkLoaded(chunk.x, chunk.z)) return;
if(notReloadedChunks.size() > 0) {
if(!chunkManager.resendChunk(chunk.x, chunk.z, affectedPlayers)) {
synchronized (chunksForReload) {
HashSet<ChunkCoord> chunksForReloadForWorld = chunksForReload.get(world);
@ -181,8 +166,12 @@ public class ChunkReloader extends Thread implements Runnable {
chunksForReload.put(world, chunksForReloadForWorld = new HashSet<ChunkCoord>());
}
chunksForReloadForWorld.addAll(notReloadedChunks);
chunksForReloadForWorld.add(chunk);
}
//Orebfuscator.log("Is not possible to reload chunk x = " + chunk.x + ", z = " + chunk.z + ", add for later reload");/*debug*/
} else {
//Orebfuscator.log("Force chunk x = " + chunk.x + ", z = " + chunk.z + " to reload for players");/*debug*/
}
if(affectedPlayers.size() > 0) {