Mirror von
https://github.com/IntellectualSites/FastAsyncWorldEdit.git
synchronisiert 2024-09-07 00:22:51 +02:00
fix: always return the changeset from EditSessionBuilder (#2302)
- Ensure history will actually always be closed if combine-stages is false - Fixes #2148
Dieser Commit ist enthalten in:
Ursprung
1ede11b129
Commit
a8c8a0fbd6
@ -72,7 +72,6 @@ import org.apache.logging.log4j.Logger;
|
|||||||
|
|
||||||
import javax.annotation.Nonnull;
|
import javax.annotation.Nonnull;
|
||||||
import javax.annotation.Nullable;
|
import javax.annotation.Nullable;
|
||||||
import java.util.Arrays;
|
|
||||||
import java.util.HashSet;
|
import java.util.HashSet;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
@ -99,7 +98,6 @@ public final class EditSessionBuilder {
|
|||||||
private RelightMode relightMode;
|
private RelightMode relightMode;
|
||||||
private Relighter relighter;
|
private Relighter relighter;
|
||||||
private Boolean wnaMode;
|
private Boolean wnaMode;
|
||||||
private AbstractChangeSet changeTask;
|
|
||||||
private Extent bypassHistory;
|
private Extent bypassHistory;
|
||||||
private Extent bypassAll;
|
private Extent bypassAll;
|
||||||
private Extent extent;
|
private Extent extent;
|
||||||
@ -522,7 +520,6 @@ public final class EditSessionBuilder {
|
|||||||
changeSet = new BlockBagChangeSet(changeSet, blockBag, limit.INVENTORY_MODE == 1);
|
changeSet = new BlockBagChangeSet(changeSet, blockBag, limit.INVENTORY_MODE == 1);
|
||||||
}
|
}
|
||||||
if (combineStages) {
|
if (combineStages) {
|
||||||
changeTask = changeSet;
|
|
||||||
this.extent = extent.enableHistory(changeSet);
|
this.extent = extent.enableHistory(changeSet);
|
||||||
} else {
|
} else {
|
||||||
this.extent = new HistoryExtent(extent, changeSet);
|
this.extent = new HistoryExtent(extent, changeSet);
|
||||||
@ -699,7 +696,7 @@ public final class EditSessionBuilder {
|
|||||||
* Get the change set that will be used for history
|
* Get the change set that will be used for history
|
||||||
*/
|
*/
|
||||||
public AbstractChangeSet getChangeTask() {
|
public AbstractChangeSet getChangeTask() {
|
||||||
return changeTask;
|
return changeSet;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Laden…
In neuem Issue referenzieren
Einen Benutzer sperren