Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-07-03 07:30:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Send before history is acttually safer at the moment

Browse Source 
- avoids deadlocks
This commit is contained in:
dordsor21 2021-06-08 14:15:43 +01:00
parent ef5211d5b5
commit 1cd2d8d121
No known key found for this signature in database
GPG Key ID: 1E53E88969FFCF0B
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
worldedit-core/src/main/java/com/boydti/fawe/beta/implementation/processors/ExtentBatchProcessorHolder.java
View File

@ -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);

12
worldedit-core/src/main/java/com/boydti/fawe/config/Settings.java
View File

@ -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)",

2
worldedit-core/src/main/java/com/sk89q/worldedit/extent/Extent.java
View File

@ -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);