EpicKnarvik97/PlotSquared
1
0
Fork 0
mirror of https://github.com/IntellectualSites/PlotSquared.git synced 2025-10-31 01:23:44 +01:00
Code Issues Projects Releases Wiki Activity

Optimizations

Browse Source
This commit is contained in:
boy0001
2015-02-16 02:29:50 +11:00
parent dd152ce28e
commit e7ea40c4a8
1 changed files with 63 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

128
PlotSquared/src/main/java/com/intellectualcrafters/plot/util/ChunkManager.java
View File

@@ -137,7 +137,6 @@ public class ChunkManager {
index.increment(); index.increment();
final int relX = newPos.getBlockX() - pos1.getBlockX(); final int relX = newPos.getBlockX() - pos1.getBlockX();
final int relZ = newPos.getBlockZ() - pos1.getBlockZ(); final int relZ = newPos.getBlockZ() - pos1.getBlockZ();
System.out.print(relX + "," + relZ);
final RegionWrapper region = new RegionWrapper(pos1.getBlockX(), pos2.getBlockX(), pos1.getBlockZ(), pos2.getBlockZ()); final RegionWrapper region = new RegionWrapper(pos1.getBlockX(), pos2.getBlockX(), pos1.getBlockZ(), pos2.getBlockZ());
final World world = pos1.getWorld(); final World world = pos1.getWorld();
@@ -177,72 +176,71 @@ public class ChunkManager {
final int loadTask = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() { final int loadTask = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
@Override @Override
public void run() { public void run() {
if (toGenerate.size() == 0) { long start = System.currentTimeMillis();
Bukkit.getScheduler().cancelTask(tasks.get(currentIndex)); while (System.currentTimeMillis() - start < 25) {
tasks.remove(currentIndex); if (toGenerate.size() == 0) {
TaskManager.runTask(new Runnable() { Bukkit.getScheduler().cancelTask(tasks.get(currentIndex));
@Override tasks.remove(currentIndex);
public void run() { TaskManager.runTask(new Runnable() {
System.out.print("================== SETTING BLOCKS ==================="); @Override
index.increment(); public void run() {
// Copy entities index.increment();
initMaps(); // Copy entities
for (int x = c3x; x <= c4x; x ++) { initMaps();
for (int z = c3z; z <= c4z; z ++) { for (int x = c3x; x <= c4x; x ++) {
Chunk chunk = world.getChunkAt(x, z); for (int z = c3z; z <= c4z; z ++) {
System.out.print("SAVING ENTITIES: " + chunk); Chunk chunk = world.getChunkAt(x, z);
chunks.add(chunk); chunks.add(chunk);
chunk.load(false); chunk.load(false);
saveEntitiesIn(chunk, region); saveEntitiesIn(chunk, region);
restoreEntities(world, relX, relZ); restoreEntities(world, relX, relZ);
}
}
// Copy blocks
final MutableInt mx = new MutableInt(sx);
final Integer currentIndex = index.toInteger();
final int maxY = world.getMaxHeight();
final Integer task = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
@Override
public void run() {
System.out.print(" - " + mx.intValue());
long start = System.currentTimeMillis();
while (System.currentTimeMillis() - start < 20) {
int x = mx.intValue();
System.out.print(x);
for (int z = sz; z <= ez; z++) {
saveBlocks(world, maxY, x, z);
for (int y = 1; y <= maxY; y++) {
Block block = world.getBlockAt(x, y, z);
int id = block.getTypeId();
byte data = block.getData();
AbstractSetBlock.setBlockManager.set(world, x + relX, y, z + relZ, id, data);
}
}
mx.increment();
if (x + 1 == ex) { // done!
restoreBlocks(world, relX, relZ);
AbstractSetBlock.setBlockManager.update(chunks);
for (Chunk chunk : chunks) {
chunk.unload(true, true);
}
TaskManager.runTaskLater(whenDone, 1);
Bukkit.getScheduler().cancelTask(tasks.get(currentIndex));
tasks.remove(currentIndex);
return;
}
} }
}; }
}, 1, 1); // Copy blocks
tasks.put(currentIndex, task); final MutableInt mx = new MutableInt(sx);
} final Integer currentIndex = index.toInteger();
}); final int maxY = world.getMaxHeight();
return; final Integer task = Bukkit.getScheduler().scheduleSyncRepeatingTask(plugin, new Runnable() {
@Override
public void run() {
long start = System.currentTimeMillis();
while (System.currentTimeMillis() - start < 25) {
int x = mx.intValue();
for (int z = sz; z <= ez; z++) {
saveBlocks(world, maxY, x, z);
for (int y = 1; y <= maxY; y++) {
Block block = world.getBlockAt(x, y, z);
int id = block.getTypeId();
byte data = block.getData();
AbstractSetBlock.setBlockManager.set(world, x + relX, y, z + relZ, id, data);
}
}
mx.increment();
if (x == ex) { // done!
restoreBlocks(world, relX, relZ);
AbstractSetBlock.setBlockManager.update(chunks);
for (Chunk chunk : chunks) {
chunk.unload(true, true);
}
TaskManager.runTaskLater(whenDone, 1);
Bukkit.getScheduler().cancelTask(tasks.get(currentIndex));
tasks.remove(currentIndex);
return;
}
}
};
}, 1, 1);
tasks.put(currentIndex, task);
}
});
return;
}
Chunk chunk = toGenerate.get(0);
toGenerate.remove(0);
chunk.load(true);
chunks.add(chunk);
} }
Chunk chunk = toGenerate.get(0);
toGenerate.remove(0);
chunk.load(true);
chunks.add(chunk);
System.out.print("GENERATING CHUNK: " + chunk);
} }
}, 1l, 1l); }, 1l, 1l);
tasks.put(currentIndex, loadTask); tasks.put(currentIndex, loadTask);