Plexus/Plex-FAWE
1
0
Fork 0
mirror of https://github.com/plexusorg/Plex-FAWE.git synced 2024-12-22 17:27:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: correctly handle creation of extents in EditSessionBuilder (#2232)

Browse Source 
- Add regionExtent process to the queue (fixes #2227)
 - Correctly wrap extents in each other
This commit is contained in:
Jordan 2023-05-20 19:33:18 +01:00 committed by GitHub
parent 1b0fb9ed48
commit 85f5006a0b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -531,16 +531,14 @@ public final class EditSessionBuilder {
} }
if (allowedRegions == null && Settings.settings().REGION_RESTRICTIONS) { if (allowedRegions == null && Settings.settings().REGION_RESTRICTIONS) {
if (actor != null && !actor.hasPermission("fawe.bypass.regions")) { if (actor != null && !actor.hasPermission("fawe.bypass.regions")) {
if (actor instanceof Player) { if (actor instanceof Player player) {
Player player = (Player) actor;
allowedRegions = player.getAllowedRegions(); allowedRegions = player.getAllowedRegions();
} }
} }
} }
if (disallowedRegions == null && Settings.settings().REGION_RESTRICTIONS && Settings.settings().REGION_RESTRICTIONS_OPTIONS.ALLOW_BLACKLISTS) { if (disallowedRegions == null && Settings.settings().REGION_RESTRICTIONS && Settings.settings().REGION_RESTRICTIONS_OPTIONS.ALLOW_BLACKLISTS) {
if (actor != null && !actor.hasPermission("fawe.bypass.regions")) { if (actor != null && !actor.hasPermission("fawe.bypass.regions")) {
if (actor instanceof Player) { if (actor instanceof Player player) {
Player player = (Player) actor;
disallowedRegions = player.getDisallowedRegions(); disallowedRegions = player.getDisallowedRegions();
} }
} }
@ -561,6 +559,9 @@ public final class EditSessionBuilder {
} }
} }
} }
if (placeChunks && regionExtent != null) {
queue.addProcessor(regionExtent);
}
// There's no need to do the below (and it'll also just be a pain to implement) if we're not placing chunks // There's no need to do the below (and it'll also just be a pain to implement) if we're not placing chunks
if (placeChunks) { if (placeChunks) {
if (((relightMode != null && relightMode != RelightMode.NONE) || (relightMode == null && Settings.settings().LIGHTING.MODE > 0))) { if (((relightMode != null && relightMode != RelightMode.NONE) || (relightMode == null && Settings.settings().LIGHTING.MODE > 0))) {
@ -597,10 +598,9 @@ public final class EditSessionBuilder {
this.extent = regionExtent; this.extent = regionExtent;
} }
if (this.limit != null && this.limit.STRIP_NBT != null && !this.limit.STRIP_NBT.isEmpty()) { if (this.limit != null && this.limit.STRIP_NBT != null && !this.limit.STRIP_NBT.isEmpty()) {
this.extent = new StripNBTExtent(this.extent, this.limit.STRIP_NBT);
if (placeChunks) { if (placeChunks) {
queue.addProcessor(new StripNBTExtent(this.extent, this.limit.STRIP_NBT)); queue.addProcessor((IBatchProcessor) this.extent);
} else {
this.extent = new StripNBTExtent(this.extent, this.limit.STRIP_NBT);
} }
} }
if (this.limit != null && !this.limit.isUnlimited()) { if (this.limit != null && !this.limit.isUnlimited()) {
@ -613,10 +613,9 @@ public final class EditSessionBuilder {
} }
Set<PropertyRemap<?>> remaps = this.limit.REMAP_PROPERTIES; Set<PropertyRemap<?>> remaps = this.limit.REMAP_PROPERTIES;
if (!limitBlocks.isEmpty() || (remaps != null && !remaps.isEmpty())) { if (!limitBlocks.isEmpty() || (remaps != null && !remaps.isEmpty())) {
this.extent = new DisallowedBlocksExtent(this.extent, limitBlocks, remaps);
if (placeChunks) { if (placeChunks) {
queue.addProcessor(new DisallowedBlocksExtent(this.extent, limitBlocks, remaps)); queue.addProcessor((IBatchProcessor) this.extent);
} else {
this.extent = new DisallowedBlocksExtent(this.extent, limitBlocks, remaps);
} }
} }
} }