Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-11-18 01:46:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: always return the changeset from EditSessionBuilder (#2302)

Browse Source 
- Ensure history will actually always be closed if combine-stages is false
- Fixes #2148
This commit is contained in:
Jordan 2023-06-19 15:34:54 +02:00 committed by GitHub
parent 1ede11b129
commit a8c8a0fbd6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
worldedit-core/src/main/java/com/sk89q/worldedit/EditSessionBuilder.java
View File

@ -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;
} }
/** /**