Brandon
/
FastAsyncWorldedit
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes #487

This commit is contained in:
Jesse Boyd 2017-04-20 16:54:57 +10:00
parent f0e310da6d
commit a08b68cac4
No known key found for this signature in database
GPG Key ID: 59F1DE6293AF6E1F
3 changed files with 45 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/main/java/com/boydti/fawe/logging/rollback/RollbackOptimizedHistory.java
View File

@ -85,7 +85,9 @@ public class RollbackOptimizedHistory extends DiskStorageHistory {
if (super.close()) { if (super.close()) {
// Save to DB // Save to DB
RollbackDatabase db = DBHandler.IMP.getDatabase(getWorld()); RollbackDatabase db = DBHandler.IMP.getDatabase(getWorld());
db.logEdit(this); if (db != null) {
db.logEdit(this);
}
return true; return true;
} }
return false; return false;

38
forge111/src/main/java/com/boydti/fawe/forge/v111/ForgeChunk_All.java
View File

@ -256,23 +256,27 @@ public class ForgeChunk_All extends CharFaweChunk<Chunk, ForgeQueue_All> {
getParent().getChangeTask().run(previous, this); getParent().getChangeTask().run(previous, this);
} }
// Trim tiles // Trim tiles
Set<Map.Entry<BlockPos, TileEntity>> entryset = tiles.entrySet(); if (!tiles.isEmpty()) {
Iterator<Map.Entry<BlockPos, TileEntity>> iterator = entryset.iterator(); Set<Map.Entry<BlockPos, TileEntity>> entryset = tiles.entrySet();
while (iterator.hasNext()) { Iterator<Map.Entry<BlockPos, TileEntity>> iterator = entryset.iterator();
Map.Entry<BlockPos, TileEntity> tile = iterator.next(); while (iterator.hasNext()) {
BlockPos pos = tile.getKey(); Map.Entry<BlockPos, TileEntity> tile = iterator.next();
int lx = pos.getX() & 15; BlockPos pos = tile.getKey();
int ly = pos.getY(); int lx = pos.getX() & 15;
int lz = pos.getZ() & 15; int ly = pos.getY();
int j = FaweCache.CACHE_I[ly][lz][lx]; int lz = pos.getZ() & 15;
char[] array = this.getIdArray(j); int j = FaweCache.CACHE_I[ly][lz][lx];
if (array == null) { char[] array = this.getIdArray(j);
continue; if (array == null) {
} continue;
int k = FaweCache.CACHE_J[ly][lz][lx]; }
if (array[k] != 0) { int k = FaweCache.CACHE_J[ly][lz][lx];
tile.getValue().invalidate();; if (array[k] != 0) {
iterator.remove(); synchronized (ForgeChunk_All.class) {
tile.getValue().invalidate();
iterator.remove();
}
}
} }
} }
// Efficiently merge sections // Efficiently merge sections

38
sponge/src/main/java/com/boydti/fawe/sponge/v1_11/SpongeChunk_1_11.java
View File

@ -256,23 +256,27 @@ public class SpongeChunk_1_11 extends CharFaweChunk<Chunk, SpongeQueue_1_11> {
getParent().getChangeTask().run(previous, this); getParent().getChangeTask().run(previous, this);
} }
// Trim tiles // Trim tiles
Set<Map.Entry<BlockPos, TileEntity>> entryset = tiles.entrySet(); if (!tiles.isEmpty()) {
Iterator<Map.Entry<BlockPos, TileEntity>> iterator = entryset.iterator(); Set<Map.Entry<BlockPos, TileEntity>> entryset = tiles.entrySet();
while (iterator.hasNext()) { Iterator<Map.Entry<BlockPos, TileEntity>> iterator = entryset.iterator();
Map.Entry<BlockPos, TileEntity> tile = iterator.next(); while (iterator.hasNext()) {
BlockPos pos = tile.getKey(); Map.Entry<BlockPos, TileEntity> tile = iterator.next();
int lx = pos.getX() & 15; BlockPos pos = tile.getKey();
int ly = pos.getY(); int lx = pos.getX() & 15;
int lz = pos.getZ() & 15; int ly = pos.getY();
int j = FaweCache.CACHE_I[ly][lz][lx]; int lz = pos.getZ() & 15;
char[] array = this.getIdArray(j); int j = FaweCache.CACHE_I[ly][lz][lx];
if (array == null) { char[] array = this.getIdArray(j);
continue; if (array == null) {
} continue;
int k = FaweCache.CACHE_J[ly][lz][lx]; }
if (array[k] != 0) { int k = FaweCache.CACHE_J[ly][lz][lx];
tile.getValue().invalidate();; if (array[k] != 0) {
iterator.remove(); synchronized (SpongeChunk_1_11.class) {
tile.getValue().invalidate();
iterator.remove();
}
}
} }
} }
HashSet<UUID> entsToRemove = this.getEntityRemoves(); HashSet<UUID> entsToRemove = this.getEntityRemoves();