Upstream/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-02 08:39:49 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #473 from Glitchfinder/master

Browse Source 
Alleviating hangtime on world save
This commit is contained in:
Glitchfinder 2013-01-10 12:36:10 -08:00
commit 91670d3945
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/gmail/nossr50/util/blockmeta/chunkmeta/HashChunkManager.java
View File

@ -32,7 +32,9 @@ public class HashChunkManager implements ChunkManager {
private List<Entity> spawnedMobs = new ArrayList<Entity>(); private List<Entity> spawnedMobs = new ArrayList<Entity>();
private List<Entity> spawnedPets = new ArrayList<Entity>(); private List<Entity> spawnedPets = new ArrayList<Entity>();
private List<Entity> mobsToRemove = new ArrayList<Entity>(); private List<Entity> mobsToRemove = new ArrayList<Entity>();
private List<String> savedChunks = new ArrayList<String>();
private boolean safeToRemoveMobs = true; private boolean safeToRemoveMobs = true;
private boolean savingWorld = false;
@Override @Override
public synchronized void closeAll() { public synchronized void closeAll() {
@ -219,6 +221,9 @@ public class HashChunkManager implements ChunkManager {
if (world == null) if (world == null)
return; return;
if(savingWorld && savedChunks.contains(world.getName() + "," + cx + "," + cz))
return;
boolean unloaded = false; boolean unloaded = false;
if (!store.containsKey(world.getName() + "," + cx + "," + cz)) { if (!store.containsKey(world.getName() + "," + cx + "," + cz)) {
List<Entity> tempSpawnedMobs = new ArrayList<Entity>(spawnedMobs); List<Entity> tempSpawnedMobs = new ArrayList<Entity>(spawnedMobs);
@ -240,7 +245,7 @@ public class HashChunkManager implements ChunkManager {
loadChunk(cx, cz, world); loadChunk(cx, cz, world);
unloaded = true; unloaded = true;
break; break;
} }
} }
} }
@ -273,6 +278,9 @@ public class HashChunkManager implements ChunkManager {
writeChunkStore(world, cx, cz, out); writeChunkStore(world, cx, cz, out);
} }
if(savingWorld)
savedChunks.add(world.getName() + "," + cx + "," + cz);
} }
private boolean isEntityInChunk(Entity entity, int cx, int cz, World world) { private boolean isEntityInChunk(Entity entity, int cx, int cz, World world) {
@ -317,6 +325,7 @@ public class HashChunkManager implements ChunkManager {
closeAll(); closeAll();
String worldName = world.getName(); String worldName = world.getName();
savingWorld = true;
List<String> keys = new ArrayList<String>(store.keySet()); List<String> keys = new ArrayList<String>(store.keySet());
for (String key : keys) { for (String key : keys) {
@ -361,6 +370,9 @@ public class HashChunkManager implements ChunkManager {
saveChunk(cx, cz, world); saveChunk(cx, cz, world);
} }
savingWorld = false;
savedChunks.clear();
} }
@Override @Override
@ -370,6 +382,7 @@ public class HashChunkManager implements ChunkManager {
closeAll(); closeAll();
String worldName = world.getName(); String worldName = world.getName();
savingWorld = true;
List<String> keys = new ArrayList<String>(store.keySet()); List<String> keys = new ArrayList<String>(store.keySet());
for (String key : keys) { for (String key : keys) {
@ -404,7 +417,7 @@ public class HashChunkManager implements ChunkManager {
unloadChunk(cx, cz, world); unloadChunk(cx, cz, world);
} }
List<Entity> tempSpawnedPets = new ArrayList<Entity>(spawnedPets); List<Entity> tempSpawnedPets = new ArrayList<Entity>(spawnedPets);
for (Entity entity : tempSpawnedPets) { for (Entity entity : tempSpawnedPets) {
World entityWorld = entity.getWorld(); World entityWorld = entity.getWorld();
@ -422,6 +435,8 @@ public class HashChunkManager implements ChunkManager {
spawnedMobs.remove(mobsToRemove); spawnedMobs.remove(mobsToRemove);
spawnedPets.remove(mobsToRemove); spawnedPets.remove(mobsToRemove);
mobsToRemove.clear(); mobsToRemove.clear();
savingWorld = false;
savedChunks.clear();
} }
@Override @Override