Upstream/FastAsyncWorldedit
1
0
Fork 0
mirror of https://github.com/boy0001/FastAsyncWorldedit.git synced 2025-01-04 07:28:17 +01:00
Code Issues Projects Releases Wiki Activity

Fixes #302

Browse Source
This commit is contained in:
Jesse Boyd 2016-09-21 15:01:37 +10:00
parent 07f4f61cc2
commit b2ef1cbc50
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/boydti/fawe/config/Settings.java
View File

@ -103,7 +103,7 @@ public class Settings extends Config {
" - Faster as it avoids duplicate block checks", " - Faster as it avoids duplicate block checks",
" - Worse compression since dispatch order is different" " - Worse compression since dispatch order is different"
}) })
public static boolean COMBINE_STAGES = false; public static boolean COMBINE_STAGES = true;
@Comment({ @Comment({
"Higher compression reduces the size of history at the expense of CPU", "Higher compression reduces the size of history at the expense of CPU",
"0 = Uncompressed byte array", "0 = Uncompressed byte array",

1
core/src/main/java/com/boydti/fawe/example/NMSMappedFaweQueue.java
View File

@ -56,6 +56,7 @@ public abstract class NMSMappedFaweQueue<WORLD, CHUNK, CHUNKSECTION, SECTION> ex
public void end(FaweChunk chunk) { public void end(FaweChunk chunk) {
super.end(chunk); super.end(chunk);
if (Settings.LIGHTING.MODE == 0) { if (Settings.LIGHTING.MODE == 0) {
refreshChunk(chunk);
return; return;
} }
if (relighter == null) { if (relighter == null) {

4
core/src/main/java/com/boydti/fawe/util/SetQueue.java
View File

@ -105,6 +105,10 @@ public class SetQueue {
completer = new ExecutorCompletionService(pool); completer = new ExecutorCompletionService(pool);
e.printStackTrace(); e.printStackTrace();
} }
if (pool.getQueuedSubmissionCount() != 0 || pool.getRunningThreadCount() != 0 || pool.getQueuedTaskCount() != 0) {
Fawe.debug("Error flushing parallel pool");
pool.awaitQuiescence(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
}
secondLast = System.currentTimeMillis(); secondLast = System.currentTimeMillis();
} catch (Throwable e) { } catch (Throwable e) {
e.printStackTrace(); e.printStackTrace();

6
core/src/main/java/com/boydti/fawe/wrappers/LocationMaskedPlayerWrapper.java
View File

@ -16,12 +16,14 @@ public class LocationMaskedPlayerWrapper extends PlayerWrapper {
@Override @Override
public WorldVector getBlockIn() { public WorldVector getBlockIn() {
return new WorldVector((LocalWorld) getWorld(), position); WorldVector pos = getPosition();
return WorldVector.toBlockPoint(pos.getWorld(), pos.getX(), pos.getY(), pos.getZ());
} }
@Override @Override
public WorldVector getBlockOn() { public WorldVector getBlockOn() {
return new WorldVector((LocalWorld) getWorld(), position.subtract(0, 1, 0)); WorldVector pos = getPosition();
return WorldVector.toBlockPoint(pos.getWorld(), pos.getX(), pos.getY() - 1, pos.getZ());
} }
@Override @Override