SpigotMC/Saber-Factions
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Additional safety check to make sure EntityCollection.saveToDisc() can't run multiple iterations simultaneously; this might have been the cause of some reports of corrupted data

Browse Source
This commit is contained in:
Brettflan 2013-04-18 03:24:23 -05:00
parent f7d57efe0b
commit 63837691ce
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
lib/craftbukkit.jar
View File

Binary file not shown.

11
src/com/massivecraft/factions/zcore/persist/EntityCollection.java
View File

@ -172,9 +172,15 @@ public abstract class EntityCollection<E extends Entity>
// -------------------------------------------- // // -------------------------------------------- //
// DISC // DISC
// -------------------------------------------- // // -------------------------------------------- //
// we don't want to let saveToDisc() run multiple iterations simultaneously
private boolean saveIsRunning = false;
public boolean saveToDisc() public boolean saveToDisc()
{ {
if (saveIsRunning) return true;
saveIsRunning = true;
Map<String, E> entitiesThatShouldBeSaved = new HashMap<String, E>(); Map<String, E> entitiesThatShouldBeSaved = new HashMap<String, E>();
for (E entity : this.entities) for (E entity : this.entities)
{ {
@ -183,7 +189,8 @@ public abstract class EntityCollection<E extends Entity>
entitiesThatShouldBeSaved.put(entity.getId(), entity); entitiesThatShouldBeSaved.put(entity.getId(), entity);
} }
} }
saveIsRunning = false;
return this.saveCore(entitiesThatShouldBeSaved); return this.saveCore(entitiesThatShouldBeSaved);
} }