Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-09-07 00:22:51 +02:00
Send before history is acttually safer at the moment
- avoids deadlocks
Dieser Commit ist enthalten in:
Ursprung
ef5211d5b5
Commit
1cd2d8d121
@ -20,7 +20,7 @@ public abstract class ExtentBatchProcessorHolder extends BatchProcessorHolder im
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public Extent enableHistory(AbstractChangeSet changeSet) {
|
public Extent enableHistory(AbstractChangeSet changeSet) {
|
||||||
if (Settings.IMP.EXPERIMENTAL.SEND_BEFORE_HISTORY) {
|
if (Settings.IMP.HISTORY.SEND_BEFORE_HISTORY) {
|
||||||
return this.addPostProcessor(changeSet);
|
return this.addPostProcessor(changeSet);
|
||||||
} else {
|
} else {
|
||||||
return this.addProcessor(changeSet);
|
return this.addProcessor(changeSet);
|
||||||
|
@ -192,6 +192,12 @@ public class Settings extends Config {
|
|||||||
" - Slightly worse compression since dispatch order is different",
|
" - Slightly worse compression since dispatch order is different",
|
||||||
})
|
})
|
||||||
public boolean COMBINE_STAGES = true;
|
public boolean COMBINE_STAGES = true;
|
||||||
|
@Comment({
|
||||||
|
"Do not wait for a chunk's history to save before sending it",
|
||||||
|
" - Undo/redo commands will wait until the history has been written to disk before executing",
|
||||||
|
" - Requires combine-stages = true"
|
||||||
|
})
|
||||||
|
public boolean SEND_BEFORE_HISTORY = 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 (fastest)",
|
"0 = Uncompressed byte array (fastest)",
|
||||||
@ -381,12 +387,6 @@ public class Settings extends Config {
|
|||||||
"This will increase time taken slightly."
|
"This will increase time taken slightly."
|
||||||
})
|
})
|
||||||
public boolean ALLOW_TICK_EXISTING = true;
|
public boolean ALLOW_TICK_EXISTING = true;
|
||||||
@Comment({
|
|
||||||
"[SAFE] Do not wait for a chunk's history to save before sending it",
|
|
||||||
" - Undo/redo commands will wait until the history has been written to disk before executing",
|
|
||||||
" - Requires combine_stages = true"
|
|
||||||
})
|
|
||||||
public boolean SEND_BEFORE_HISTORY = false;
|
|
||||||
|
|
||||||
@Comment({
|
@Comment({
|
||||||
"Sets a maximum limit (in kb) for the size of a player's schematics directory (per-player mode only)",
|
"Sets a maximum limit (in kb) for the size of a player's schematics directory (per-player mode only)",
|
||||||
|
@ -719,7 +719,7 @@ public interface Extent extends InputExtent, OutputExtent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
default Extent enableHistory(AbstractChangeSet changeSet) {
|
default Extent enableHistory(AbstractChangeSet changeSet) {
|
||||||
if (Settings.IMP.EXPERIMENTAL.SEND_BEFORE_HISTORY) {
|
if (Settings.IMP.HISTORY.SEND_BEFORE_HISTORY) {
|
||||||
return addPostProcessor(changeSet);
|
return addPostProcessor(changeSet);
|
||||||
} else {
|
} else {
|
||||||
return addProcessor(changeSet);
|
return addProcessor(changeSet);
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren